Changeset 254 in josm for src/org/openstreetmap

Timestamp:

2007-06-11T20:39:57+02:00 (18 years ago)

Author:

imi

Message:

Reverted Patch by Christof Dallermassl (Code quality and License problems)

Location:

src/org/openstreetmap/josm/gui/dialogs

Files:

• EditableComboBox.java (deleted)
• PropertiesDialog.java (modified) (4 diffs)

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

@@ -13 +13 @@
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -194 +193 @@
                 for (int i = 0; i < data.getRowCount(); ++i)
                         allData.remove(data.getValueAt(i, 0));
-                final JComboBox keys = new EditableComboBox(new Vector<String>(allData.keySet()));
+                final JComboBox keys = new JComboBox(new Vector<String>(allData.keySet()));
                 keys.setEditable(true);
                 p.add(keys, BorderLayout.CENTER);
@@ -201 +200 @@
                 p.add(p2, BorderLayout.SOUTH);
                 p2.add(new JLabel(tr("Please select a value")), BorderLayout.NORTH);
-                final JComboBox values = new EditableComboBox();
+                final JComboBox values = new JComboBox();
                 values.setEditable(true);
                 p2.add(values, BorderLayout.CENTER);
@@ -212 +211 @@
                                         Vector<String> newValues = new Vector<String>(allData.get(key));
                                         Object oldValue = values.getSelectedItem();
-                          
-                                        values.setModel(new EditableComboBox.FilterableComboBoxModel(newValues));
-                                        // select the new proposed value
-                                        values.getEditor().selectAll(); 
+                                        values.setModel(new DefaultComboBoxModel(newValues));
+                                        values.setSelectedItem(oldValue);
+                                        values.getEditor().selectAll();
                                 }
             }