Changeset 2433 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.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/gui/dialogs/relation/ParentRelationLoadingTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -164 +164 @@
             referrers = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
             if (referrers != null) {
-                final MergeVisitor visitor = new MergeVisitor(getLayer().data, referrers);
+                final DataSetMerger visitor = new DataSetMerger(getLayer().data, referrers);
                 visitor.merge();