Changeset 2433 in josm for trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java

Timestamp:

2009-11-10T21:25:40+01:00 (15 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/actions/DownloadReferrersAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java

@@ -18 +18 @@
 import org.openstreetmap.josm.Main;
 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.visitor.MergeVisitor;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -210 +210 @@
             }
 
-            MergeVisitor visitor = new MergeVisitor(targetLayer.data, parents);
+            DataSetMerger visitor = new DataSetMerger(targetLayer.data, parents);
             visitor.merge();
             SwingUtilities.invokeLater(
@@ -239 +239 @@
                 reader = null;
             }
-            MergeVisitor visitor = new MergeVisitor(parents, ds);
+            DataSetMerger visitor = new DataSetMerger(parents, ds);
             visitor.merge();
         }