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

Timestamp:

2009-11-07T14:41:34+01:00 (17 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/actions/UploadSelectionAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -21 +22 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -33 +33 @@
 import org.openstreetmap.josm.tools.ExceptionUtil;
 import org.xml.sax.SAXException;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 /**
@@ -326 +325 @@
                     for (OsmPrimitive p: ds.allPrimitives()) {
                         if (canceled) return;
-                        OsmPrimitive myDeletedParent = layer.data.getPrimitiveById(p.getId(), OsmPrimitiveType.from(p));
+                        OsmPrimitive myDeletedParent = layer.data.getPrimitiveById(p);
                         // our local dataset includes a deleted parent of a primitive we want
                         // to delete. Include this parent in the collection of uploaded primitives