Changeset 4300 in josm for trunk/src

Timestamp:

2011-08-08T00:26:59+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6306 - patch by simon04 - enable autocompletion with name-values of highways for addr:street

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/properties/PropertiesDialog.java (modified) (4 diffs)
• tagging/ac/AutoCompletionList.java (modified) (1 diff)
• tagging/ac/AutoCompletionManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -23 +23 @@
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -249 +250 @@
         values.setEditable(true);
 
-        List<AutoCompletionListItem> valueList = autocomplete.getValues(key);
+        List<AutoCompletionListItem> valueList = autocomplete.getValues(getAutocompletionKeys(key));
         Collections.sort(valueList, defaultACItemComparator);
 
@@ -369 +370 @@
 
     /**
+     * For a given key k, return a list of keys which are used as keys for 
+     * auto-completing values to increase the search space.
+     * @param key the key k
+     * @return a list of keys
+     */
+    static List<String> getAutocompletionKeys(String key) {
+        if ("name".equals(key) || "addr:street".equals(key)) {
+            return Arrays.asList("addr:street", "name");
+        } else {
+            return Arrays.asList(key);
+        }
+    }
+
+    /**
      * This simply fires up an relation editor for the relation shown; everything else
      * is the editor's business.
@@ -478 +493 @@
                 String key = keys.getEditor().getItem().toString();
 
-                List<AutoCompletionListItem> valueList = autocomplete.getValues(key);
+                List<AutoCompletionListItem> valueList = autocomplete.getValues(getAutocompletionKeys(key));
                 Collections.sort(valueList, defaultACItemComparator);
 

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

@@ -258 +258 @@
     }
 
-    List<AutoCompletionListItem> getList() {
+    ArrayList<AutoCompletionListItem> getList() {
+        return list;
+    }
+
+    List<AutoCompletionListItem> getUnmodifiableList() {
         return Collections.unmodifiableList(list);
     }

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

@@ -3 +3 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -243 +244 @@
      *
      * @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) {
@@ -257 +256 @@
      * @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) {
-        list.add(getPresetValues(key), AutoCompletionItemPritority.IS_IN_STANDARD);
-        list.add(getDataValues(key), AutoCompletionItemPritority.IS_IN_DATASET);
-    }
-
+        populateWithTagValues(list, Arrays.asList(key));
+    }
+
+    /**
+     * Populates the an {@see AutoCompletionList} with the currently cached
+     * values for some given tags
+     *
+     * @param list the list to populate
+     * @param key the tag keys
+     */
+    public void populateWithTagValues(AutoCompletionList list, List<String> keys) {
+        for (String key : keys) {
+            list.add(getPresetValues(key), AutoCompletionItemPritority.IS_IN_STANDARD);
+            list.add(getDataValues(key), AutoCompletionItemPritority.IS_IN_DATASET);
+        }
+    }
+
+    /**
+     * Returns the currently cached tag keys.
+     * @return a list of tag keys
+     */
     public List<AutoCompletionListItem> getKeys() {
         AutoCompletionList list = new AutoCompletionList();
         populateWithKeys(list);
-        return new ArrayList<AutoCompletionListItem>(list.getList());
-    }
-
+        return list.getList();
+    }
+
+    /**
+     * Returns the currently cached tag values for a given tag key.
+     * @param key the tag key
+     * @return a list of tag values
+     */
     public List<AutoCompletionListItem> getValues(String key) {
+        return getValues(Arrays.asList(key));
+    }
+
+    /**
+     * Returns the currently cached tag values for a given list of tag keys.
+     * @param keys the tag keys
+     * @return a list of tag values
+     */
+    public List<AutoCompletionListItem> getValues(List<String> keys) {
         AutoCompletionList list = new AutoCompletionList();
-        populateWithTagValues(list, key);
-        return new ArrayList<AutoCompletionListItem>(list.getList());
+        populateWithTagValues(list, keys);
+        return list.getList();
     }