Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 5632) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 5633) @@ -5,26 +5,13 @@ import static org.openstreetmap.josm.tools.I18n.trn; -import java.awt.BorderLayout; import java.awt.Component; import java.awt.Container; -import java.awt.Cursor; -import java.awt.Dialog.ModalityType; -import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Font; -import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Point; -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.Transferable; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.image.BufferedImage; import java.net.HttpURLConnection; import java.net.URI; @@ -38,6 +25,4 @@ import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -47,17 +32,10 @@ import java.util.TreeMap; import java.util.TreeSet; -import java.util.Vector; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.Box; -import javax.swing.DefaultListCellRenderer; -import javax.swing.ImageIcon; import javax.swing.JComponent; -import javax.swing.JDialog; import javax.swing.JLabel; -import javax.swing.JList; import javax.swing.JMenuItem; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JPopupMenu; @@ -73,9 +51,7 @@ import javax.swing.table.TableColumnModel; import javax.swing.table.TableModel; -import javax.swing.text.JTextComponent; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.actions.mapmode.DrawAction; import org.openstreetmap.josm.actions.search.SearchAction.SearchMode; import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting; @@ -83,7 +59,5 @@ import org.openstreetmap.josm.command.ChangePropertyCommand; import org.openstreetmap.josm.command.Command; -import org.openstreetmap.josm.command.SequenceCommand; import org.openstreetmap.josm.data.SelectionChangedListener; -import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.IRelation; import org.openstreetmap.josm.data.osm.Node; @@ -108,11 +82,6 @@ import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; import org.openstreetmap.josm.gui.tagging.TaggingPreset; import org.openstreetmap.josm.gui.tagging.TaggingPreset.PresetType; -import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox; -import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem; -import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager; -import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; import org.openstreetmap.josm.tools.GBC; @@ -162,7 +131,8 @@ int row = propertyTable.rowAtPoint(e.getPoint()); if (row > -1) { - editProperty(row); + editHelper.editProperty(row); } else { - addProperty(); + editHelper.addProperty(); + btnAdd.requestFocusInWindow(); } } else if (e.getSource() == membershipTable) { @@ -174,5 +144,6 @@ else { - addProperty(); + editHelper.addProperty(); + btnAdd.requestFocusInWindow(); } } @@ -184,4 +155,5 @@ } } + } @@ -195,10 +167,5 @@ private final Map> valueCount = new TreeMap>(); - Comparator defaultACItemComparator = new Comparator() { - public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { - return String.CASE_INSENSITIVE_ORDER.compare(o1.getValue(), o2.getValue()); - } - }; - + private final DataSetListenerAdapter dataChangedAdapter = new DataSetListenerAdapter(this); private final HelpAction helpAction = new HelpAction(); @@ -235,218 +202,4 @@ /** - * Edit the value in the properties table row - * @param row The row of the table from which the value is edited. - */ - private void editProperty(int row) { - 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(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; - 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 (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)); - } - - if(!key.equals(newkey)) { - for(int i=0; i < propertyTable.getRowCount(); i++) - if(propertyData.getValueAt(i, 0).toString().equals(newkey)) { - row=i; - break; - } - } - propertyTable.changeSelection(row, 0, false, false); - } - - /** - * 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); - } - - /** * This simply fires up an {@link RelationEditor} for the relation shown; everything else * is the editor's business. @@ -463,227 +216,4 @@ } - private static String lastAddKey = null; - private static String lastAddValue = null; - - public static final int DEFAULT_LRU_TAGS_NUMBER = 5; - public static final int MAX_LRU_TAGS_NUMBER = 9; - - // LRU cache for recently added tags (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html) - private static final Map recentTags = new LinkedHashMap(MAX_LRU_TAGS_NUMBER+1, 1.1f, true) { - @Override - protected boolean removeEldestEntry(Entry eldest) { - return size() > MAX_LRU_TAGS_NUMBER; - } - }; - - /** - * Open the add selection dialog and add a new key/value to the table (and - * to the dataset, of course). - */ - private void addProperty() { - Collection sel; - if (Main.map.mapMode instanceof DrawAction) { - sel = ((DrawAction) Main.map.mapMode).getInProgressSelection(); - } else { - DataSet ds = Main.main.getCurrentDataSet(); - if (ds == null) return; - sel = ds.getSelected(); - } - 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){ - @Override public void selectInitialValue() { - // save unix system selection (middle mouse paste) - Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection(); - if(sysSel != null) { - Transferable old = sysSel.getContents(null); - keys.requestFocusInWindow(); - keys.getEditor().selectAll(); - sysSel.setContents(old, null); - } else { - keys.requestFocusInWindow(); - keys.getEditor().selectAll(); - } - } - }; - JDialog dialog = pane.createDialog(Main.parent, tr("Add value?")); - dialog.setModalityType(ModalityType.DOCUMENT_MODAL); - dialog.setVisible(true); - - for (JosmAction action : recentTagsActions) { - action.destroy(); - } - - if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue())) - return; - 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)); - btnAdd.requestFocusInWindow(); - } - - 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()); - - int count = 1; - // We store the maximum number (9) of recent tags to allow dynamic change of number of tags shown in the preferences. - // This implies to iterate in descending order, as the oldest elements will only be removed after we reach the maximum numbern and not the number of tags to show. - // However, as Set does not allow to iterate in descending order, we need to copy its elements into a List we can access in reverse order. - List tags = new LinkedList(recentTags.keySet()); - for (int i = tags.size()-1; i >= 0 && count <= tagsToShow; i--, count++) { - final Tag t = tags.get(i); - // Create action for reusing the tag, with keyboard shortcut Ctrl+(1-5) - String actionShortcutKey = "properties:recent:"+count; - Shortcut sc = Shortcut.registerShortcut(actionShortcutKey, null, KeyEvent.VK_0+count, Shortcut.CTRL); - final JosmAction action = new JosmAction(actionShortcutKey, null, tr("Use this tag again"), sc, false) { - @Override - public void actionPerformed(ActionEvent e) { - keys.setSelectedItem(t.getKey()); - values.setSelectedItem(t.getValue()); - // Update list of values (fix #7951) - focus.focusGained(null); - } - }; - 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; - } - } - // Find and display icon - ImageIcon icon = MapPaintStyles.getNodeIcon(t, false); // Filters deprecated icon - if (icon == null) { - icon = new ImageIcon(new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB)); - } - GridBagConstraints gbc = new GridBagConstraints(); - gbc.ipadx = 5; - p.add(new JLabel(action.isEnabled() ? icon : GuiHelper.getDisabledIcon(icon)), gbc); - // Create tag label - final String color = action.isEnabled() ? "" : "; color:gray"; - final JLabel tagLabel = new JLabel("" - + "" - + "
" + t.toString() + "
"); - if (action.isEnabled()) { - // Register action - p.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), actionShortcutKey); - p.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)); - tagLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - tagLabel.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - action.actionPerformed(null); - } - }); - } else { - // Disable tag label - tagLabel.setEnabled(false); - // Explain in the tooltip why - tagLabel.setToolTipText(tr("The key ''{0}'' is already used", t.getKey())); - } - // Finally add label to the resulting panel - 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; - } - private String objKey; - /** * The property data of selected objects. @@ -719,4 +249,9 @@ private final JTable membershipTable = new JTable(membershipData); + /** + * This sub-object is responsible for all adding and editing of properties + */ + private final TagEditHelper editHelper = new TagEditHelper(propertyData, valueCount); + /** * The Add button (needed to be able to disable it) @@ -1062,5 +597,6 @@ String selectedTag = null; Relation selectedRelation = null; - if (propertyTable.getSelectedRowCount() == 1) { + selectedTag = editHelper.getChangedKey(); // select last added or last edited key by default + if (selectedTag == null && propertyTable.getSelectedRowCount() == 1) { selectedTag = (String)propertyData.getValueAt(propertyTable.getSelectedRow(), 0); } @@ -1103,5 +639,5 @@ ? e.getValue().keySet().iterator().next() : tr("")); } - + membershipData.setRowCount(0); @@ -1318,5 +854,6 @@ @Override public void actionPerformed(ActionEvent e) { - addProperty(); + editHelper.addProperty(); + btnAdd.requestFocusInWindow(); } } @@ -1339,5 +876,5 @@ if (propertyTable.getSelectedRowCount() == 1) { int row = propertyTable.getSelectedRow(); - editProperty(row); + editHelper.editProperty(row); } else if (membershipTable.getSelectedRowCount() == 1) { int row = membershipTable.getSelectedRow(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 5633) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 5633) @@ -0,0 +1,538 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.dialogs.properties; + +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; + +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Cursor; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Toolkit; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.Transferable; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Vector; +import javax.swing.Action; +import javax.swing.Box; +import javax.swing.DefaultListCellRenderer; +import javax.swing.ImageIcon; +import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.table.DefaultTableModel; +import javax.swing.text.JTextComponent; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.actions.mapmode.DrawAction; +import org.openstreetmap.josm.command.ChangePropertyCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.Tag; +import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; +import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox; +import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem; +import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager; +import org.openstreetmap.josm.gui.util.GuiHelper; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * Class that helps PropertiesDialog add and edit tag values + */ + 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()); + } + }; + + + // LRU cache for recently added tags (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html) + private final Map recentTags = new LinkedHashMap(MAX_LRU_TAGS_NUMBER+1, 1.1f, true) { + @Override + protected boolean removeEldestEntry(Map.Entry eldest) { + return size() > MAX_LRU_TAGS_NUMBER; + } + }; + + TagEditHelper(DefaultTableModel propertyData, Map> valueCount) { + this.propertyData = propertyData; + this.valueCount = valueCount; + } + + /** + * Open the add selection dialog and add a new key/value to the table (and + * to the dataset, of course). + */ + public void addProperty() { + changedKey = null; + Collection sel; + if (Main.map.mapMode instanceof DrawAction) { + sel = ((DrawAction) Main.map.mapMode).getInProgressSelection(); + } else { + DataSet ds = Main.main.getCurrentDataSet(); + if (ds == null) return; + sel = ds.getSelected(); + } + 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){ + @Override public void selectInitialValue() { + // save unix system selection (middle mouse paste) + Clipboard sysSel = Toolkit.getDefaultToolkit().getSystemSelection(); + if(sysSel != null) { + Transferable old = sysSel.getContents(null); + keys.requestFocusInWindow(); + keys.getEditor().selectAll(); + sysSel.setContents(old, null); + } else { + keys.requestFocusInWindow(); + keys.getEditor().selectAll(); + } + } + }; + JDialog dialog = pane.createDialog(Main.parent, tr("Add value?")); + dialog.setModalityType(Dialog.ModalityType.DOCUMENT_MODAL); + dialog.setVisible(true); + + for (JosmAction action : recentTagsActions) { + action.destroy(); + } + + if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue())) + return; + 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 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()); + + int count = 1; + // We store the maximum number (9) of recent tags to allow dynamic change of number of tags shown in the preferences. + // This implies to iterate in descending order, as the oldest elements will only be removed after we reach the maximum numbern and not the number of tags to show. + // However, as Set does not allow to iterate in descending order, we need to copy its elements into a List we can access in reverse order. + List tags = new LinkedList(recentTags.keySet()); + for (int i = tags.size()-1; i >= 0 && count <= tagsToShow; i--, count++) { + final Tag t = tags.get(i); + // Create action for reusing the tag, with keyboard shortcut Ctrl+(1-5) + String actionShortcutKey = "properties:recent:"+count; + Shortcut sc = Shortcut.registerShortcut(actionShortcutKey, null, KeyEvent.VK_0+count, Shortcut.CTRL); + final JosmAction action = new JosmAction(actionShortcutKey, null, tr("Use this tag again"), sc, false) { + @Override + public void actionPerformed(ActionEvent e) { + keys.setSelectedItem(t.getKey()); + values.setSelectedItem(t.getValue()); + // Update list of values (fix #7951) + focus.focusGained(null); + } + }; + 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; + } + } + // Find and display icon + ImageIcon icon = MapPaintStyles.getNodeIcon(t, false); // Filters deprecated icon + if (icon == null) { + icon = new ImageIcon(new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB)); + } + GridBagConstraints gbc = new GridBagConstraints(); + gbc.ipadx = 5; + p.add(new JLabel(action.isEnabled() ? icon : GuiHelper.getDisabledIcon(icon)), gbc); + // Create tag label + final String color = action.isEnabled() ? "" : "; color:gray"; + final JLabel tagLabel = new JLabel("" + + "" + + "
" + t.toString() + "
"); + if (action.isEnabled()) { + // Register action + p.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), actionShortcutKey); + p.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)); + tagLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); + tagLabel.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + action.actionPerformed(null); + } + }); + } else { + // Disable tag label + tagLabel.setEnabled(false); + // Explain in the tooltip why + tagLabel.setToolTipText(tr("The key ''{0}'' is already used", t.getKey())); + } + // Finally add label to the resulting panel + 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; + } + + /** + * 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; + 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); + } + + +} + +