Changeset 4176 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2011-06-26T17:05:06+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6456 - selecting number in dropdown does not work

File:

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

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

@@ -78 +78 @@
                     if (curText.length() != 0)
                         Long.parseLong(curText);
+                    item = lookupItem(curText, true);
                 } catch (NumberFormatException e) {
                     // either the new text or the current text isn't a number. We continue with
                     // autocompletion
-                    item = lookupItem(curText);
+                    item = lookupItem(curText, false);
                 }
             } else {
-                item = lookupItem(curText);
+                item = lookupItem(curText, false);
             }
 
@@ -114 +115 @@
         }
 
-        private Object lookupItem(String pattern) {
+        private Object lookupItem(String pattern, boolean match) {
             ComboBoxModel model = comboBox.getModel();
             AutoCompletionListItem bestItem = null;
@@ -122 +123 @@
                     return currentItem;
                 }
-                if (currentItem.getValue().startsWith(pattern)) {
+                if (!match && currentItem.getValue().startsWith(pattern)) {
                     if (bestItem == null || currentItem.getPriority().compareTo(bestItem.getPriority()) > 0) {
                         bestItem = currentItem;