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

Timestamp:

2017-05-03T11:19:04+02:00 (7 years ago)

Author:

bastiK

Message:

applied #13956 - memory optimization with presets cache (patch by GerdP)

Location:

trunk/src/org/openstreetmap/josm/gui/tagging

Files:

• ac/AutoCompletionManager.java (modified) (7 diffs)
• presets/TaggingPresets.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
-import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup;
-import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
-import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -203 +199 @@
 
     /**
-     * Initialize the cache for presets. This is done only once.
-     * @param presets Tagging presets to cache
-     */
-    public static void cachePresets(Collection<TaggingPreset> presets) {
-        for (final TaggingPreset p : presets) {
-            for (TaggingPresetItem item : p.data) {
-                cachePresetItem(p, item);
-            }
-        }
-    }
-
-    protected static void cachePresetItem(TaggingPreset p, TaggingPresetItem item) {
-        if (item instanceof KeyedItem) {
-            KeyedItem ki = (KeyedItem) item;
-            if (ki.key != null && ki.getValues() != null) {
-                PRESET_TAG_CACHE.putAll(ki.key, ki.getValues());
-            }
-        } else if (item instanceof Roles) {
-            Roles r = (Roles) item;
-            for (Role i : r.roles) {
-                if (i.key != null) {
-                    PRESET_ROLE_CACHE.add(i.key);
-                }
-            }
-        } else if (item instanceof CheckGroup) {
-            for (KeyedItem check : ((CheckGroup) item).checks) {
-                cachePresetItem(p, check);
-            }
-        }
-    }
-
-    /**
      * Remembers user input for the given key/value.
      * @param key Tag key
@@ -253 +217 @@
     protected List<String> getDataKeys() {
         return new ArrayList<>(getTagCache().keySet());
-    }
-
-    protected List<String> getPresetKeys() {
-        return new ArrayList<>(PRESET_TAG_CACHE.keySet());
     }
 
@@ -281 +241 @@
     }
 
-    protected static List<String> getPresetValues(String key) {
-        return new ArrayList<>(PRESET_TAG_CACHE.getValues(key));
-    }
-
     protected static Collection<String> getUserInputValues(String key) {
         List<String> values = new ArrayList<>();
@@ -312 +268 @@
      */
     public void populateWithMemberRoles(AutoCompletionList list) {
-        list.add(PRESET_ROLE_CACHE, AutoCompletionItemPriority.IS_IN_STANDARD);
+        list.add(TaggingPresets.getPresetRoles(), AutoCompletionItemPriority.IS_IN_STANDARD);
         list.add(getRoleCache(), AutoCompletionItemPriority.IS_IN_DATASET);
     }
@@ -347 +303 @@
      */
     public void populateWithKeys(AutoCompletionList list) {
-        list.add(getPresetKeys(), AutoCompletionItemPriority.IS_IN_STANDARD);
+        list.add(TaggingPresets.getPresetKeys(), AutoCompletionItemPriority.IS_IN_STANDARD);
         list.add(new AutoCompletionListItem("source", AutoCompletionItemPriority.IS_IN_STANDARD));
         list.add(getDataKeys(), AutoCompletionItemPriority.IS_IN_DATASET);
@@ -373 +329 @@
     public void populateWithTagValues(AutoCompletionList list, List<String> keys) {
         for (String key : keys) {
-            list.add(getPresetValues(key), AutoCompletionItemPriority.IS_IN_STANDARD);
+            list.add(TaggingPresets.getPresetValues(key), AutoCompletionItemPriority.IS_IN_STANDARD);
             list.add(getDataValues(key), AutoCompletionItemPriority.IS_IN_DATASET);
             list.addUserInput(getUserInputValues(key));

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import javax.swing.JMenu;
@@ -14 +17 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MenuScroller;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.gui.tagging.presets.items.CheckGroup;
+import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
+import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
+import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
+import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
@@ -26 +33 @@
     private static final Collection<TaggingPreset> taggingPresets = new ArrayList<>();
 
+    /** cache for key/value pairs found in the preset */
+    private static final MultiMap<String, String> PRESET_TAG_CACHE = new MultiMap<>();
+    /** cache for roles found in the preset */
+    private static final Set<String> PRESET_ROLE_CACHE = new HashSet<>();
+
     /** The collection of listeners */
     private static final Collection<TaggingPresetListener> listeners = new ArrayList<>();
@@ -39 +51 @@
         taggingPresets.clear();
         taggingPresets.addAll(TaggingPresetReader.readFromPreferences(false, false));
+        cachePresets(taggingPresets);
     }
 
@@ -54 +67 @@
             Main.main.menu.presetsMenu.setVisible(false);
         } else {
-            AutoCompletionManager.cachePresets(taggingPresets);
             Map<TaggingPresetMenu, JMenu> submenus = new HashMap<>();
             for (final TaggingPreset p : taggingPresets) {
@@ -88 +100 @@
 
     /**
+     * Initialize the cache for presets. This is done only once.
+     * @param presets Tagging presets to cache
+     */
+    private static void cachePresets(Collection<TaggingPreset> presets) {
+        for (final TaggingPreset p : presets) {
+            for (TaggingPresetItem item : p.data) {
+                cachePresetItem(p, item);
+            }
+        }
+    }
+
+    private static void cachePresetItem(TaggingPreset p, TaggingPresetItem item) {
+        if (item instanceof KeyedItem) {
+            KeyedItem ki = (KeyedItem) item;
+            if (ki.key != null && ki.getValues() != null) {
+                try {
+                    PRESET_TAG_CACHE.putAll(ki.key, ki.getValues());
+                } catch (NullPointerException e) {
+                    Main.error(e, p + ": Unable to cache " + ki);
+                }
+            }
+        } else if (item instanceof Roles) {
+            Roles r = (Roles) item;
+            for (Role i : r.roles) {
+                if (i.key != null) {
+                    PRESET_ROLE_CACHE.add(i.key);
+                }
+            }
+        } else if (item instanceof CheckGroup) {
+            for (KeyedItem check : ((CheckGroup) item).checks) {
+                cachePresetItem(p, check);
+            }
+        }
+    }
+
+    /**
      * Replies a new collection containing all tagging presets.
      * @return a new collection containing all tagging presets. Empty if presets are not initialized (never null)
      */
     public static Collection<TaggingPreset> getTaggingPresets() {
-        return new ArrayList<>(taggingPresets);
+        return Collections.unmodifiableCollection(taggingPresets);
+    }
+
+    /**
+     * Replies a set of all roles in the tagging presets.
+     * @return a set of all roles in the tagging presets.
+     */
+    public static Set<String> getPresetRoles() {
+        return Collections.unmodifiableSet(PRESET_ROLE_CACHE);
+    }
+
+    /**
+     * Replies a set of all keys in the tagging presets.
+     * @return a set of all keys in the tagging presets.
+     */
+    public static Set<String> getPresetKeys() {
+        return Collections.unmodifiableSet(PRESET_TAG_CACHE.keySet());
+    }
+
+    /**
+     * Return set of values for a key in the tagging presets
+     * @param key the key
+     * @return set of values for a key in the tagging presets or null if none is found
+     */
+    public static Set<String> getPresetValues(String key) {
+        Set<String> values = PRESET_TAG_CACHE.get(key);
+        if (values != null)
+            return Collections.unmodifiableSet(values);
+        return null;
     }