Changeset 2048 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java

Timestamp:

04.09.2009 10:49:53 (3 years ago)

Author:

Gubaer

Message:

Improved auto completion
fixed #2729: Auto completion with numbers sometimes annoying (only fixed in presets, relation editor, not in property dialog)
fixed #2320: Preset dialog for house numbers should have autocompletion (auto completion now supported in all preset dialogs)

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging;
 
+import java.awt.Component;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
@@ -8 +9 @@
 import java.util.logging.Logger;
 
+import javax.swing.ComboBoxEditor;
 import javax.swing.JTextField;
 import javax.swing.text.AttributeSet;
@@ -14 +16 @@
 import javax.swing.text.PlainDocument;
 
-import org.openstreetmap.josm.gui.dialogs.relation.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 
 /**
@@ -25 +27 @@
  *
  */
-public class AutoCompletingTextField extends JTextField  {
+public class AutoCompletingTextField extends JTextField implements ComboBoxEditor {
 
     static private Logger logger = Logger.getLogger(AutoCompletingTextField.class.getName());
@@ -54 +56 @@
                 return;
             }
+
             String currentText = getText(0, getLength());
+            // if the text starts with a number we don't autocomplete
+            //
+            try {
+                Long.parseLong(str);
+                if (currentText.length() == 0) {
+                    // we don't autocomplete on numbers
+                    super.insertString(offs, str, a);
+                    return;
+                }
+                Long.parseLong(currentText);
+                super.insertString(offs, str, a);
+                return;
+            } catch(NumberFormatException e) {
+                // either the new text or the current text isn't a number. We continue with
+                // autocompletion
+            }
             String prefix = currentText.substring(0, offs);
             autoCompletionList.applyFilter(prefix+str);
@@ -150 +169 @@
         this.autoCompletionList = autoCompletionList;
     }
+
+    public Component getEditorComponent() {
+        return this;
+    }
+
+    public Object getItem() {
+        return getText();
+    }
+
+    public void setItem(Object anObject) {
+        if (anObject == null) {
+            setText("");
+        } else {
+            setText(anObject.toString());
+        }
+
+    }
+
+
 }