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

Timestamp:

2009-09-07T23:06:19+02:00 (17 years ago)

Author:

Gubaer

Message:

Had to replace DataSet:getPrimitiveById(id) with DataSet:getPrimitiveById(id,type). Primitive ids are not globally unique, only per type of primitive.
Fixed problems in unit test, available unit tests passing again.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• UpdateSelectionAction.java (modified) (3 diffs)
• UploadAction.java (modified) (11 diffs)
• downloadtasks/DownloadOsmTaskList.java (modified) (5 diffs)

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

@@ -16 +16 @@
 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;
@@ -39 +40 @@
      * @param id the primitive id
      */
-    protected void handlePrimitiveGoneException(long id) {
+    protected void handlePrimitiveGoneException(long id, OsmPrimitiveType type) {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        reader.append(getCurrentDataSet(),id);
+        reader.append(getCurrentDataSet(),id, type);
         DataSet ds = null;
         try {
@@ -73 +74 @@
      *
      */
-    public void updatePrimitive(long id) throws IllegalStateException{
+    public void updatePrimitive(OsmPrimitiveType type, long id) throws IllegalStateException{
         if (getEditLayer() == null)
             throw new IllegalStateException(tr("No current dataset found"));
-        OsmPrimitive primitive = getEditLayer().data.getPrimitiveById(id);
+        OsmPrimitive primitive = getEditLayer().data.getPrimitiveById(id, type);
         if (primitive == null)
             throw new IllegalStateException(tr("Didn't find a primitive with id {0} in the current dataset", id));

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

@@ -41 +41 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -191 +192 @@
      * @param id the primitive ID
      */
-    protected void synchronizePrimitive(final String id) {
-        Main.worker.execute(new UpdatePrimitiveTask(Long.parseLong(id)));
+    protected void synchronizePrimitive(final OsmPrimitiveType type, final long id) {
+        Main.worker.execute(new UpdatePrimitiveTask(type, id));
     }
 
@@ -217 +218 @@
      * @param myVersion  the version of the primitive in the local dataset
      */
-    protected void handleUploadConflictForKnownConflict(String primitiveType, String id, String serverVersion, String myVersion) {
+    protected void handleUploadConflictForKnownConflict(OsmPrimitiveType primitiveType, long id, String serverVersion, String myVersion) {
         Object[] options = new Object[] {
-                tr("Synchronize {0} {1} only", tr(primitiveType), id),
+                tr("Synchronize {0} {1} only", tr(primitiveType.getAPIName()), id),
                 tr("Synchronize entire dataset"),
                 tr("Cancel")
@@ -232 +233 @@
                 + "Click <strong>{5}</strong> to synchronize the entire local dataset with the server.<br>"
                 + "Click <strong>{6}</strong> to abort and continue editing.<br></html>",
-                tr(primitiveType), id, serverVersion, myVersion,
+                tr(primitiveType.getAPIName()), id, serverVersion, myVersion,
                 options[0], options[1], options[2]
         );
@@ -247 +248 @@
         );
         switch(ret) {
-            case JOptionPane.CLOSED_OPTION: return;
-            case JOptionPane.CANCEL_OPTION: return;
-            case 0: synchronizePrimitive(id); break;
-            case 1: synchronizeDataSet(); break;
-            default:
-                // should not happen
-                throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
+        case JOptionPane.CLOSED_OPTION: return;
+        case JOptionPane.CANCEL_OPTION: return;
+        case 0: synchronizePrimitive(primitiveType, id); break;
+        case 1: synchronizeDataSet(); break;
+        default:
+            // should not happen
+            throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
         }
     }
@@ -287 +288 @@
         );
         switch(ret) {
-            case JOptionPane.CLOSED_OPTION: return;
-            case 1: return;
-            case 0: synchronizeDataSet(); break;
-            default:
-                // should not happen
-                throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
+        case JOptionPane.CLOSED_OPTION: return;
+        case 1: return;
+        case 0: synchronizeDataSet(); break;
+        default:
+            // should not happen
+            throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
         }
     }
@@ -306 +307 @@
         Matcher m = p.matcher(e.getErrorHeader());
         if (m.matches()) {
-            handleUploadConflictForKnownConflict(m.group(3), m.group(4), m.group(2),m.group(1));
+            handleUploadConflictForKnownConflict(OsmPrimitiveType.from(m.group(3)), Long.parseLong(m.group(4)), m.group(2),m.group(1));
         } else {
             logger.warning(tr("Warning: error header \"{0}\" did not match expected pattern \"{1}\"", e.getErrorHeader(),pattern));
@@ -326 +327 @@
      * @see UpdateSelectionAction#handlePrimitiveGoneException(long)
      */
-    protected void handleGoneForKnownPrimitive(String primitiveType, String id) {
+    protected void handleGoneForKnownPrimitive(OsmPrimitiveType primitiveType, String id) {
         UpdateSelectionAction act = new UpdateSelectionAction();
-        act.handlePrimitiveGoneException(Long.parseLong(id));
+        act.handlePrimitiveGoneException(Long.parseLong(id),primitiveType);
     }
 
@@ -344 +345 @@
         Matcher m = p.matcher(e.getErrorHeader());
         if (m.matches()) {
-            handleGoneForKnownPrimitive(m.group(1), m.group(2));
+            handleGoneForKnownPrimitive(OsmPrimitiveType.from(m.group(1)), m.group(2));
         } else {
             logger.warning(tr("Error header \"{0}\" does not match expected pattern \"{1}\"",e.getErrorHeader(), pattern));
@@ -424 +425 @@
         private Exception lastException = null;
         private long id;
-
-        public UpdatePrimitiveTask(long id) {
+        private OsmPrimitiveType type;
+
+        public UpdatePrimitiveTask(OsmPrimitiveType type, long id) {
             super(tr("Updating primitive"),false /* don't ignore exceptions */);
             this.id = id;
+            this.type = type;
         }
 
@@ -433 +436 @@
             try {
                 UpdateSelectionAction act = new UpdateSelectionAction();
-                act.updatePrimitive(id);
+                act.updatePrimitive(type, id);
             } catch (Exception sxe) {
                 if (uploadCancelled) {

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -125 +125 @@
         final OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
         if (editLayer != null) {
-            Set<Long> myPrimitiveIds = editLayer.data.getCompletePrimitiveIds();
-            Set<Long> downloadedIds = getDownloadedIds();
-            myPrimitiveIds.removeAll(downloadedIds);
-            myPrimitiveIds.remove(new Long(0)); // ignore new primitives
-            if (! myPrimitiveIds.isEmpty()) {
-                handlePotentiallyDeletedPrimitives(myPrimitiveIds);
-            }
-        }
+            Set<OsmPrimitive> myPrimitives = getCompletePrimitives(editLayer.data);
+            for (DownloadTask task : osmTasks) {
+                if(task instanceof DownloadOsmTask) {
+                    DataSet ds = ((DownloadOsmTask)task).getDownloadedData();
+                    if (ds != null) {
+                        myPrimitives.removeAll(ds.nodes);
+                        myPrimitives.removeAll(ds.ways);
+                        myPrimitives.removeAll(ds.relations);
+                    }
+                }
+            }
+            if (! myPrimitives.isEmpty()) {
+                handlePotentiallyDeletedPrimitives(myPrimitives);
+            }
+        }
+    }
+
+
+    /**
+     * Replies the set of ids of all complete primitives (i.e. those with
+     * ! primitive.incomplete)
+     *
+     * @return the set of ids of all complete primitives
+     */
+    protected Set<OsmPrimitive> getCompletePrimitives(DataSet ds) {
+        HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+        for (OsmPrimitive primitive : ds.nodes) {
+            if (!primitive.incomplete && primitive.getId() == 0) {
+                ret.add(primitive);
+            }
+        }
+        for (OsmPrimitive primitive : ds.ways) {
+            if (! primitive.incomplete && primitive.getId() == 0) {
+                ret.add(primitive);
+            }
+        }
+        for (OsmPrimitive primitive : ds.relations) {
+            if (! primitive.incomplete && primitive.getId() == 0) {
+                ret.add(primitive);;
+            }
+        }
+        return ret;
     }
 
@@ -141 +175 @@
      * @param potentiallyDeleted a set of ids to check update from the server
      */
-    protected void updatePotentiallyDeletedPrimitives(Set<Long> potentiallyDeleted) {
-        DataSet ds =  Main.map.mapView.getEditLayer().data;
+    protected void updatePotentiallyDeletedPrimitives(Set<OsmPrimitive> potentiallyDeleted) {
         final ArrayList<OsmPrimitive> toSelect = new ArrayList<OsmPrimitive>();
-        for (Long id : potentiallyDeleted) {
-            OsmPrimitive primitive = ds.getPrimitiveById(id);
+        for (OsmPrimitive primitive : potentiallyDeleted) {
             if (primitive != null) {
                 toSelect.add(primitive);
@@ -167 +199 @@
      * @param potentiallyDeleted a set of primitives (given by their ids)
      */
-    protected void handlePotentiallyDeletedPrimitives(Set<Long> potentiallyDeleted) {
+    protected void handlePotentiallyDeletedPrimitives(Set<OsmPrimitive> potentiallyDeleted) {
         String [] options = {
                 "Check on the server",
@@ -197 +229 @@
         );
         switch(ret) {
-            case JOptionPane.CLOSED_OPTION: return;
-            case JOptionPane.NO_OPTION: return;
-            case JOptionPane.YES_OPTION: updatePotentiallyDeletedPrimitives(potentiallyDeleted); break;
-        }
-    }
-
-    /**
-     * replies true, if the primitive with id <code>id</code> was downloaded into the
-     * dataset <code>ds</code>
-     *
-     * @param id the id
-     * @param ds the dataset
-     * @return true, if the primitive with id <code>id</code> was downloaded into the
-     * dataset <code>ds</code>; false otherwise
-     */
-    protected boolean wasDownloaded(long id, DataSet ds) {
-        OsmPrimitive primitive = ds.getPrimitiveById(id);
-        return primitive != null;
-    }
-
-    /**
-     * replies true, if the primitive with id <code>id</code> was downloaded into the
-     * dataset of one of the download tasks
-     *
-     * @param id the id
-     * @return true, if the primitive with id <code>id</code> was downloaded into the
-     * dataset of one of the download tasks
-     *
-     */
-    public boolean wasDownloaded(long id) {
-        for (DownloadTask task : osmTasks) {
-            if(task instanceof DownloadOsmTask) {
-                DataSet ds = ((DownloadOsmTask)task).getDownloadedData();
-                if(wasDownloaded(id,ds)) return true;
-            }
-        }
-        return false;
+        case JOptionPane.CLOSED_OPTION: return;
+        case JOptionPane.NO_OPTION: return;
+        case JOptionPane.YES_OPTION: updatePotentiallyDeletedPrimitives(potentiallyDeleted); break;
+        }
     }
 
@@ -241 +240 @@
      * @return the set of primitive ids which have been downloaded by this task list
      */
-    public Set<Long> getDownloadedIds() {
-        HashSet<Long> ret = new HashSet<Long>();
+    public Set<OsmPrimitive> getDownloadedPrimitives() {
+        HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
         for (DownloadTask task : osmTasks) {
             if(task instanceof DownloadOsmTask) {
                 DataSet ds = ((DownloadOsmTask)task).getDownloadedData();
                 if (ds != null) {
-                    ret.addAll(ds.getPrimitiveIds());
+                    ret.addAll(ds.nodes);
+                    ret.addAll(ds.ways);
+                    ret.addAll(ds.relations);
                 }
             }