Changeset 2413 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-11-08T18:51:51+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3864: Exception handling improvements

File:

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

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

@@ -6 +6 @@
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.net.HttpURLConnection;
 import java.net.SocketException;
@@ -17 +18 @@
 import org.openstreetmap.josm.io.OsmChangesetCloseException;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.ExceptionUtil;
 
@@ -82 +84 @@
      */
     public static void explainGeneric(Exception e) {
+        e.printStackTrace();
         HelpAwareOptionPane.showOptionDialog(
                 Main.parent,
@@ -146 +149 @@
 
     /**
+     * Explains a {@see InvocationTargetException }
+     * 
+     * @param e the exception
+     */
+
+    public static void explainNestedInvocationTargetException(Exception e) {
+        InvocationTargetException ex = getNestedException(e, InvocationTargetException.class);
+        if (ex != null) {
+            // Users should be able to submit a bug report for an invocation target exception
+            //
+            BugReportExceptionHandler.handleException(ex);
+            return;
+        }
+    }
+
+    /**
      * Explains a {@see OsmApiException} which was thrown because of an internal server
-     * error in the OSM API server..
+     * error in the OSM API server.
      * 
      * @param e the exception
@@ -334 +353 @@
      */
     public static void explainException(Exception e) {
+        if (getNestedException(e, InvocationTargetException.class) != null) {
+            explainNestedInvocationTargetException(e);
+            return;
+        }
         if (e instanceof OsmTransferException) {
             explainOsmTransferException((OsmTransferException) e);