Index: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 243)
+++ src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 244)
@@ -178,10 +178,20 @@
p.add(new JLabel(""+trn("This will change {0} object.","This will change {0} objects.", sel.size(),sel.size())+"
"+tr("Please select a key")),
BorderLayout.NORTH);
- TreeSet allKeys = new TreeSet();
- for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives())
- allKeys.addAll(osm.keySet());
+ final TreeMap> allData = new TreeMap>();
+ for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
+ for (String key : osm.keySet()) {
+ TreeSet values = null;
+ if (allData.containsKey(key))
+ values = allData.get(key);
+ else {
+ values = new TreeSet();
+ allData.put(key, values);
+ }
+ values.add(osm.get(key));
+ }
+ }
for (int i = 0; i < data.getRowCount(); ++i)
- allKeys.remove(data.getValueAt(i, 0));
- final JComboBox keys = new JComboBox(new Vector(allKeys));
+ allData.remove(data.getValueAt(i, 0));
+ final JComboBox keys = new JComboBox(new Vector(allData.keySet()));
keys.setEditable(true);
p.add(keys, BorderLayout.CENTER);
@@ -190,6 +200,20 @@
p.add(p2, BorderLayout.SOUTH);
p2.add(new JLabel(tr("Please select a value")), BorderLayout.NORTH);
- final JTextField values = new JTextField();
+ final JComboBox values = new JComboBox();
+ values.setEditable(true);
p2.add(values, BorderLayout.CENTER);
+
+ ActionListener link = new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+ String key = keys.getEditor().getItem().toString();
+ Vector newValues = new Vector(allData.get(key));
+ values.setModel(new DefaultComboBoxModel(newValues));
+
+ }
+
+ };
+ keys.addActionListener(link);
+
JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION){
@Override public void selectInitialValue() {
@@ -202,5 +226,5 @@
return;
String key = keys.getEditor().getItem().toString();
- String value = values.getText();
+ String value = values.getEditor().getItem().toString();
if (value.equals(""))
return;