Changeset 8967 in josm for trunk

Timestamp:

2015-10-29T17:47:43+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12027 - handle missing SVG files in help window

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java

@@ -10 +10 @@
 import java.net.URL;
 
+import javax.swing.ImageIcon;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.Element;
@@ -127 +128 @@
             String urlStr = src.toExternalForm();
             if (urlStr.endsWith(".svg") || urlStr.endsWith(".svg?format=raw")) {
-                imageField.set(this, new ImageProvider(urlStr).get().getImage());
+                ImageIcon imgIcon = new ImageProvider(urlStr).setOptional(true).get();
+                imageField.set(this, imgIcon != null ? imgIcon.getImage() : null);
             } else {
                 Method loadImage = ImageView.class.getDeclaredMethod("loadImage");