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

Timestamp:

2012-08-30T21:40:23+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8012 - fix #8013 - Fix bad handling of Strings in AutoCompletingBoxes

File:

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

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

@@ -222 +222 @@
     public void setPossibleItems(Collection<String> elems) {
         DefaultComboBoxModel model = (DefaultComboBoxModel)this.getModel();
-        Object oldValue = getSelectedItem();
+        Object oldValue = this.getEditor().getItem(); // Do not use getSelectedItem(); (fix #8013)
         model.removeAllElements();
         for (String elem : elems) {
@@ -230 +230 @@
         // AutoCompletingComboBoxDocument#insertString
         autocompleteEnabled = false;
-        setSelectedItem(oldValue);
+        this.getEditor().setItem(oldValue); // Do not use setSelectedItem(oldValue); (fix #8013)
         autocompleteEnabled = true;
     }
@@ -240 +240 @@
         DefaultComboBoxModel model = (DefaultComboBoxModel)this.getModel();
         Object oldValue = getSelectedItem();
+        Object editorOldValue = this.getEditor().getItem();
         model.removeAllElements();
         for (AutoCompletionListItem elem : elems) {
@@ -245 +246 @@
         }
         setSelectedItem(oldValue);
+        this.getEditor().setItem(editorOldValue);
     }