Changeset 7693 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-11-02T01:19:59+01:00 (11 years ago)

Author:

stoecker

Message:

see #10684 - no double loading of images, cleanup action icons - menu icon size defaults now to 16x16 (previously most time 24x24) with some errors - maybe 24x24 should be default?

File:

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

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

@@ -52 +52 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageResource;
 import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
@@ -153 +154 @@
         imgProv.setArchive(arch);
         imgProv.setOptional(true);
-        imgProv.setSize(ImageProvider.ImageSizes.SMALLICON);
-        imgProv.getInBackground(new ImageProvider.ImageCallback() {
+        imgProv.getInBackground(new ImageProvider.ImageResourceCallback() {
             @Override
-            public void finished(final ImageIcon result) {
+            public void finished(final ImageResource result) {
                 if (result != null) {
                     GuiHelper.runInEDT(new Runnable() {
                         @Override
                         public void run() {
-                            putValue(Action.SMALL_ICON, result);
+                            result.getImageIcon(TaggingPreset.this);
                         }
                     });
                 } else {
                     Main.warn("Could not get presets icon " + iconName);
-                }
-            }
-        });
-        imgProv = new ImageProvider(iconName);
-        imgProv.setDirs(s);
-        imgProv.setId("presets");
-        imgProv.setArchive(arch);
-        imgProv.setOptional(true);
-        imgProv.setSize(ImageProvider.ImageSizes.LARGEICON);
-        imgProv.getInBackground(new ImageProvider.ImageCallback() {
-            @Override
-            public void finished(final ImageIcon result) {
-                if (result != null) {
-                    GuiHelper.runInEDT(new Runnable() {
-                        @Override
-                        public void run() {
-                            putValue(Action.LARGE_ICON_KEY, result);
-                        }
-                    });
                 }
             }