Changeset 2433 in josm for trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

Timestamp:

2009-11-10T21:25:40+01:00 (14 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.

File:

• trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) (3 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();
     }