Changeset 2048 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java

Timestamp:

04.09.2009 10:49:53 (3 years ago)

Author:

Gubaer

Message:

Improved auto completion
fixed #2729: Auto completion with numbers sometimes annoying (only fixed in presets, relation editor, not in property dialog)
fixed #2320: Preset dialog for house numbers should have autocompletion (auto completion now supported in all preset dialogs)

Location:

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

Files:

• . (moved) (moved from trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac)
• AutoCompletionCache.java (modified) (11 diffs)

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

@@ -1 @@
-package org.openstreetmap.josm.gui.dialogs.relation.ac;
+package org.openstreetmap.josm.gui.tagging.ac;
 
 import java.util.ArrayList;
@@ -5 +5 @@
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import java.util.logging.Logger;
 
@@ -67 +70 @@
 
 
-    /** the cache */
-    private HashMap<String, ArrayList<String>> cache;
-    private  ArrayList<String> roleCache;
+    /** the cached tags give by a tag key and a list of values for this tag*/
+    private HashMap<String, Set<String>> tagCache;
+    /** the cached list of member roles */
+    private  Set<String> roleCache;
+    /** the cache of all tag values */
+    private  Set<String> allTagValues;
+    /**  the layer this cache is built for */
     private OsmDataLayer layer;
 
+
     /**
      * constructor
      */
     public AutoCompletionCache(OsmDataLayer layer) {
-        cache = new HashMap<String, ArrayList<String>>();
-        roleCache = new ArrayList<String>();
+        tagCache = new HashMap<String, Set<String>>();
+        roleCache = new HashSet<String>();
+        allTagValues = new HashSet<String>();
         this.layer = layer;
     }
@@ -91 +100 @@
      */
     protected void cacheKey(String key) {
-        if (cache.containsKey(key))
+        if (tagCache.containsKey(key))
             return;
-        else {
-            cache.put(key, new ArrayList<String>());
-        }
+        tagCache.put(key, new HashSet<String>());
     }
 
@@ -106 +113 @@
     protected void cacheValue(String key, String value) {
         cacheKey(key);
-        ArrayList<String> values = cache.get(key);
-        if (!values.contains(value)) {
-            values.add(value);
-        }
+        tagCache.get(key).add(value);
+        allTagValues.add(value);
     }
 
@@ -143 +148 @@
      *
      */
-    public void initFromJOSMDataset() {
-        cache = new HashMap<String, ArrayList<String>>();
+    public void initFromDataSet() {
+        tagCache = new HashMap<String, Set<String>>();
         if (layer == null)
             return;
@@ -152 +157 @@
         }
         for (Relation relation : layer.data.relations) {
-            if (relation.incomplete || relation.deleted) {
+            if (relation.incomplete || relation.isDeleted()) {
                 continue;
             }
             cacheRelationMemberRoles(relation);
-            Collections.sort(roleCache);
         }
     }
@@ -166 +170 @@
      */
     public List<String> getKeys() {
-        return new ArrayList<String>(cache.keySet());
+        return new ArrayList<String>(tagCache.keySet());
     }
 
@@ -177 +181 @@
      */
     public List<String> getValues(String key) {
-        if (!cache.containsKey(key))
+        if (!tagCache.containsKey(key))
             return new ArrayList<String>();
-        return cache.get(key);
+        return new ArrayList<String>(tagCache.get(key));
     }
 
@@ -188 +192 @@
      */
     public List<String> getMemberRoles() {
-        return roleCache;
+        return new ArrayList<String>(roleCache);
     }
 
@@ -199 +203 @@
     public void populateWithMemberRoles(AutoCompletionList list) {
         list.clear();
-        for (String role: roleCache) {
-            list.add(new AutoCompletionListItem(role, AutoCompletionItemPritority.IS_IN_DATASET));
-        }
+        list.add(roleCache, AutoCompletionItemPritority.IS_IN_DATASET);
+    }
+
+    /**
+     * Populates the an {@see AutoCompletionList} with the currently cached
+     * values for a tag
+     *
+     * @param list the list to populate
+     * @param key the tag key
+     * @param append true to add the values to the list; false, to replace the values
+     * in the list by the tag values
+     */
+    public void populateWithTagValues(AutoCompletionList list, String key, boolean append) {
+        if (!append) {
+            list.clear();
+        }
+        list.add(getValues(key), AutoCompletionItemPritority.IS_IN_DATASET);
+    }
+
+    /**
+     * Populates the an {@see AutoCompletionList} with the currently cached
+     * tag keys
+     *
+     * @param list the list to populate
+     * @param append true to add the keys to the list; false, to replace the keys
+     * in the list by the keys in the cache
+     */
+    public void populateWithKeys(AutoCompletionList list, boolean append) {
+        if (!append) {
+            list.clear();
+        }
+        list.add(tagCache.keySet(), AutoCompletionItemPritority.IS_IN_DATASET);
+    }
+
+
+    /**
+     * Populates the an {@see AutoCompletionList} with the currently cached
+     * tag values
+     *
+     * @param list the list to populate
+     * @param append true to add the keys to the list; false, to replace the keys
+     * in the list by the keys in the cache
+     */
+    public void populateWithValues(AutoCompletionList list, boolean append) {
+        if (!append) {
+            list.clear();
+        }
+        list.add(this.allTagValues, AutoCompletionItemPritority.IS_IN_DATASET);
     }
 }