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

Timestamp:

2009-11-19T13:30:09+01:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3937: Closed changeset (due to timeout) remains in the upload dialog

File:

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

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

@@ -38 +38 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.ChangesetClosedException;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmApiException;
 import org.openstreetmap.josm.io.OsmApiInitializationException;
 import org.openstreetmap.josm.io.OsmApiPrimitiveGoneException;
-import org.openstreetmap.josm.io.OsmChangesetCloseException;
 import org.openstreetmap.josm.io.OsmServerWriter;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -480 +480 @@
         }
 
-        if (e instanceof OsmChangesetCloseException) {
-            ExceptionDialogUtil.explainOsmChangesetCloseException((OsmChangesetCloseException)e);
-            return;
-        }
         if (e instanceof OsmApiPrimitiveGoneException) {
             handleGone((OsmApiPrimitiveGoneException)e);
@@ -674 +670 @@
             }
             layer.onPostUploadToServer();
-            UploadDialog.getUploadDialog().setOrUpdateChangeset(changeset);
+            if (lastException != null && lastException instanceof ChangesetClosedException) {
+                UploadDialog.getUploadDialog().removeChangeset(changeset);
+            } else {
+                UploadDialog.getUploadDialog().setOrUpdateChangeset(changeset);
+            }
         }