Changeset 13647 in josm for trunk/src/org/openstreetmap/josm/actions/JosmAction.java

Timestamp:

2018-04-19T20:37:16+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16204 - Allow to start and close JOSM in WebStart sandbox mode (where every external access is denied). This was very useful to reproduce some very tricky bugs that occured in real life but were almost impossible to diagnose.

File:

• trunk/src/org/openstreetmap/josm/actions/JosmAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -36 +36 @@
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageResource;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -81 +82 @@
             String toolbarId, boolean installAdapters) {
         super(name);
-        if (icon != null)
-            icon.getResource().attachImageIcon(this, true);
+        if (icon != null) {
+            ImageResource resource = icon.getResource();
+            if (resource != null) {
+                resource.attachImageIcon(this, true);
+            }
+        }
         setHelpId();
         sc = shortcut;
@@ -119 +124 @@
     public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean registerInToolbar,
             String toolbarId, boolean installAdapters) {
-        this(name, iconName == null ? null : new ImageProvider(iconName), tooltip, shortcut, registerInToolbar,
+        this(name, iconName == null ? null : new ImageProvider(iconName).setOptional(true), tooltip, shortcut, registerInToolbar,
                 toolbarId == null ? iconName : toolbarId, installAdapters);
     }