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

Timestamp:

2009-11-10T21:25:40+01:00 (17 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/actions

Files:

• DownloadReferrersAction.java (modified) (3 diffs)
• UpdateSelectionAction.java (modified) (4 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();
         }

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

@@ -15 +15 @@
 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.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -20 +21 @@
 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.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -213 +213 @@
                 initMultiFetchReaderWithRelations(reader);
                 theirDataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-                MergeVisitor merger = new MergeVisitor(ds, theirDataSet);
+                DataSetMerger merger = new DataSetMerger(ds, theirDataSet);
                 merger.merge();
                 // a ways loaded with MultiFetch may be incomplete because at least one of its
@@ -223 +223 @@
                         OsmServerObjectReader reader = new OsmServerObjectReader(w.getId(), OsmPrimitiveType.WAY, true /* full */);
                         theirDataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-                        merger = new MergeVisitor(ds, theirDataSet);
+                        merger = new DataSetMerger(ds, theirDataSet);
                         merger.merge();
                     }