Changeset 1991 in josm for trunk/src/org

Timestamp:

2009-08-23T22:47:36+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #2000: ID in selection lists isn't updated after upload until the user does something in the interface

File:

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

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

@@ -27 +27 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
@@ -235 +236 @@
         );
         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(id); break;
+        case 1: synchronizeDataSet(); break;
+        default:
+            // should not happen
+            throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
         }
     }
@@ -274 +275 @@
         );
         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));
         }
     }
@@ -554 +555 @@
             //
             getEditLayer().cleanupAfterUpload(writer.getProcessedPrimitives());
+            DataSet.fireSelectionChanged(getEditLayer().data.getSelected());
+            getEditLayer().fireDataChange();
             if (lastException != null) {
                 handleFailedUpload(lastException);