Changeset 4132 in josm

Timestamp:

Jun 10, 2011 8:07:58 AM (2 years ago)

Author:

stoecker

Message:

fix #6430 - fix autocompletion for numbers

Location:

trunk

Files:

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

trunk/CONTRIBUTION

@@ -34 +34 @@
 GPL. The world image is from onearth.pl.
 
-The gettext-commons-0.9.jar is from Felix Berger and Steffen 
-Pingel (http://xnap-commons.sourceforge.net/gettext-commons/).
-The jar file is licensed under LGPL.
-
 The Bzip2 code is from Keiron Liddle (Apache project) and licensed
 with Apache license version 2.0.

trunk/README

@@ -35 +35 @@
 Under Linux open a shell, go to the file directory and type
 "java -jar josm-latest.jar" to launch. If this don't help, try to set
-you JAVA_HOME variable to the java location (the root location, not
+your JAVA_HOME variable to the java location (the root location, not
 the bin)
 

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) {