Changeset 2077 in josm for trunk/src/org/openstreetmap/josm/actions/UploadAction.java

Timestamp:

2009-09-07T23:06:19+02:00 (15 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.

File:

• trunk/src/org/openstreetmap/josm/actions/UploadAction.java (modified) (11 diffs)

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) {