Index: trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 594) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 595) @@ -37,5 +37,4 @@ import javax.swing.JScrollPane; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.ListSelectionModel; import javax.swing.table.DefaultTableCellRenderer; @@ -129,26 +128,45 @@ panel.add(new JLabel(msg), BorderLayout.NORTH); + final TreeMap> allData = createAutoCompletionInfo(true); + JPanel p = new JPanel(new GridBagLayout()); panel.add(p, BorderLayout.CENTER); - - final JTextField keyField = new JTextField(key); + + final AutoCompleteComboBox keys = new AutoCompleteComboBox(); + keys.setPossibleItems(allData.keySet()); + keys.setEditable(true); + keys.setSelectedItem(key); + p.add(new JLabel(tr("Key")), GBC.std()); p.add(Box.createHorizontalStrut(10), GBC.std()); - p.add(keyField, GBC.eol().fill(GBC.HORIZONTAL)); - - final JComboBox valueField = (JComboBox) propertyData.getValueAt(row, 1); + p.add(keys, GBC.eol().fill(GBC.HORIZONTAL)); + + final AutoCompleteComboBox values = new AutoCompleteComboBox(); + values.setEditable(true); + Collection newItems; + if (allData.containsKey(key)) { + newItems = allData.get(key); + } else { + newItems = Collections.emptyList(); + } + values.setPossibleItems(newItems); + values.setSelectedItem(null); + final String selection= ((JComboBox)propertyData.getValueAt(row, 1)).getEditor().getItem().toString(); + values.setSelectedItem(selection); + values.getEditor().setItem(selection); p.add(new JLabel(tr("Value")), GBC.std()); p.add(Box.createHorizontalStrut(10), GBC.std()); - p.add(valueField, GBC.eol().fill(GBC.HORIZONTAL)); - - final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ + p.add(values, GBC.eol().fill(GBC.HORIZONTAL)); + addFocusAdapter(allData, keys, values); + + final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION) { @Override public void selectInitialValue() { - valueField.requestFocusInWindow(); - valueField.getEditor().selectAll(); + values.requestFocusInWindow(); + values.getEditor().selectAll(); } }; final JDialog dlg = optionPane.createDialog(Main.parent, tr("Change values?")); - valueField.getEditor().addActionListener(new ActionListener() { + values.getEditor().addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { dlg.setVisible(false); @@ -157,5 +175,5 @@ }); - String oldValue = valueField.getEditor().getItem().toString(); + String oldValue = values.getEditor().getItem().toString(); dlg.setVisible(true); @@ -163,14 +181,14 @@ if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE || (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION)) { - valueField.getEditor().setItem(oldValue); - return; - } - - String value = valueField.getEditor().getItem().toString(); + values.getEditor().setItem(oldValue); + return; + } + + String value = values.getEditor().getItem().toString(); if (value.equals(tr(""))) return; if (value.equals("")) value = null; // delete the key - String newkey = keyField.getText(); + String newkey = keys.getEditor().getItem().toString(); if (newkey.equals("")) { newkey = key; @@ -214,5 +232,68 @@ 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); - final TreeMap> allData = new TreeMap>(); + final TreeMap> allData = createAutoCompletionInfo(false); + final AutoCompleteComboBox keys = new AutoCompleteComboBox(); + keys.setPossibleItems(allData.keySet()); + keys.setEditable(true); + + p.add(keys, BorderLayout.CENTER); + + JPanel p2 = new JPanel(new BorderLayout()); + p.add(p2, BorderLayout.SOUTH); + p2.add(new JLabel(tr("Please select a value")), BorderLayout.NORTH); + final AutoCompleteComboBox values = new AutoCompleteComboBox(); + values.setEditable(true); + p2.add(values, BorderLayout.CENTER); + + JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ + @Override public void selectInitialValue() { + keys.requestFocusInWindow(); + keys.getEditor().selectAll(); + } + }; + pane.createDialog(Main.parent, tr("Change values?")).setVisible(true); + if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue())) + return; + String key = keys.getEditor().getItem().toString(); + String value = values.getEditor().getItem().toString(); + if (value.equals("")) + return; + Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value)); + selectionChanged(sel); // update table + Main.parent.repaint(); // repaint all - drawing could have been changed + } + + /** + * @param allData + * @param keys + * @param values + */ + private void addFocusAdapter( + final TreeMap> allData, + final AutoCompleteComboBox keys, final AutoCompleteComboBox values) { + // get the combo box' editor component + JTextComponent editor = (JTextComponent)values.getEditor() + .getEditorComponent(); + // Refresh the values model when focus is gained + editor.addFocusListener(new FocusAdapter() { + @Override public void focusGained(FocusEvent e) { + String key = keys.getEditor().getItem().toString(); + Collection newItems; + if (allData.containsKey(key)) { + newItems = allData.get(key); + } else { + newItems = Collections.emptyList(); + } + values.setPossibleItems(newItems); + } + }); + } + + /** + * @return + */ + private TreeMap> createAutoCompletionInfo( + boolean edit) { + final TreeMap> allData = new TreeMap>(); for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) { for (String key : osm.keySet()) { @@ -227,51 +308,9 @@ } } - for (int i = 0; i < propertyData.getRowCount(); ++i) - allData.remove(propertyData.getValueAt(i, 0)); - final AutoCompleteComboBox keys = new AutoCompleteComboBox(); - keys.setPossibleItems(allData.keySet()); - keys.setEditable(true); - - p.add(keys, BorderLayout.CENTER); - - JPanel p2 = new JPanel(new BorderLayout()); - p.add(p2, BorderLayout.SOUTH); - p2.add(new JLabel(tr("Please select a value")), BorderLayout.NORTH); - final AutoCompleteComboBox values = new AutoCompleteComboBox(); - values.setEditable(true); - p2.add(values, BorderLayout.CENTER); - - // get the combo box' editor component - JTextComponent editor = (JTextComponent) values.getEditor().getEditorComponent(); - // Refresh the values model when focus is gained - editor.addFocusListener(new FocusAdapter() { - @Override public void focusGained(FocusEvent e) { - String key = keys.getEditor().getItem().toString(); - Collection newItems; - if (allData.containsKey(key)) { - newItems = allData.get(key); - } else { - newItems = Collections.emptyList(); - } - values.setPossibleItems(newItems); - } - }); - - JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ - @Override public void selectInitialValue() { - keys.requestFocusInWindow(); - keys.getEditor().selectAll(); - } - }; - pane.createDialog(Main.parent, tr("Change values?")).setVisible(true); - if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue())) - return; - String key = keys.getEditor().getItem().toString(); - String value = values.getEditor().getItem().toString(); - if (value.equals("")) - return; - Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value)); - selectionChanged(sel); // update table - Main.parent.repaint(); // repaint all - drawing could have been changed + if (!edit) { + for (int i = 0; i < propertyData.getRowCount(); ++i) + allData.remove(propertyData.getValueAt(i, 0)); + } + return allData; }