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

Timestamp:

2009-09-03T13:02:19+02:00 (15 years ago)

Author:

Gubaer

Message:

Improved user feedback in case of timed retries after InternalServerErrors
Improved user feedback in case of problems with closing changesets

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ApiPreconditionChecker.java (modified) (2 diffs)
• UploadAction.java (modified) (3 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmApiInitializationException;
@@ -24 +25 @@
         OsmApi api = OsmApi.getOsmApi();
         try {
-            api.initialize();
+            api.initialize(NullProgressMonitor.INSTANCE);
             long maxNodes = 0;
             if (api.getCapabilities().isDefined("waynodes", "maximum")) {

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

@@ -40 +40 @@
 import org.openstreetmap.josm.io.OsmApiException;
 import org.openstreetmap.josm.io.OsmApiInitializationException;
+import org.openstreetmap.josm.io.OsmChangesetCloseException;
 import org.openstreetmap.josm.io.OsmServerWriter;
 import org.openstreetmap.josm.tools.GBC;
@@ -343 +344 @@
         }
 
+        if (e instanceof OsmChangesetCloseException) {
+            ExceptionDialogUtil.explainOsmChangesetCloseException((OsmChangesetCloseException)e);
+            return;
+        }
         if (e instanceof OsmApiException) {
             OsmApiException ex = (OsmApiException)e;
@@ -493 +498 @@
                 );
                 dialog.setButtonIcons(new String[] {"upload.png", "cancel.png"});
-                dialog.setContent(p);
+                dialog.setContent(p, false /* no scroll pane */);
                 dialog.showDialog();
                 int result = dialog.getValue();