Changeset 2388 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

Timestamp:

2009-11-02T21:04:32+01:00 (14 years ago)

Author:

jttt

Message:

Replace Dataset.nodes with getNodes(), etc

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -98 +98 @@
      */
     protected <P extends OsmPrimitive> void mergePrimitive(P other,
-            Collection<P> myPrimitives, Collection<P> otherPrimitives,
-            HashMap<Long, P> primitivesWithDefinedIds) {
+            DataSet myDataset, Collection<P> myPrimitives, HashMap<Long, P> primitivesWithDefinedIds) {
 
         if (!other.isNew() ) {
@@ -105 +104 @@
             // defined id
             //
-            if (mergeById(myPrimitives, primitivesWithDefinedIds, other))
+            if (mergeById(primitivesWithDefinedIds, other))
                 return;
         } else {
@@ -136 +135 @@
         // my dataset. Just add other to my dataset.
         //
-        myPrimitives.add(other);
+        myDataset.addPrimitive(other);
     }
 
     public void visit(Node other) {
-        mergePrimitive(other, myDataSet.nodes, theirDataSet.nodes, nodeshash);
+        mergePrimitive(other, myDataSet, myDataSet.getNodes(), nodeshash);
     }
 
     public void visit(Way other) {
         fixWay(other);
-        mergePrimitive(other, myDataSet.ways, theirDataSet.ways, wayshash);
+        mergePrimitive(other, myDataSet, myDataSet.getWays(), wayshash);
     }
 
     public void visit(Relation other) {
         fixRelation(other);
-        mergePrimitive(other, myDataSet.relations, theirDataSet.relations, relshash);
+        mergePrimitive(other, myDataSet, myDataSet.getRelations(), relshash);
     }
 
@@ -230 +229 @@
      * Tries to merge a primitive <code>other</code> into an existing primitive with the same id.
      *
-     * @param myPrimitives the complete set of my primitives (potential merge targets)
      * @param myPrimitivesWithDefinedIds the map of primitives (potential merge targets) with an id <> 0, for faster lookup
      *    by id. Key is the id, value the primitive with the given value. myPrimitives.valueSet() is a
@@ -237 +235 @@
      * @return true, if this method was able to merge <code>other</code> with an existing node; false, otherwise
      */
-    private <P extends OsmPrimitive> boolean mergeById(
-            Collection<P> myPrimitives, HashMap<Long, P> myPrimitivesWithDefinedIds, P other) {
+    private <P extends OsmPrimitive> boolean mergeById(HashMap<Long, P> myPrimitivesWithDefinedIds, P other) {
 
         // merge other into an existing primitive with the same id, if possible