Index: trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (revision 1956)
+++ trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (revision 1957)
@@ -4,4 +4,5 @@
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -152,4 +153,30 @@
*/
+ public static void explainNestedIOException(OsmTransferException e) {
+ IOException ioe = getNestedException(e, IOException.class);
+ String apiUrl = OsmApi.getOsmApi().getBaseUrl();
+ String message = tr("Failed to upload data to or download data from
"
+ + "''{0}''
"
+ + "due to a problem with transferring data.
"
+ + "Details(untranslated): {1}",
+ apiUrl, ioe.getMessage()
+ );
+ e.printStackTrace();
+ OptionPaneUtil.showMessageDialog(
+ Main.parent,
+ message,
+ tr("IO Exception"),
+ JOptionPane.ERROR_MESSAGE
+ );
+ }
+
+ /**
+ * Explains a {@see SecurityException} which has caused an {@see OsmTransferException}.
+ * This is most likely happening when user tries to access the OSM API from whitin an
+ * applet which wasn't loaded from the API server.
+ *
+ * @param e the exception
+ */
+
public static void explainNestedUnkonwnHostException(OsmTransferException e) {
String apiUrl = OsmApi.getOsmApi().getBaseUrl();
@@ -176,46 +203,25 @@
}
- protected static T getNestedException(Exception e, Class nested) {
+ /**
+ * Replies the first nested exception of type nestedClass (including
+ * the root exception e) or null, if no such exception is found.
+ *
+ * @param
+ * @param e the root exception
+ * @param nestedClass the type of the nested exception
+ * @return the first nested exception of type nestedClass (including
+ * the root exception e) or null, if no such exception is found.
+ */
+ protected static T getNestedException(Exception e, Class nestedClass) {
Throwable t = e;
- while (t != null && !(t.getClass().isAssignableFrom(nested))) {
+ while (t != null && !(nestedClass.isInstance(t))) {
t = t.getCause();
}
- return nested.cast(t);
- }
-
- /**
- * Replies the first {@see SecurityException} in a chain of nested exceptions.
- * null, if no {@see SecurityException} is in this chain.
- *
- * @param e the root exception
- * @return the first {@see SecurityException} in a chain of nested exceptions
- */
- protected static SecurityException getNestedSecurityException(Exception e) {
- return getNestedException(e, SecurityException.class);
- }
-
-
- /**
- * Replies the first {@see SocketException} in a chain of nested exceptions.
- * null, if no {@see SocketException} is in this chain.
- *
- * @param e the root exception
- * @return the first {@see SocketException} in a chain of nested exceptions
- */
- protected static SocketException getNestedSocketException(Exception e) {
- return getNestedException(e, SocketException.class);
- }
-
- /**
- * Replies the first {@see UnknownHostException} in a chain of nested exceptions.
- * null, if no {@see UnknownHostException} is in this chain.
- *
- * @param e the root exception
- * @return the first {@see UnknownHostException} in a chain of nested exceptions
- */
- protected static UnknownHostException getNestedUnknownHostException(Exception e) {
- return getNestedException(e, UnknownHostException.class);
- }
-
+ if (t== null)
+ return null;
+ else if (nestedClass.isInstance(t))
+ return nestedClass.cast(t);
+ return null;
+ }
/**
@@ -225,14 +231,18 @@
*/
public static void explainOsmTransferException(OsmTransferException e) {
- if (getNestedSecurityException(e) != null) {
+ if (getNestedException(e, SecurityException.class) != null) {
explainSecurityException(e);
return;
}
- if (getNestedSocketException(e) != null) {
+ if (getNestedException(e, SocketException.class) != null) {
explainNestedSocketException(e);
return;
}
- if (getNestedUnknownHostException(e) != null) {
+ if (getNestedException(e, UnknownHostException.class) != null) {
explainNestedUnkonwnHostException(e);
+ return;
+ }
+ if (getNestedException(e, IOException.class) != null) {
+ explainNestedIOException(e);
return;
}
@@ -252,5 +262,4 @@
}
}
-
explainGeneric(e);
}