Changeset 2289 in josm for trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java

Timestamp:

2009-10-15T04:45:06+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3719: Upload dialog still lists closed changesets after JOSM knows they've been closed
fixed #3668: Upload dialog: comment textbox buggy
Added context sensitive help to upload dialog
Improved error handling for errors due to closing already closed changesets

File:

• trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (modified) (2 diffs)

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

@@ -144 +144 @@
 
     /**
+     * Explains a {@see OsmApiException} which was thrown because of a conflict
+     * 
+     * @param e the exception
+     */
+    public static void explainConflict(OsmApiException e) {
+        JOptionPane.showMessageDialog(Main.parent, ExceptionUtil.explainConflict(e), tr("Conflict"),
+                JOptionPane.ERROR_MESSAGE);
+    }
+
+    /**
      * Explains a {@see UnknownHostException} which has caused an {@see OsmTransferException}.
      * This is most likely happening when there is an error in the API URL or when
@@ -231 +241 @@
                 return;
             }
+            if (oae.getResponseCode() == HttpURLConnection.HTTP_CONFLICT) {
+                explainConflict(oae);
+                return;
+            }
 
         }