Changeset 3866 in josm

Timestamp:

Feb 7, 2011 2:50:48 PM (2 years ago)

Author:

bastiK

Message:

fixed #5876 (patch by ax) - AutoCompletingComboBox gets initialized with wrong value for "key:subkey" key elements in custom presets.xml

File:

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

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

@@ -85 +85 @@
             }
 
+            // the string being inserted might be a "full" string from the list
+            // of valid completions (instanceof AutoCompletionListItem), or a
+            // "partial" string being typed (instanceof String).
+            Object item = comboBox.getSelectedItem();
+            if (item != null && (item instanceof String || !curText.equals(((AutoCompletionListItem) item).getValue()))) {
+                // only in the latter case do we have to
             // lookup and select a matching item
-            Object item = lookupItem(curText);
+                item = lookupItem(curText);
             setSelectedItem(item);
+            }
             if (initial) {
                 start = 0;
@@ -114 +121 @@
         }
 
-        private Object lookupItem(String pattern) {
+        private AutoCompletionListItem lookupItem(String pattern) {
             ComboBoxModel model = comboBox.getModel();
             AutoCompletionListItem bestItem = null;