Changeset 739 in josm

Timestamp:

2008-07-28T11:26:26+02:00 (16 years ago)

Author:

stoecker

Message:

fixed autocompletion again to also work for Windows

File:

• trunk/src/org/openstreetmap/josm/tools/AutoCompleteComboBox.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/AutoCompleteComboBox.java

@@ -39 +39 @@
                         if(selecting || (offs == 0 && str.equals(getText(0, getLength()))))
                                 return;
+                        boolean initial = (offs == 0 && getLength() == 0);
                         super.insertString(offs, str, a);
 
@@ -48 +49 @@
 
                         int size = getLength();
+                        int start = offs+str.length();
+                        int end = start;
                         String curText = getText(0, size);
                         // lookup and select a matching item
                         Object item = lookupItem(curText);
+                        setSelectedItem(item);
+                        if(initial)
+                                start = 0;
                         if (item != null) {
                                 String newText = item.toString();
@@ -59 +65 @@
                                         super.insertString(0, newText, a);
                                         selecting = false;
-                                        JTextComponent editor = (JTextComponent)comboBox.getEditor().getEditorComponent();
-                                        editor.setSelectionStart(size);
-                                        editor.setSelectionEnd(getLength());
+                                        start = size;
+                                        end = getLength();
                                 }
                         }
-                        setSelectedItem(item);
+                        JTextComponent editor = (JTextComponent)comboBox.getEditor().getEditorComponent();
+                        editor.setSelectionStart(start);
+                        editor.setSelectionEnd(end);
                 }
 
@@ -95 +102 @@
                 for (String elem : elems) model.addElement(elem);
                 this.getEditor().setItem(oldValue);
-                this.getEditor().selectAll();
         }
 }