Changeset 30810 in osm

Timestamp:

2014-11-18T23:23:20+01:00 (10 years ago)

Author:

donvip

Message:

[josm_commandline] see #josm10684 - remove hardcoded icon sizes

Location:

applications/editors/josm/plugins/CommandLine

Files:

• build.xml (modified) (1 diff)
• src/CommandLine/CommandAction.java (modified) (3 diffs)

applications/editors/josm/plugins/CommandLine/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="JOSM/CommandLine: fix exception after JOSM update"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7299"/>
+    <property name="plugin.main.version" value="7687"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandAction.java

@@ -5 +5 @@
  *
  */
-
 package CommandLine;
 
@@ -24 +23 @@
         if (!parentCommand.icon.equals("")) {
             try {
-                putValue(Action.SMALL_ICON, ImageProvider.get(CommandLine.pluginDir, parentCommand.icon));
-                putValue(Action.LARGE_ICON_KEY, ImageProvider.get(CommandLine.pluginDir, parentCommand.icon));
-            }
-            catch (NullPointerException e) {
-                putValue(Action.SMALL_ICON, ImageProvider.get("blankmenu"));
-                putValue(Action.LARGE_ICON_KEY, ImageProvider.get("blankmenu"));
-            }
-            catch (RuntimeException e) {
-                putValue(Action.SMALL_ICON, ImageProvider.get("blankmenu"));
-                putValue(Action.LARGE_ICON_KEY, ImageProvider.get("blankmenu"));
+                putIcons(CommandLine.pluginDir, parentCommand.icon);
+            } catch (RuntimeException e) {
+                putIcons(null, "blankmenu");
             }
         }
@@ -39 +31 @@
         this.parentCommand = parentCommand;
         this.parentPlugin = parentPlugin;
+    }
+
+    private void putIcons(String subdir, String name) {
+        putValue(Action.SMALL_ICON, new ImageProvider(subdir, name).setSize(ImageProvider.ImageSizes.SMALLICON).get());
+        putValue(Action.LARGE_ICON_KEY, new ImageProvider(subdir, name).setSize(ImageProvider.ImageSizes.LARGEICON).get());
     }