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

Timestamp:

2010-01-11T18:57:34+01:00 (14 years ago)

Author:

mjulius

Message:

fixed potential problem when different primitive types with same IDs are copied

File:

• trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java (modified) (3 diffs)

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

@@ -36 +36 @@
         referenced.clear();
 
-        final Set<Long> visitedIds = new HashSet<Long>();
+        final Set<Long> visitedNodeIds = new HashSet<Long>();
+        final Set<Long> visitedWayIds = new HashSet<Long>();
+        final Set<Long> visitedRelationIds = new HashSet<Long>();
 
         new AbstractVisitor() {
@@ -42 +44 @@
 
             public void visit(Node n) {
-                if (!visitedIds.add(n.getUniqueId()))
+                if (!visitedNodeIds.add(n.getUniqueId()))
                     return;
-                (firstIteration?directlyAdded:referenced).add(n.save());
+                (firstIteration ? directlyAdded : referenced).add(n.save());
             }
             public void visit(Way w) {
-                if (!visitedIds.add(w.getUniqueId()))
+                if (!visitedWayIds.add(w.getUniqueId()))
                     return;
-                (firstIteration?directlyAdded:referenced).add(w.save());
+                (firstIteration ? directlyAdded : referenced).add(w.save());
                 firstIteration = false;
                 for (Node n : w.getNodes()) {
@@ -55 +57 @@
                 }
             }
-            public void visit(Relation e) {
-                if (!visitedIds.add(e.getUniqueId()))
+            public void visit(Relation r) {
+                if (!visitedRelationIds.add(r.getUniqueId()))
                     return;
-                (firstIteration?directlyAdded:referenced).add(e.save());
+                (firstIteration ? directlyAdded : referenced).add(r.save());
                 firstIteration = false;
-                for (RelationMember m : e.getMembers()) {
+                for (RelationMember m : r.getMembers()) {
                     m.getMember().visit(this);
                 }