Changeset 3214 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

Timestamp:

02.05.2010 18:12:34 (2 years ago)

Author:

bastiK

Message:

autocompletion cleanup - fixes #2729

File:

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

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

@@ -109 +109 @@
 
     protected void cachePrimitives(Collection<? extends OsmPrimitive> primitives) {
-        if (tagCache == null) {
-            // We are coming from a DataSetListener event and
-            // rebuild has not been called yet, so do it now and 
-            // ignore the method parameter.
-            rebuild();
-            return;
-        }
         for (OsmPrimitive primitive : primitives) {
             cachePrimitiveTags(primitive);
@@ -204 +197 @@
     }
 
-    public TreeSet<String> getKeys(Comparator<String> c) {
-        TreeSet<String> ret = new TreeSet<String>(c);
-        ret.addAll(getDataKeys());
-        ret.addAll(getPresetKeys());
-        return ret;
-    }
-
     /**
      * replies the auto completion values allowed for a specific key. Replies
@@ -226 +212 @@
     }
 
-    public TreeSet<String> getValues(String key, Comparator<String> c) {
-        TreeSet<String> ret = new TreeSet<String>(c);
-        ret.addAll(getDataValues(key));
-        ret.addAll(getPresetValues(key));
-        return ret;
-    }
-
     /**
      * Replies the list of member roles
@@ -249 +228 @@
      */
     public void populateWithMemberRoles(AutoCompletionList list) {
-        list.clear();
         list.add(getRoleCache(), 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) {
+        list.add(getPresetKeys(), AutoCompletionItemPritority.IS_IN_STANDARD);
+        list.add(getDataKeys(), AutoCompletionItemPritority.IS_IN_DATASET);
     }
 
@@ -263 +254 @@
      */
     public void populateWithTagValues(AutoCompletionList list, String key) {
+        list.add(getPresetValues(key), AutoCompletionItemPritority.IS_IN_STANDARD);
         list.add(getDataValues(key), AutoCompletionItemPritority.IS_IN_DATASET);
-        list.add(getPresetValues(key), AutoCompletionItemPritority.IS_IN_STANDARD);
-    }
-
-    /**
-     * 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) {
-        list.add(getDataKeys(), AutoCompletionItemPritority.IS_IN_DATASET);
-        list.add(getPresetKeys(), AutoCompletionItemPritority.IS_IN_STANDARD);
+    }
+
+    public List<AutoCompletionListItem> getKeys() {
+        AutoCompletionList list = new AutoCompletionList();
+        populateWithKeys(list);
+        return new ArrayList<AutoCompletionListItem>(list.getList());
+    }
+
+    public List<AutoCompletionListItem> getValues(String key) {
+        AutoCompletionList list = new AutoCompletionList();
+        populateWithTagValues(list, key);
+        return new ArrayList<AutoCompletionListItem>(list.getList());
     }
 
@@ -286 +276 @@
 
     public void primtivesAdded(PrimitivesAddedEvent event) {
+        if (dirty)
+            return;
         cachePrimitives(event.getPrimitives());
     }
@@ -294 +286 @@
 
     public void tagsChanged(TagsChangedEvent event) {
+        if (dirty)
+            return;
         Map<String, String> newKeys = event.getPrimitive().getKeys();
         Map<String, String> oldKeys = event.getOriginalKeys();