Changeset 3891 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-02-11T23:17:33+01:00 (13 years ago)

Author:

bastiK

Message:

fix #5927 - Auto-complete is partially broken (patch by ax)

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
-                item = lookupItem(curText);
+            Object item = lookupItem(curText);
             setSelectedItem(item);
-            }
             if (initial) {
                 start = 0;
@@ -121 +114 @@
         }
 
-        private AutoCompletionListItem lookupItem(String pattern) {
+        private Object lookupItem(String pattern) {
             ComboBoxModel model = comboBox.getModel();
             AutoCompletionListItem bestItem = null;
             for (int i = 0, n = model.getSize(); i < n; i++) {
                 AutoCompletionListItem currentItem = (AutoCompletionListItem) model.getElementAt(i);
+                if (currentItem.getValue().equals(pattern)) {
+                    return currentItem;
+                }
                 if (currentItem.getValue().startsWith(pattern)) {
                     if (bestItem == null || currentItem.getPriority().compareTo(bestItem.getPriority()) > 0) {