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

Timestamp:

2011-06-10T08:07:58+02:00 (14 years ago)

Author:

stoecker

Message:

fix #6430 - fix autocompletion for numbers

File:

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

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

@@ -70 +70 @@
             String curText = getText(0, size);
 
-            // if the text starts with a number we don't autocomplete
+            // item for lookup and selection
+            Object item = null;
+            // if the text is a number we don't autocomplete
             if (Main.pref.getBoolean("autocomplete.dont_complete_numbers", true)) {
                 try {
                     Long.parseLong(str);
-                    if (curText.length() == 0)
-                        // we don't autocomplete on numbers
-                        return;
-                    Long.parseLong(curText);
-                    return;
+                    if (curText.length() != 0)
+                        Long.parseLong(curText);
                 } catch (NumberFormatException e) {
                     // either the new text or the current text isn't a number. We continue with
                     // autocompletion
-                }
-            }
-
-            // lookup and select a matching item
-            Object item = lookupItem(curText);
+                    item = lookupItem(curText);
+                }
+            } else {
+                item = lookupItem(curText);
+            }
+
             setSelectedItem(item);
             if (initial) {