Changeset 1670 in josm for trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

Timestamp:

15.06.2009 20:22:46 (3 years ago)

Author:

Gubaer

Message:

fixed: bug in OsmApi.getOsmApi()
cleanup: exception handling in interfacing with OSM API
new: new action for updating individual elements with the their current state on the server (including new menu item in the file menu)
new: improved user feedback in case of conflicts
new: handles 410 Gone conflicts when uploading a changeset
new: undoable command for "purging" a primitive from the current dataset (necessary if the primitive is already deleted on the server and the user wants to remove it from its local dataset)
new: undoable command for "undeleting" an already deleted primitive on the server (kind of "cloning")
new: after a full upload, checks whether there are primitives in the local dataset which might be deleted on the server.
new: data structures for history data
new: history download support in io package

File:

• trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

@@ -17 +17 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.OsmTransferException;
 import org.xml.sax.SAXException;
 
@@ -109 +110 @@
                 x.printStackTrace();
                 errorMessage = x.getMessage();
+            } catch(OsmTransferException x) {
+                x.printStackTrace();
+                if (x.getCause() != null) {
+                    errorMessage = x.getCause().getMessage();
+                } else {
+                    errorMessage = x.getMessage();
+                }
             } finally {
                 closeDialog();
@@ -134 +142 @@
      * is called. finish() is called in any case.
      */
-    protected abstract void realRun() throws SAXException, IOException;
+    protected abstract void realRun() throws SAXException, IOException, OsmTransferException;
 
     /**
@@ -158 +166 @@
                         Main.pleaseWaitDlg.dispose();
                     }
-                    if (errorMessage != null && !silent)
+                    if (errorMessage != null && !silent) {
                         JOptionPane.showMessageDialog(Main.parent, errorMessage);
+                    }
                 }
             };
 
             // make sure, this is called in the dispatcher thread ASAP
-            if (EventQueue.isDispatchThread())
+            if (EventQueue.isDispatchThread()) {
                 runnable.run();
-            else
+            } else {
                 EventQueue.invokeAndWait(runnable);
+            }
 
         } catch (InterruptedException e) {