Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 5635) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 5636) @@ -71,22 +71,22 @@ */ class TagEditHelper { - private final DefaultTableModel propertyData; - private final Map> valueCount; - - private String changedKey; - - private String lastAddKey = null; - private String lastAddValue = null; - - public static final int DEFAULT_LRU_TAGS_NUMBER = 5; - public static final int MAX_LRU_TAGS_NUMBER = 9; - - private String objKey; - - Comparator defaultACItemComparator = new Comparator() { - public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { - return String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue()); - } - }; + private final DefaultTableModel propertyData; + private final Map> valueCount; + + private String changedKey; + + private String lastAddKey = null; + private String lastAddValue = null; + + public static final int DEFAULT_LRU_TAGS_NUMBER = 5; + public static final int MAX_LRU_TAGS_NUMBER = 9; + + private String objKey; + + Comparator defaultACItemComparator = new Comparator() { + public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { + return String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue()); + } + }; @@ -120,60 +120,7 @@ if (sel.isEmpty()) return; - JPanel p = new JPanel(new GridBagLayout()); - p.add(new JLabel(""+trn("This will change up to {0} object.", - "This will change up to {0} objects.", sel.size(),sel.size()) - +"

"+tr("Please select a key")), GBC.eol().fill(GBC.HORIZONTAL)); - final AutoCompletingComboBox keys = new AutoCompletingComboBox(); - AutoCompletionManager autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager(); - List keyList = autocomplete.getKeys(); - - AutoCompletionListItem itemToSelect = null; - // remove the object's tag keys from the list - Iterator iter = keyList.iterator(); - while (iter.hasNext()) { - AutoCompletionListItem item = iter.next(); - if (item.getValue().equals(lastAddKey)) { - itemToSelect = item; - } - for (int i = 0; i < propertyData.getRowCount(); ++i) { - if (item.getValue().equals(propertyData.getValueAt(i, 0))) { - if (itemToSelect == item) { - itemToSelect = null; - } - iter.remove(); - break; - } - } - } - - Collections.sort(keyList, defaultACItemComparator); - keys.setPossibleACItems(keyList); - keys.setEditable(true); - - p.add(keys, GBC.eop().fill()); - - p.add(new JLabel(tr("Please select a value")), GBC.eol()); - final AutoCompletingComboBox values = new AutoCompletingComboBox(); - values.setEditable(true); - p.add(values, GBC.eop().fill()); - if (itemToSelect != null) { - keys.setSelectedItem(itemToSelect); - if (lastAddValue != null) { - values.setSelectedItem(lastAddValue); - } - } - - FocusAdapter focus = addFocusAdapter(keys, values, autocomplete, defaultACItemComparator); - // fire focus event in advance or otherwise the popup list will be too small at first - focus.focusGained(null); - - int recentTagsToShow = Main.pref.getInteger("properties.recently-added-tags", DEFAULT_LRU_TAGS_NUMBER); - if (recentTagsToShow > MAX_LRU_TAGS_NUMBER) { - recentTagsToShow = MAX_LRU_TAGS_NUMBER; - } - List recentTagsActions = new ArrayList(); - suggestRecentlyAddedTags(p, keys, values, recentTagsActions, recentTagsToShow, focus); - - JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ + final AddTagsPanel p = new AddTagsPanel(sel); + + final JOptionPane optionPane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION){ @Override public void selectInitialValue() { // save unix system selection (middle mouse paste) @@ -181,37 +128,384 @@ if(sysSel != null) { Transferable old = sysSel.getContents(null); - keys.requestFocusInWindow(); - keys.getEditor().selectAll(); + p.keys.requestFocusInWindow(); + p.keys.getEditor().selectAll(); sysSel.setContents(old, null); } else { - keys.requestFocusInWindow(); - keys.getEditor().selectAll(); + p.keys.requestFocusInWindow(); + p.keys.getEditor().selectAll(); } } }; - JDialog dialog = pane.createDialog(Main.parent, tr("Add value?")); + final JDialog dialog = optionPane.createDialog(Main.parent, tr("Add value?")); dialog.setModalityType(Dialog.ModalityType.DOCUMENT_MODAL); + // We specify what to do if panel wants to close the entire dialog + p.setCloseActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + dialog.setVisible(false); + optionPane.setValue(JOptionPane.OK_OPTION); + } + }); dialog.setVisible(true); - for (JosmAction action : recentTagsActions) { - action.destroy(); - } - - if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue())) + p.destroyActions(); + + if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(optionPane.getValue())) return; - String key = keys.getEditor().getItem().toString().trim(); - String value = values.getEditor().getItem().toString().trim(); - if (key.isEmpty() || value.isEmpty()) + p.performTagAdding(); + } + + /** + * Create a focus handling adapter and apply in to the editor component of value + * autocompletion box. + * @param keys Box for keys entering and autocompletion + * @param values Box for values entering and autocompletion + * @param autocomplete Manager handling the autocompletion + * @param comparator Class to decide what values are offered on autocompletion + * @return The created adapter + */ + private FocusAdapter addFocusAdapter(final AutoCompletingComboBox keys, final AutoCompletingComboBox values, + final AutoCompletionManager autocomplete, final Comparator comparator) { + // get the combo box' editor component + JTextComponent editor = (JTextComponent)values.getEditor() + .getEditorComponent(); + // Refresh the values model when focus is gained + FocusAdapter focus = new FocusAdapter() { + @Override public void focusGained(FocusEvent e) { + String key = keys.getEditor().getItem().toString(); + + List valueList = autocomplete.getValues(getAutocompletionKeys(key)); + Collections.sort(valueList, comparator); + + values.setPossibleACItems(valueList); + objKey=key; + } + }; + editor.addFocusListener(focus); + return focus; + } + + /** + * Edit the value in the properties table row + * @param row The row of the table from which the value is edited. + */ + public void editProperty(final int row) { + changedKey = null; + Collection sel = Main.main.getCurrentDataSet().getSelected(); + if (sel.isEmpty()) return; + + String key = propertyData.getValueAt(row, 0).toString(); + objKey=key; + + @SuppressWarnings("unchecked") + final EditTagsPanel p = new EditTagsPanel(key, row, sel, + (Map) propertyData.getValueAt(row, 1)); + + final JOptionPane optionPane = new JOptionPane(p, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION) { + @Override public void selectInitialValue() { + // save unix system selection (middle mouse paste) + Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection(); + if(sysSel != null) { + Transferable old = sysSel.getContents(null); + p.values.requestFocusInWindow(); + p.values.getEditor().selectAll(); + sysSel.setContents(old, null); + } else { + p.values.requestFocusInWindow(); + p.values.getEditor().selectAll(); + } + } + }; + + final JDialog dialog = optionPane.createDialog(Main.parent, trn("Change value?", "Change values?", p.getValueCount())); + dialog.setModalityType(Dialog.ModalityType.DOCUMENT_MODAL); + Dimension dlgSize = dialog.getSize(); + if(dlgSize.width > Main.parent.getSize().width) { + dlgSize.width = Math.max(250, Main.parent.getSize().width); + dialog.setSize(dlgSize); + } + dialog.setLocationRelativeTo(Main.parent); + + // Auto-close dialog when user selects a value from list + p.values.getEditor().addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + dialog.setVisible(false); + optionPane.setValue(JOptionPane.OK_OPTION); + } + }); + + dialog.setVisible(true); + + if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(optionPane.getValue())) { return; - lastAddKey = key; - lastAddValue = value; - recentTags.put(new Tag(key, value), null); - Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value)); - changedKey = key; - } - - private void suggestRecentlyAddedTags(JPanel p, final AutoCompletingComboBox keys, final AutoCompletingComboBox values, List tagsActions, int tagsToShow, final FocusAdapter focus) { - if (tagsToShow > 0 && !recentTags.isEmpty()) { - p.add(new JLabel(tr("Recently added tags")), GBC.eol()); + } + + p.performTagEdit(); + + } + + /** + * If during last editProperty call user changed the key name, this key will be returned + * Elsewhere, returns null. + */ + public String getChangedKey() { + return changedKey; + } + + public void resetChangedKey() { + changedKey = null; + } + + /** + * For a given key k, return a list of keys which are used as keys for + * auto-completing values to increase the search space. + * @param key the key k + * @return a list of keys + */ + private static List getAutocompletionKeys(String key) { + if ("name".equals(key) || "addr:street".equals(key)) + return Arrays.asList("addr:street", "name"); + else + return Arrays.asList(key); + } + + + class EditTagsPanel extends JPanel { + final AutoCompletingComboBox keys; + final AutoCompletingComboBox values; + String oldValue; + final String key; + final Collection sel; + final Map m; + + public EditTagsPanel(final String key, final int row, Collection sel, Map countMap) { + super(new BorderLayout()); + this.key = key; + this.sel = sel; + m = countMap; + + + String msg = ""+trn("This will change {0} object.", + "This will change up to {0} objects.", sel.size(), sel.size()) + +"

("+tr("An empty value deletes the tag.", key)+")"; + + add(new JLabel(msg), BorderLayout.NORTH); + + JPanel p = new JPanel(new GridBagLayout()); + add(p, BorderLayout.CENTER); + + AutoCompletionManager autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager(); + List keyList = autocomplete.getKeys(); + Collections.sort(keyList, defaultACItemComparator); + + keys = new AutoCompletingComboBox(key); + keys.setPossibleACItems(keyList); + keys.setEditable(true); + keys.setSelectedItem(key); + + p.add(new JLabel(tr("Key")), GBC.std()); + p.add(Box.createHorizontalStrut(10), GBC.std()); + p.add(keys, GBC.eol().fill(GBC.HORIZONTAL)); + + + Comparator usedValuesAwareComparator = new Comparator() { + + @Override + public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { + boolean c1 = m.containsKey(o1.getValue()); + boolean c2 = m.containsKey(o2.getValue()); + if (c1 == c2) + return String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue()); + else if (c1) + return -1; + else + return +1; + } + }; + + List valueList = autocomplete.getValues(getAutocompletionKeys(key)); + Collections.sort(valueList, usedValuesAwareComparator); + + final String selection= m.size()!=1?tr(""):m.entrySet().iterator().next().getKey(); + + values = new AutoCompletingComboBox(selection); + values.setRenderer(new DefaultListCellRenderer() { + @Override public Component getListCellRendererComponent(JList list, + Object value, int index, boolean isSelected, boolean cellHasFocus){ + Component c = super.getListCellRendererComponent(list, value, + index, isSelected, cellHasFocus); + if (c instanceof JLabel) { + String str = ((AutoCompletionListItem) value).getValue(); + if (valueCount.containsKey(objKey)) { + Map m = valueCount.get(objKey); + if (m.containsKey(str)) { + str = tr("{0} ({1})", str, m.get(str)); + c.setFont(c.getFont().deriveFont(Font.ITALIC + Font.BOLD)); + } + } + ((JLabel) c).setText(str); + } + return c; + } + }); + + values.setEditable(true); + values.setPossibleACItems(valueList); + values.setSelectedItem(selection); + values.getEditor().setItem(selection); + p.add(new JLabel(tr("Value")), GBC.std()); + p.add(Box.createHorizontalStrut(10), GBC.std()); + p.add(values, GBC.eol().fill(GBC.HORIZONTAL)); + addFocusAdapter(keys, values, autocomplete, usedValuesAwareComparator); + + } + + private int getValueCount() { + return m.size(); + } + + /** + * Edit tags of multiple selected objects according to selected ComboBox values + * If value == "", tag will be deleted + * Confirmations may be needed. + */ + private void performTagEdit() { + String value = values.getEditor().getItem().toString().trim(); + // is not Java 1.5 + //value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC); + if (value.equals("")) { + value = null; // delete the key + } + String newkey = keys.getEditor().getItem().toString().trim(); + //newkey = java.text.Normalizer.normalize(newkey, java.text.Normalizer.Form.NFC); + if (newkey.equals("")) { + newkey = key; + value = null; // delete the key instead + } + if (key.equals(newkey) && tr("").equals(value)) + return; + if (key.equals(newkey) || value == null) { + Main.main.undoRedo.add(new ChangePropertyCommand(sel, newkey, value)); + } else { + for (OsmPrimitive osm: sel) { + if(osm.get(newkey) != null) { + ExtendedDialog ed = new ExtendedDialog( + Main.parent, + tr("Overwrite key"), + new String[]{tr("Replace"), tr("Cancel")}); + ed.setButtonIcons(new String[]{"purge", "cancel"}); + ed.setContent(tr("You changed the key from ''{0}'' to ''{1}''.\n" + + "The new key is already used, overwrite values?", key, newkey)); + ed.setCancelButton(2); + ed.toggleEnable("overwriteEditKey"); + ed.showDialog(); + + if (ed.getValue() != 1) + return; + break; + } + } + Collection commands=new Vector(); + commands.add(new ChangePropertyCommand(sel, key, null)); + if (value.equals(tr(""))) { + HashMap> map=new HashMap>(); + for (OsmPrimitive osm: sel) { + String val=osm.get(key); + if(val != null) + { + if (map.containsKey(val)) { + map.get(val).add(osm); + } else { + Vector v = new Vector(); + v.add(osm); + map.put(val, v); + } + } + } + for (Map.Entry> e: map.entrySet()) { + commands.add(new ChangePropertyCommand(e.getValue(), newkey, e.getKey())); + } + } else { + commands.add(new ChangePropertyCommand(sel, newkey, value)); + } + Main.main.undoRedo.add(new SequenceCommand( + trn("Change properties of up to {0} object", + "Change properties of up to {0} objects", sel.size(), sel.size()), + commands)); + } + + changedKey = newkey; + } + + + } + + class AddTagsPanel extends JPanel { + final AutoCompletingComboBox keys = new AutoCompletingComboBox(); + final AutoCompletingComboBox values = new AutoCompletingComboBox(); + List recentTagsActions = new ArrayList(); + Collection sel; + private ActionListener autoCloseActionListener; + + public AddTagsPanel(Collection sel) { + super(new GridBagLayout()); + this.sel = sel; + add(new JLabel(""+trn("This will change up to {0} object.", + "This will change up to {0} objects.", sel.size(),sel.size()) + +"

"+tr("Please select a key")), GBC.eol().fill(GBC.HORIZONTAL)); + + AutoCompletionManager autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager(); + List keyList = autocomplete.getKeys(); + + AutoCompletionListItem itemToSelect = null; + // remove the object's tag keys from the list + Iterator iter = keyList.iterator(); + while (iter.hasNext()) { + AutoCompletionListItem item = iter.next(); + if (item.getValue().equals(lastAddKey)) { + itemToSelect = item; + } + for (int i = 0; i < propertyData.getRowCount(); ++i) { + if (item.getValue().equals(propertyData.getValueAt(i, 0))) { + if (itemToSelect == item) { + itemToSelect = null; + } + iter.remove(); + break; + } + } + } + + Collections.sort(keyList, defaultACItemComparator); + keys.setPossibleACItems(keyList); + keys.setEditable(true); + + add(keys, GBC.eop().fill()); + + add(new JLabel(tr("Please select a value")), GBC.eol()); + values.setEditable(true); + add(values, GBC.eop().fill()); + if (itemToSelect != null) { + keys.setSelectedItem(itemToSelect); + if (lastAddValue != null) { + values.setSelectedItem(lastAddValue); + } + } + + FocusAdapter focus = addFocusAdapter(keys, values, autocomplete, defaultACItemComparator); + // fire focus event in advance or otherwise the popup list will be too small at first + focus.focusGained(null); + + int recentTagsToShow = Main.pref.getInteger("properties.recently-added-tags", DEFAULT_LRU_TAGS_NUMBER); + if (recentTagsToShow > MAX_LRU_TAGS_NUMBER) { + recentTagsToShow = MAX_LRU_TAGS_NUMBER; + } + suggestRecentlyAddedTags(recentTagsToShow, focus); + } + + private void suggestRecentlyAddedTags(int tagsToShow, final FocusAdapter focus) { + if (!(tagsToShow > 0 && !recentTags.isEmpty())) + return; + + add(new JLabel(tr("Recently added tags")), GBC.eol()); int count = 1; @@ -234,13 +528,6 @@ } }; - tagsActions.add(action); - // Disable action if its key is already set on the object (the key being absent from the keys list for this reason - // performing this action leads to autocomplete to the next key (see #7671 comments) - for (int j = 0; j < propertyData.getRowCount(); ++j) { - if (t.getKey().equals(propertyData.getValueAt(j, 0))) { - action.setEnabled(false); - break; - } - } + recentTagsActions.add(action); + disableTagIfNeeded(t, action); // Find and display icon ImageIcon icon = MapPaintStyles.getNodeIcon(t, false); // Filters deprecated icon @@ -250,5 +537,5 @@ GridBagConstraints gbc = new GridBagConstraints(); gbc.ipadx = 5; - p.add(new JLabel(action.isEnabled() ? icon : GuiHelper.getDisabledIcon(icon)), gbc); + add(new JLabel(action.isEnabled() ? icon : GuiHelper.getDisabledIcon(icon)), gbc); // Create tag label final String color = action.isEnabled() ? "" : "; color:gray"; @@ -258,6 +545,6 @@ if (action.isEnabled()) { // Register action - p.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), actionShortcutKey); - p.getActionMap().put(actionShortcutKey, action); + getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), actionShortcutKey); + getActionMap().put(actionShortcutKey, action); // Make the tag label clickable and set tooltip to the action description (this displays also the keyboard shortcut) tagLabel.setToolTipText((String) action.getValue(Action.SHORT_DESCRIPTION)); @@ -267,4 +554,14 @@ public void mouseClicked(MouseEvent e) { action.actionPerformed(null); + // add tags and close window on double-click + if (e.getClickCount()>1) { + performTagAdding(); + if (autoCloseActionListener!=null) + autoCloseActionListener.actionPerformed(null); + } + // add tags on Shift-Click + if (e.isShiftDown()) { + performTagAdding(); + } } }); @@ -278,260 +575,47 @@ JPanel tagPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); tagPanel.add(tagLabel); - p.add(tagPanel, GBC.eol().fill(GBC.HORIZONTAL)); - } - } - } - - /** - * Create a focus handling adapter and apply in to the editor component of value - * autocompletion box. - * @param keys Box for keys entering and autocompletion - * @param values Box for values entering and autocompletion - * @param autocomplete Manager handling the autocompletion - * @param comparator Class to decide what values are offered on autocompletion - * @return The created adapter - */ - private FocusAdapter addFocusAdapter(final AutoCompletingComboBox keys, final AutoCompletingComboBox values, - final AutoCompletionManager autocomplete, final Comparator comparator) { - // get the combo box' editor component - JTextComponent editor = (JTextComponent)values.getEditor() - .getEditorComponent(); - // Refresh the values model when focus is gained - FocusAdapter focus = new FocusAdapter() { - @Override public void focusGained(FocusEvent e) { - String key = keys.getEditor().getItem().toString(); - - List valueList = autocomplete.getValues(getAutocompletionKeys(key)); - Collections.sort(valueList, comparator); - - values.setPossibleACItems(valueList); - objKey=key; - } - }; - editor.addFocusListener(focus); - return focus; - } - + add(tagPanel, GBC.eol().fill(GBC.HORIZONTAL)); + } + } + + public void destroyActions() { + for (JosmAction action : recentTagsActions) { + action.destroy(); + } + } + + /** - * Edit the value in the properties table row - * @param row The row of the table from which the value is edited. - */ - public void editProperty(final int row) { - changedKey = null; - Collection sel = Main.main.getCurrentDataSet().getSelected(); - if (sel.isEmpty()) return; - - String key = propertyData.getValueAt(row, 0).toString(); - objKey=key; - - String msg = ""+trn("This will change {0} object.", - "This will change up to {0} objects.", sel.size(), sel.size()) - +"

("+tr("An empty value deletes the tag.", key)+")"; - - JPanel panel = new JPanel(new BorderLayout()); - panel.add(new JLabel(msg), BorderLayout.NORTH); - - JPanel p = new JPanel(new GridBagLayout()); - panel.add(p, BorderLayout.CENTER); - - AutoCompletionManager autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager(); - List keyList = autocomplete.getKeys(); - Collections.sort(keyList, defaultACItemComparator); - - final AutoCompletingComboBox keys = new AutoCompletingComboBox(key); - keys.setPossibleACItems(keyList); - keys.setEditable(true); - keys.setSelectedItem(key); - - p.add(new JLabel(tr("Key")), GBC.std()); - p.add(Box.createHorizontalStrut(10), GBC.std()); - p.add(keys, GBC.eol().fill(GBC.HORIZONTAL)); - - @SuppressWarnings("unchecked") - final Map m = (Map) propertyData.getValueAt(row, 1); - - Comparator usedValuesAwareComparator = new Comparator() { - - @Override - public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { - boolean c1 = m.containsKey(o1.getValue()); - boolean c2 = m.containsKey(o2.getValue()); - if (c1 == c2) - return String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue()); - else if (c1) - return -1; - else - return +1; - } - }; - - List valueList = autocomplete.getValues(getAutocompletionKeys(key)); - Collections.sort(valueList, usedValuesAwareComparator); - - final String selection= m.size()!=1?tr(""):m.entrySet().iterator().next().getKey(); - - final AutoCompletingComboBox values = new AutoCompletingComboBox(selection); - values.setRenderer(new DefaultListCellRenderer() { - @Override public Component getListCellRendererComponent(JList list, - Object value, int index, boolean isSelected, boolean cellHasFocus){ - Component c = super.getListCellRendererComponent(list, value, - index, isSelected, cellHasFocus); - if (c instanceof JLabel) { - String str = ((AutoCompletionListItem) value).getValue(); - if (valueCount.containsKey(objKey)) { - Map m = valueCount.get(objKey); - if (m.containsKey(str)) { - str = tr("{0} ({1})", str, m.get(str)); - c.setFont(c.getFont().deriveFont(Font.ITALIC + Font.BOLD)); - } - } - ((JLabel) c).setText(str); - } - return c; - } - }); - - values.setEditable(true); - values.setPossibleACItems(valueList); - values.setSelectedItem(selection); - values.getEditor().setItem(selection); - p.add(new JLabel(tr("Value")), GBC.std()); - p.add(Box.createHorizontalStrut(10), GBC.std()); - p.add(values, GBC.eol().fill(GBC.HORIZONTAL)); - addFocusAdapter(keys, values, autocomplete, usedValuesAwareComparator); - - final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION) { - @Override public void selectInitialValue() { - // save unix system selection (middle mouse paste) - Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection(); - if(sysSel != null) { - Transferable old = sysSel.getContents(null); - values.requestFocusInWindow(); - values.getEditor().selectAll(); - sysSel.setContents(old, null); - } else { - values.requestFocusInWindow(); - values.getEditor().selectAll(); - } - } - }; - final JDialog dlg = optionPane.createDialog(Main.parent, trn("Change value?", "Change values?", m.size())); - dlg.setModalityType(Dialog.ModalityType.DOCUMENT_MODAL); - Dimension dlgSize = dlg.getSize(); - if(dlgSize.width > Main.parent.getSize().width) { - dlgSize.width = Math.max(250, Main.parent.getSize().width); - dlg.setSize(dlgSize); - } - dlg.setLocationRelativeTo(Main.parent); - values.getEditor().addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - dlg.setVisible(false); - optionPane.setValue(JOptionPane.OK_OPTION); - } - }); - - String oldValue = values.getEditor().getItem().toString(); - dlg.setVisible(true); - - Object answer = optionPane.getValue(); - if (answer == null || answer == JOptionPane.UNINITIALIZED_VALUE || - (answer instanceof Integer && (Integer)answer != JOptionPane.OK_OPTION)) { - values.getEditor().setItem(oldValue); - return; - } - - String value = values.getEditor().getItem().toString().trim(); - // is not Java 1.5 - //value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC); - if (value.equals("")) { - value = null; // delete the key - } - String newkey = keys.getEditor().getItem().toString().trim(); - //newkey = java.text.Normalizer.normalize(newkey, java.text.Normalizer.Form.NFC); - if (newkey.equals("")) { - newkey = key; - value = null; // delete the key instead - } - if (key.equals(newkey) && tr("").equals(value)) - return; - if (key.equals(newkey) || value == null) { - Main.main.undoRedo.add(new ChangePropertyCommand(sel, newkey, value)); - } else { - for (OsmPrimitive osm: sel) { - if(osm.get(newkey) != null) { - ExtendedDialog ed = new ExtendedDialog( - Main.parent, - tr("Overwrite key"), - new String[]{tr("Replace"), tr("Cancel")}); - ed.setButtonIcons(new String[]{"purge", "cancel"}); - ed.setContent(tr("You changed the key from ''{0}'' to ''{1}''.\n" - + "The new key is already used, overwrite values?", key, newkey)); - ed.setCancelButton(2); - ed.toggleEnable("overwriteEditKey"); - ed.showDialog(); - - if (ed.getValue() != 1) - return; + * Read tags from comboboxes and add it to all selected objects + */ + public void performTagAdding() { + String key = keys.getEditor().getItem().toString().trim(); + String value = values.getEditor().getItem().toString().trim(); + if (key.isEmpty() || value.isEmpty()) return; + lastAddKey = key; + lastAddValue = value; + recentTags.put(new Tag(key, value), null); + Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value)); + changedKey = key; + } + + private void disableTagIfNeeded(final Tag t, final JosmAction action) { + // Disable action if its key is already set on the object (the key being absent from the keys list for this reason + // performing this action leads to autocomplete to the next key (see #7671 comments) + for (int j = 0; j < propertyData.getRowCount(); ++j) { + if (t.getKey().equals(propertyData.getValueAt(j, 0))) { + action.setEnabled(false); break; } } - Collection commands=new Vector(); - commands.add(new ChangePropertyCommand(sel, key, null)); - if (value.equals(tr(""))) { - HashMap> map=new HashMap>(); - for (OsmPrimitive osm: sel) { - String val=osm.get(key); - if(val != null) - { - if (map.containsKey(val)) { - map.get(val).add(osm); - } else { - Vector v = new Vector(); - v.add(osm); - map.put(val, v); - } - } - } - for (Map.Entry> e: map.entrySet()) { - commands.add(new ChangePropertyCommand(e.getValue(), newkey, e.getKey())); - } - } else { - commands.add(new ChangePropertyCommand(sel, newkey, value)); - } - Main.main.undoRedo.add(new SequenceCommand( - trn("Change properties of up to {0} object", - "Change properties of up to {0} objects", sel.size(), sel.size()), - commands)); - } - - changedKey = newkey; - } - - /** - * If during last editProperty call user changed the key name, this key will be returned - * Elsewhere, returns null. - */ - public String getChangedKey() { - return changedKey; - } - - public void resetChangedKey() { - changedKey = null; - } - - /** - * For a given key k, return a list of keys which are used as keys for - * auto-completing values to increase the search space. - * @param key the key k - * @return a list of keys - */ - private static List getAutocompletionKeys(String key) { - if ("name".equals(key) || "addr:street".equals(key)) - return Arrays.asList("addr:street", "name"); - else - return Arrays.asList(key); - } - - + } + + /** + * @param autoCloseActionListener will be called when we need to close the entire dialog + */ + public void setCloseActionListener(ActionListener autoCloseActionListener) { + this.autoCloseActionListener = autoCloseActionListener; + } + } }