Changeset 13965 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-06-22T20:19:02+02:00 (6 years ago)

Author:

Don-vip

Message:

cache contextual popup menu icons to improve performance when filtering plugin preferences panel

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java (modified) (3 diffs)

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

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeListener;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.swing.AbstractAction;
@@ -44 +46 @@
     private static final String EDITABLE = "editable";
 
+    private static final Map<String, ImageIcon> iconCache = new HashMap<>();
+
+    private static ImageIcon loadIcon(String iconName) {
+        return iconCache.computeIfAbsent(iconName,
+                x -> new ImageProvider(iconName).setOptional(true).setSize(ImageProvider.ImageSizes.SMALLICON).get());
+    }
+
     protected JTextComponent component;
     protected boolean undoRedo;
@@ -173 +182 @@
             mi.setText(label);
             if (iconName != null && Config.getPref().getBoolean("text.popupmenu.useicons", true)) {
-                ImageIcon icon = new ImageProvider(iconName).setOptional(true).setSize(ImageProvider.ImageSizes.SMALLICON).get();
+                ImageIcon icon = loadIcon(iconName);
                 if (icon != null) {
                     mi.setIcon(icon);