Index: trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 9874) +++ trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 9876) @@ -356,5 +356,5 @@ + "Communication with the OSM server ''{0}'' timed out. Please retry later." + "", - OsmApi.getOsmApi().getBaseUrl() + getUrlFromException(e) ); } @@ -381,5 +381,5 @@ + "Error message (untranslated): {2}" + "", - OsmApi.getOsmApi().getBaseUrl(), + getUrlFromException(e), e.getResponseCode(), errMsg @@ -572,18 +572,5 @@ */ public static String explainBadRequest(OsmApiException e) { - String url = null; - if (e.getAccessedUrl() != null) { - try { - url = new URL(e.getAccessedUrl()).getHost(); - } catch (MalformedURLException e1) { - Main.warn(e1); - } - } - if (url == null && e.getUrl() != null) { - url = e.getUrl(); - } else if (url == null) { - url = OsmApi.getOsmApi().getBaseUrl(); - } - String message = tr("The OSM server ''{0}'' reported a bad request.
", url); + String message = tr("The OSM server ''{0}'' reported a bad request.
", getUrlFromException(e)); String errorHeader = e.getErrorHeader(); if (errorHeader != null && (errorHeader.startsWith("The maximum bbox") || @@ -619,10 +606,9 @@ */ public static String explainNotFound(OsmApiException e) { - String apiUrl = OsmApi.getOsmApi().getBaseUrl(); String message = tr("The OSM server ''{0}'' does not know about an object
" + "you tried to read, update, or delete. Either the respective object
" + "does not exist on the server or you are using an invalid URL to access
" + "it. Please carefully check the server''s address ''{0}'' for typos.", - apiUrl); + getUrlFromException(e)); Main.error(e); return "" + message + ""; @@ -747,3 +733,18 @@ } } + + static String getUrlFromException(OsmApiException e) { + if (e.getAccessedUrl() != null) { + try { + return new URL(e.getAccessedUrl()).getHost(); + } catch (MalformedURLException e1) { + Main.warn(e1); + } + } + if (e.getUrl() != null) { + return e.getUrl(); + } else { + return OsmApi.getOsmApi().getBaseUrl(); + } + } }