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

Timestamp:

06.02.2010 17:37:52 (2 years ago)

Author:

bastiK

Message:

autocompletion: Always add the preset keys/values to the autocompletion list.
Does not apply to the Properties dialog, because it has a seperate implementation of the autocompletion feature.

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java (modified) (11 diffs)

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -15 +16 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
+import org.openstreetmap.josm.tools.MultiMap;
 
 /**
@@ -67 +70 @@
     }
 
-    /** the cached tags give by a tag key and a list of values for this tag*/
-    private HashMap<String, Set<String>> tagCache;
+    /** the cached tags given by a tag key and a list of values for this tag */
+    private MultiMap<String, String> tagCache;
+    /**  the layer this cache is built for */
+    private OsmDataLayer layer;
+    /** the same as tagCache but for the preset keys and values */
+    private static MultiMap<String, String> presetTagCache = new MultiMap<String, String>();
     /** the cached list of member roles */
     private  Set<String> roleCache;
-    /**  the layer this cache is built for */
-    private OsmDataLayer layer;
 
     /**
@@ -78 +83 @@
      */
     public AutoCompletionCache(OsmDataLayer layer) {
-        tagCache = new HashMap<String, Set<String>>();
+        tagCache = new MultiMap<String, String>();
         roleCache = new HashSet<String>();
         this.layer = layer;
@@ -85 +90 @@
     public AutoCompletionCache() {
         this(null);
-    }
-
-    /**
-     * make sure, <code>key</code> is in the cache
-     *
-     * @param key  the key
-     */
-    protected void cacheKey(String key) {
-        if (tagCache.containsKey(key))
-            return;
-        tagCache.put(key, new HashSet<String>());
-    }
-
-    /**
-     * make sure, value is one of the auto completion values allowed for key
-     *
-     * @param key the key
-     * @param value the value
-     */
-    protected void cacheValue(String key, String value) {
-        cacheKey(key);
-        tagCache.get(key).add(value);
     }
 
@@ -118 +101 @@
         for (String key: primitive.keySet()) {
             String value = primitive.get(key);
-            cacheValue(key, value);
+            tagCache.put(key, value);
         }
     }
@@ -141 +124 @@
      */
     public void initFromDataSet() {
-        tagCache = new HashMap<String, Set<String>>();
+        tagCache = new MultiMap<String, String>();
         if (layer == null)
             return;
@@ -157 +140 @@
 
     /**
+     * Initialize the cache for presets. This is done only once.
+     */
+    public static void cachePresets(Collection<TaggingPreset> presets) {
+        for (final TaggingPreset p : presets) {
+            for (TaggingPreset.Item item : p.data) {
+                if (item instanceof TaggingPreset.Check) {
+                    TaggingPreset.Check ch = (TaggingPreset.Check) item;
+                    presetTagCache.put(ch.key, OsmUtils.falseval);
+                    presetTagCache.put(ch.key, OsmUtils.trueval);
+                } else if (item instanceof TaggingPreset.Combo) {
+                    TaggingPreset.Combo co = (TaggingPreset.Combo) item;
+                    for (String value : co.values.split(",")) {
+                        presetTagCache.put(co.key, value);
+                    }
+                } else if (item instanceof TaggingPreset.Key) {
+                    TaggingPreset.Key ky = (TaggingPreset.Key) item;
+                    presetTagCache.put(ky.key, ky.value);
+                } else if (item instanceof TaggingPreset.Text) {
+                    TaggingPreset.Text tt = (TaggingPreset.Text) item;
+                    presetTagCache.putVoid(tt.key);
+                    if (tt.default_ != null && !tt.default_.equals("")) {
+                        presetTagCache.put(tt.key, tt.default_);
+                    }
+                }
+            }
+        }
+    }
+    
+    /**
      * replies the keys held by the cache
      *
      * @return the list of keys held by the cache
      */
-    public List<String> getKeys() {
+    protected List<String> getDataKeys() {
         return new ArrayList<String>(tagCache.keySet());
+    }
+
+    protected List<String> getPresetKeys() {
+        return new ArrayList<String>(presetTagCache.keySet());
     }
 
@@ -172 +188 @@
      * @return the list of auto completion values
      */
-    public List<String> getValues(String key) {
-        if (!tagCache.containsKey(key))
-            return new ArrayList<String>();
-        return new ArrayList<String>(tagCache.get(key));
+    protected List<String> getDataValues(String key) {
+        return new ArrayList<String>(tagCache.getValues(key));
+    }
+
+    protected static List<String> getPresetValues(String key) {
+        return new ArrayList<String>(presetTagCache.getValues(key));
     }
 
@@ -211 +229 @@
             list.clear();
         }
-        list.add(getValues(key), AutoCompletionItemPritority.IS_IN_DATASET);
+        list.add(getDataValues(key), AutoCompletionItemPritority.IS_IN_DATASET);
+        list.add(getPresetValues(key), AutoCompletionItemPritority.IS_IN_STANDARD);
     }
 
@@ -226 +245 @@
             list.clear();
         }
-        list.add(tagCache.keySet(), AutoCompletionItemPritority.IS_IN_DATASET);
+        list.add(getDataKeys(), AutoCompletionItemPritority.IS_IN_DATASET);
+        list.add(getPresetKeys(), AutoCompletionItemPritority.IS_IN_STANDARD);
     }
 }