Changeset 3440 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2010-08-15T17:31:20+02:00 (13 years ago)

Author:

jttt

Message:

Fix #5333 "Merge selection" tool is broken

File:

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

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

@@ -12 +12 @@
 
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeData;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
@@ -23 +24 @@
     }
 
+    @SuppressWarnings("null")
     @Override public boolean executeCommand() {
 
@@ -28 +30 @@
 
         for (PrimitiveData pd:data) {
-            createdPrimitives.add(getLayer().data.getPrimitiveById(pd, true));
+            OsmPrimitive primitive = getLayer().data.getPrimitiveById(pd);
+            boolean created = primitive == null;
+            if (created) {
+                primitive = pd.getType().newInstance(pd.getUniqueId(), true);
+            }
+            if (pd instanceof NodeData) { // Load nodes immediately because they can't be added to dataset without coordinates
+                primitive.load(pd);
+            }
+            if (created) {
+                getLayer().data.addPrimitive(primitive);
+            }
+            createdPrimitives.add(primitive);
         }
 
-        // Load nodes first to prevent ways with null coordinates
-        for (int i=0; i<createdPrimitives.size(); i++) {
-            if (createdPrimitives.get(i) instanceof Node) {
-                createdPrimitives.get(i).load(data.get(i));
-            }
-        }
-
-        // Now load ways and relations
+        //Then load ways and relations
         for (int i=0; i<createdPrimitives.size(); i++) {
             if (!(createdPrimitives.get(i) instanceof Node)) {
@@ -57 +63 @@
     @Override public JLabel getDescription() {
         return new JLabel(trn("Added {0} object", "Added {0} objects", data.size(), data.size()), null,
-                            JLabel.HORIZONTAL
+                JLabel.HORIZONTAL
         );
     }