Changeset 3214 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.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/dialogs/properties/PropertiesDialog.java (modified) (8 diffs)

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

@@ -26 +26 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -81 +82 @@
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
@@ -148 +151 @@
     private final Map<String, Map<String, Integer>> valueCount = new TreeMap<String, Map<String, Integer>>();
 
-    Comparator<String> defaultKeyComparator = String.CASE_INSENSITIVE_ORDER;
-    Comparator<String> defaultValueComparator = String.CASE_INSENSITIVE_ORDER;
+    Comparator<AutoCompletionListItem> defaultACItemComparator = new Comparator<AutoCompletionListItem>() {
+        public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) {
+            return String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue());
+        }
+    };
 
     private DataSetListenerAdapter dataChangedAdapter = new DataSetListenerAdapter(this);
@@ -191 +197 @@
 
         AutoCompletionManager autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager();
-
+        List<AutoCompletionListItem> keyList = autocomplete.getKeys();
+        Collections.sort(keyList, defaultACItemComparator);
+        
         final AutoCompletingComboBox keys = new AutoCompletingComboBox();
-        keys.setPossibleItems(autocomplete.getKeys(defaultKeyComparator));
+        keys.setPossibleACItems(keyList);
         keys.setEditable(true);
         keys.setSelectedItem(key);
@@ -209 +217 @@
                 if (c instanceof JLabel) {
                     String str = null;
-                    str=(String) value;
+                    str=((AutoCompletionListItem) value).getValue();
                     if (valueCount.containsKey(objKey)){
                         Map<String, Integer> m=valueCount.get(objKey);
@@ -223 +231 @@
         });
         values.setEditable(true);
-        values.setPossibleItems(autocomplete.getValues(key, defaultValueComparator));
+        
+        List<AutoCompletionListItem> valueList = autocomplete.getValues(key);
+        Collections.sort(valueList, defaultACItemComparator);
+        
+        values.setPossibleACItems(valueList);
         Map<String, Integer> m=(Map<String, Integer>)propertyData.getValueAt(row, 1);
         final String selection= m.size()!=1?tr("<different>"):m.entrySet().iterator().next().getKey();
@@ -344 +356 @@
         final AutoCompletingComboBox keys = new AutoCompletingComboBox();
         AutoCompletionManager autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager();
-        List<String> usedKeys =
-                new ArrayList<String>(autocomplete.getKeys(defaultKeyComparator));
-        for (int i = 0; i < propertyData.getRowCount(); ++i) {
-            usedKeys.remove(propertyData.getValueAt(i, 0));
-        }
-        keys.setPossibleItems(usedKeys);
+        List<AutoCompletionListItem> keyList = autocomplete.getKeys();
+
+        // remove the object's tag keys from the list
+        Iterator<AutoCompletionListItem> iter = keyList.iterator();
+        while (iter.hasNext()) {
+            AutoCompletionListItem item = iter.next();
+            for (int i = 0; i < propertyData.getRowCount(); ++i) {
+                if (item.getValue().equals(propertyData.getValueAt(i, 0))) {
+                    iter.remove();
+                    break;
+                }
+            }
+        }
+
+        Collections.sort(keyList, defaultACItemComparator);
+        keys.setPossibleACItems(keyList);
         keys.setEditable(true);
 
@@ -397 +419 @@
             @Override public void focusGained(FocusEvent e) {
                 String key = keys.getEditor().getItem().toString();
-                values.setPossibleItems(autocomplete.getValues(key, defaultValueComparator));
+                
+                List<AutoCompletionListItem> valueList = autocomplete.getValues(key);
+                Collections.sort(valueList, defaultACItemComparator);
+
+                values.setPossibleACItems(valueList);
                 objKey=key;
             }