Changeset 5316 in josm for trunk

Timestamp:

2012-07-08T21:11:44+02:00 (12 years ago)

Author:

bastiK

Message:

see #7840 - List Entry icons do not honor the file paths of preset (i.e. the zip file) (based on patch by simon04)

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -304 +304 @@
         public String locale_display_value;
         public String locale_short_description;
+        private final File zipIcons = TaggingPreset.zipIcons;
 
         public String getListDisplay() {
@@ -325 +326 @@
 
         public ImageIcon getIcon() {
-            return icon == null ? null : ImageProvider.getIfAvailable(icon);
+            return icon == null ? null : loadImageIcon(icon, zipIcons);
         }
 
@@ -1228 +1229 @@
     }
 
+    protected static ImageIcon loadImageIcon(String iconName, File zipIcons) {
+        final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
+        return new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true).get();
+    }
+
     /*
      * Called from the XML parser to set the icon.
@@ -1236 +1242 @@
      */
     public void setIcon(final String iconName) {
-        final File zipIcons = this.zipIcons;
+        final File zipIcons = TaggingPreset.zipIcons;
         Main.worker.submit(new Runnable() {
 
             @Override
             public void run() {
-                final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
-                ImageIcon icon = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true).get();
+                ImageIcon icon = loadImageIcon(iconName, zipIcons);
                 if (icon == null) {
                     System.out.println("Could not get presets icon " + iconName);
@@ -1431 +1436 @@
                         );
             }
-            zipIcons = null;
         }
         return allPresets;