Changeset 3257 in josm for trunk/src/org

Timestamp:

2010-05-16T10:55:58+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5032: Unexpected error during PASTE

File:

• trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -12 +12 @@
 import javax.swing.tree.MutableTreeNode;
 
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
@@ -31 +32 @@
         }
 
+        // Load nodes first to prevent ways with null coordinates
         for (int i=0; i<createdPrimitives.size(); i++) {
-            createdPrimitives.get(i).load(data.get(i));
+            if (createdPrimitives.get(i) instanceof Node) {
+                createdPrimitives.get(i).load(data.get(i));
+            }
         }
+
+        // Now load ways and relations
+        for (int i=0; i<createdPrimitives.size(); i++) {
+            if (!(createdPrimitives.get(i) instanceof Node)) {
+                createdPrimitives.get(i).load(data.get(i));
+            }
+        }
+
         getLayer().data.setSelected(createdPrimitives);
         return true;