Index: trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (revision 14807) +++ trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java (revision 14810) @@ -335,5 +335,5 @@ String body = e.getErrorBody(); Object msg = null; - if ("text/html".equals(e.getContentType()) && body != null && body.startsWith("<") && body.contains("")) { + if (e.isHtml() && body != null && body.startsWith("<") && body.contains("")) { msg = new HtmlPanel(body); } else { Index: trunk/src/org/openstreetmap/josm/io/OsmApiException.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmApiException.java (revision 14807) +++ trunk/src/org/openstreetmap/josm/io/OsmApiException.java (revision 14810) @@ -4,4 +4,5 @@ import org.openstreetmap.josm.tools.Logging; +import org.openstreetmap.josm.tools.Utils; /** @@ -32,8 +33,9 @@ this.responseCode = responseCode; this.errorHeader = errorHeader; - this.errorBody = errorBody; + this.errorBody = Utils.strip(errorBody); this.accessedUrl = accessedUrl; this.login = login; this.contentType = contentType; + checkHtmlBody(); } @@ -111,4 +113,13 @@ public OsmApiException(String message, Throwable cause) { super(message, cause); + } + + private void checkHtmlBody() { + if (errorBody != null && errorBody.matches("^<.*>.*<.*>$")) { + setContentType("text/html"); + if (!errorBody.contains("")) { + errorBody = "" + errorBody + ""; + } + } } @@ -268,3 +279,12 @@ return contentType; } + + /** + * Determines if the exception has {@code text/html} as content type. + * @return {@code true} if the exception has {@code text/html} as content type. + * @since xxx + */ + public final boolean isHtml() { + return "text/html".equals(contentType); + } }