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

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.

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java ) (7 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -1 @@
-package org.openstreetmap.josm.data.osm.visitor;
+package org.openstreetmap.josm.data.osm;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -13 +13 @@
 
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Way;
 
 /**
- * A visitor that gets a data set at construction time and merges every visited object
- * into it.
- *
+ * A dataset merger which takes a target and a source dataset and merges the source data set
+ * onto the target dataset.
+ * 
  */
-public class MergeVisitor extends AbstractVisitor {
-    private static Logger logger = Logger.getLogger(MergeVisitor.class.getName());
+public class DataSetMerger {
+    private static Logger logger = Logger.getLogger(DataSetMerger.class.getName());
 
     /** the collection of conflicts created during merging */
@@ -51 +45 @@
      * The visitor will merge <code>theirDataSet</code> onto <code>myDataSet</code>
      *
-     * @param myDataSet  dataset with my primitives
-     * @param theirDataSet dataset with their primitives.
-     */
-    public MergeVisitor(DataSet myDataSet, DataSet theirDataSet) {
+     * @param myDataSet  dataset with my primitives. Must not be null.
+     * @param theirDataSet dataset with their primitives. Ignored, if null.
+     * @throws IllegalArgumentException thrown if myDataSet is null
+     */
+    public DataSetMerger(DataSet myDataSet, DataSet theirDataSet) throws IllegalArgumentException {
+        if (myDataSet == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null"));
         this.myDataSet = myDataSet;
         this.theirDataSet = theirDataSet;
@@ -82 +79 @@
             //
             if (mergeById(other))
+                return;
+            if (!other.isVisible())
+                // ignore it
                 return;
         } else {
@@ -116 +116 @@
             }
         }
+
         // If we get here we didn't find a suitable primitive in
         // my dataset. Create a clone and add it to my dataset.
@@ -129 +130 @@
         mergedMap.put(other.getUniqueId(), my.getUniqueId());
         fixReferences.add(other.getUniqueId());
-    }
-
-    public void visit(Node other) {
-        mergePrimitive(other);
-    }
-
-    public void visit(Way other) {
-        mergePrimitive(other);
-    }
-
-    public void visit(Relation other) {
-        mergePrimitive(other);
     }
 
@@ -357 +346 @@
      */
     public void merge() {
+        if (theirDataSet == null)
+            return;
         for (Node node: theirDataSet.getNodes()) {
-            node.visit(this);
+            mergePrimitive(node);
         }
         for (Way way: theirDataSet.getWays()) {
-            way.visit(this);
+            mergePrimitive(way);
         }
         for (Relation relation: theirDataSet.getRelations()) {
-            relation.visit(this);
+            mergePrimitive(relation);
         }
         fixReferences();