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

Timestamp:

2009-11-07T14:41:34+01:00 (14 years ago)

Author:

jttt

Message:

Added map of primitives to dataset to make search by id faster
check if primitive already exist in addPrimitive and removePrimitive
use PrimitiveId instead of id + primitive type

File:

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

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

@@ -13 +13 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
 
@@ -29 +28 @@
 
         for (PrimitiveData pd:data) {
-            createdPrimitives.add(getLayer().data.getPrimitiveById(pd.getId(), OsmPrimitiveType.fromData(pd), true));
+            createdPrimitives.add(getLayer().data.getPrimitiveById(pd, true));
         }
 
@@ -41 +40 @@
     @Override public void undoCommand() {
         for (PrimitiveData p:data) {
-            getLayer().data.removePrimitive(p.getId(), OsmPrimitiveType.fromData(p));
+            getLayer().data.removePrimitive(p);
         }
     }
@@ -47 +46 @@
     @Override
     public MutableTreeNode description() {
-         return new DefaultMutableTreeNode(
+        return new DefaultMutableTreeNode(
                 new JLabel(tr("Added {0} objects", data.size()), null,
                         JLabel.HORIZONTAL