Changeset 13499 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2018-03-04T16:09:51+01:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
r12620 r13499 17 17 import org.openstreetmap.josm.Main; 18 18 import org.openstreetmap.josm.data.osm.OsmPrimitive; 19 import org.openstreetmap.josm.gui.widgets.HtmlPanel; 19 20 import org.openstreetmap.josm.io.ChangesetClosedException; 20 21 import org.openstreetmap.josm.io.IllegalDataException; … … 361 362 */ 362 363 public static void explainGenericHttpException(OsmApiException e) { 363 HelpAwareOptionPane.showOptionDialog( 364 Main.parent, 365 ExceptionUtil.explainGeneric(e), 364 String body = e.getErrorBody(); 365 Object msg = null; 366 if ("text/html".equals(e.getContentType()) && body != null && body.startsWith("<") && body.contains("<html>")) { 367 msg = new HtmlPanel(body); 368 } else { 369 msg = ExceptionUtil.explainGeneric(e); 370 } 371 HelpAwareOptionPane.showOptionDialog( 372 Main.parent, 373 msg, 366 374 tr("Communication with OSM server failed"), 367 375 JOptionPane.ERROR_MESSAGE,
Note:
See TracChangeset
for help on using the changeset viewer.