Changeset 2433 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-11-10T21:25:40+01:00 (16 years ago)

Author:

Gubaer

Message:

Improved test cases for MergeVisitor.
Moved MergeVisitor and removed Visitor-pattern. Double-dispatching isn't necessary and only slows down the merge process.

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReader.java (modified) (3 diffs)
• OsmServerBackreferenceReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -14 +14 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -20 +21 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -387 +387 @@
      */
     protected void merge(DataSet from) {
-        final MergeVisitor visitor = new MergeVisitor(outputDataSet,from);
+        final DataSetMerger visitor = new DataSetMerger(outputDataSet,from);
         visitor.merge();
     }

trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -227 +227 @@
                         OsmServerObjectReader reader = new OsmServerObjectReader(way.getId(), OsmPrimitiveType.from(way), true /* read full */);
                         DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
-                        MergeVisitor visitor = new MergeVisitor(ds, wayDs);
+                        DataSetMerger visitor = new DataSetMerger(ds, wayDs);
                         visitor.merge();
                     }
@@ -238 +238 @@
                         OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.from(relation), true /* read full */);
                         DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
-                        MergeVisitor visitor = new MergeVisitor(ds, wayDs);
+                        DataSetMerger visitor = new DataSetMerger(ds, wayDs);
                         visitor.merge();
                     }
@@ -267 +267 @@
             if (primitiveType.equals(OsmPrimitiveType.NODE)) {
                 DataSet ds = getReferringWays(progressMonitor.createSubTaskMonitor(1, false));
-                MergeVisitor visitor = new MergeVisitor(ret,ds);
+                DataSetMerger visitor = new DataSetMerger(ret,ds);
                 visitor.merge();
                 ret = visitor.getMyDataSet();
             }
             DataSet ds = getReferringRelations(progressMonitor.createSubTaskMonitor(1, false));
-            MergeVisitor visitor = new MergeVisitor(ret,ds);
+            DataSetMerger visitor = new DataSetMerger(ret,ds);
             visitor.merge();
             ret = visitor.getMyDataSet();