Changeset 2613 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

Timestamp:

2009-12-11T23:07:59+01:00 (16 years ago)

Author:

Gubaer

Message:

new: global in-memory cache for downloaded changesets
new: toggle dialog for changesets
new: downloading of changesets (currently without changeset content, will follow later)

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.ChangesetCache;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -139 +140 @@
         // make sure the current changeset is removed from the upload dialog.
         //
-        UploadDialog.getUploadDialog().removeChangeset(changeset);
+        ChangesetCache.getInstance().update(changeset);
         Changeset newChangeSet = new Changeset();
         newChangeSet.setKeys(this.changeset.getKeys());
@@ -211 +212 @@
                 layer.fireDataChange();
                 layer.onPostUploadToServer();
-
-                // make sure the upload dialog lists all known open changesets
-                //
-                if (lastException != null && lastException instanceof ChangesetClosedException) {
-                    UploadDialog.getUploadDialog().removeChangeset(changeset);
-                } else {
-                    UploadDialog.getUploadDialog().updateListOfChangesetsAfterUploadOperation(changeset);
-                }
+                ChangesetCache.getInstance().update(changeset);
             }
         };
@@ -298 +292 @@
         if (uploadCancelled)
             return;
-        if (lastException == null)
-            return;
 
         // depending on the success of the upload operation and on the policy for
@@ -309 +301 @@
         Runnable r = new Runnable() {
             public void run() {
+                // if the changeset is still open after this upload we want it to
+                // be selected on the next upload
+                //
+                ChangesetCache.getInstance().update(changeset);
+                if (changeset != null && changeset.isOpen()) {
+                    UploadDialog.getUploadDialog().setSelectedChangesetForNextUpload(changeset);
+                }
+                if (lastException == null)
+                    return;
                 if (lastException instanceof ChangesetClosedException) {
                     ChangesetClosedException e = (ChangesetClosedException)lastException;
@@ -337 +338 @@
             }
         };
-        SwingUtilities.invokeLater(r);
+        if (SwingUtilities.isEventDispatchThread()) {
+            r.run();
+        } else {
+            SwingUtilities.invokeLater(r);
+        }
     }