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

Timestamp:

09.03.2010 14:00:46 (2 years ago)

Author:

Gubaer

Message:

fixed #4684: HTTP 408 gives coding error popup

File:

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

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

@@ -282 +282 @@
 
     /**
+     * Explains a {@see OsmApiException} which was thrown because of a
+     * client timeout (HTTP 408)
+     *
+     * @param e the exception
+     */
+    public static void explainClientTimeout(OsmApiException e) {
+        HelpAwareOptionPane.showOptionDialog(
+                Main.parent,
+                ExceptionUtil.explainClientTimeout(e),
+                tr("Client Time Out"),
+                JOptionPane.ERROR_MESSAGE,
+                ht("/ErrorMessages#ClientTimeOut")
+        );
+    }
+
+    /**
+     * Explains a {@see OsmApiException} with a generic error
+     * message.
+     *
+     * @param e the exception
+     */
+    public static void explainGenericHttpException(OsmApiException e) {
+        HelpAwareOptionPane.showOptionDialog(
+                Main.parent,
+                ExceptionUtil.explainClientTimeout(e),
+                tr("Communication with OSM server failed"),
+                JOptionPane.ERROR_MESSAGE,
+                ht("/ErrorMessages#GenericCommunicationError")
+        );
+    }
+
+    /**
      * Explains a {@see OsmApiException} which was thrown because accessing a protected
      * resource was forbidden.
@@ -405 +437 @@
                 explainAuthorizationFailed(oae);
                 return;
+            case HttpURLConnection.HTTP_CLIENT_TIMEOUT:
+                explainClientTimeout(oae);
+                return;
+            default:
+                explainGenericHttpException(oae);
+                return;
             }
         }