Changeset 415 in josm for trunk/src/org

Timestamp:

2007-10-23T22:51:47+02:00 (17 years ago)

Author:

gebner

Message:

PropertiesDialog: Remember value when editing keys.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/PropertiesDialog.java (modified) (2 diffs)
• tools/AutoCompleteComboBox.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -19 +19 @@
 import java.awt.event.MouseEvent;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -245 +246 @@
             @Override public void focusGained(FocusEvent e) {
                 String key = keys.getEditor().getItem().toString();
+                                Collection<String> newItems;
                 if (allData.containsKey(key)) {
-                                        values.setPossibleItems(allData.get(key));
+                                        newItems = allData.get(key);
                                 } else {
-                                        values.removeAllItems();
-                                }
+                                        newItems = Collections.emptyList();
+                                }
+                                values.setPossibleItems(newItems);
             }
         });

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

@@ -82 +82 @@
 
         public void setPossibleItems(Collection<String> elems) {
-                Object oldValue = this.getSelectedItem();
                 DefaultComboBoxModel model = (DefaultComboBoxModel)this.getModel();
+                Object oldValue = this.getEditor().getItem();
                 model.removeAllElements();
                 for (String elem : elems) model.addElement(elem);
-                this.setSelectedItem(oldValue);
+                this.getEditor().setItem(oldValue);
                 this.getEditor().selectAll();
         }