Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 5382) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 5383) @@ -7,10 +7,12 @@ import java.awt.BorderLayout; import java.awt.Component; +import java.awt.Cursor; +import java.awt.Dialog.ModalityType; import java.awt.Dimension; import java.awt.Font; +import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Point; import java.awt.Toolkit; -import java.awt.Dialog.ModalityType; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.Transferable; @@ -19,8 +21,8 @@ import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; -import java.awt.event.InputEvent; 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; @@ -35,12 +37,13 @@ import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; import java.util.Vector; -import java.util.Map.Entry; import javax.swing.AbstractAction; @@ -48,5 +51,5 @@ import javax.swing.Box; import javax.swing.DefaultListCellRenderer; -import javax.swing.InputMap; +import javax.swing.ImageIcon; import javax.swing.JComboBox; import javax.swing.JComponent; @@ -62,5 +65,4 @@ import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; -import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; @@ -93,6 +95,6 @@ import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter; import org.openstreetmap.josm.data.osm.event.DatasetEventManager; +import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode; import org.openstreetmap.josm.data.osm.event.SelectionEventManager; -import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode; import org.openstreetmap.josm.gui.DefaultNameFormatter; import org.openstreetmap.josm.gui.ExtendedDialog; @@ -105,4 +107,5 @@ 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; @@ -157,17 +160,17 @@ int row = propertyTable.rowAtPoint(e.getPoint()); if (row > -1) { - propertyEdit(row); + editProperty(row); } else { - add(); + addProperty(); } } else if (e.getSource() == membershipTable) { int row = membershipTable.rowAtPoint(e.getPoint()); if (row > -1) { - membershipEdit(row); + editMembership(row); } } else { - add(); + addProperty(); } } @@ -233,5 +236,5 @@ */ @SuppressWarnings("unchecked") - void propertyEdit(int row) { + private void editProperty(int row) { Collection sel = Main.main.getCurrentDataSet().getSelected(); if (sel.isEmpty()) return; @@ -434,5 +437,5 @@ * @return a list of keys */ - static List getAutocompletionKeys(String key) { + private static List getAutocompletionKeys(String key) { if ("name".equals(key) || "addr:street".equals(key)) return Arrays.asList("addr:street", "name"); @@ -447,5 +450,5 @@ * @param row */ - void membershipEdit(int row) { + private void editMembership(int row) { Relation relation = (Relation)membershipData.getValueAt(row, 0); Main.map.relationListDialog.selectRelation(relation); @@ -458,9 +461,21 @@ 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). */ - void add() { + private void addProperty() { Collection sel; if (Main.map.mapMode instanceof DrawAction) { @@ -473,8 +488,8 @@ if (sel.isEmpty()) return; - JPanel p = new JPanel(new BorderLayout()); + 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")), BorderLayout.NORTH); + +"

"+tr("Please select a key")), GBC.eol()); final AutoCompletingComboBox keys = new AutoCompletingComboBox(); AutoCompletionManager autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager(); @@ -504,12 +519,10 @@ 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); + 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); - p2.add(values, BorderLayout.CENTER); + p.add(values, GBC.eop().fill()); if (itemToSelect != null) { keys.setSelectedItem(itemToSelect); @@ -519,4 +532,11 @@ } } + + 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); FocusAdapter focus = addFocusAdapter(-1, keys, values, autocomplete, defaultACItemComparator); @@ -542,4 +562,8 @@ dialog.setModalityType(ModalityType.DOCUMENT_MODAL); dialog.setVisible(true); + + for (JosmAction action : recentTagsActions) { + action.destroy(); + } if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue())) @@ -551,6 +575,56 @@ 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) { + 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); + // 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(icon), gbc); + // 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.getEditor().setItem(t.getKey()); + values.getEditor().setItem(t.getValue()); + } + }; + p.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), actionShortcutKey); + p.getActionMap().put(actionShortcutKey, action); + tagsActions.add(action); + // Display clickable tag + final JLabel tagLabel = new JLabel("" + + "" + + "
" + t.toString() + "
"); + tagLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); + tagLabel.setToolTipText((String) action.getValue(Action.SHORT_DESCRIPTION)); + tagLabel.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + action.actionPerformed(null); + } + }); + p.add(tagLabel, GBC.eol()); + } + } } @@ -1189,5 +1263,5 @@ @Override public void actionPerformed(ActionEvent e) { - add(); + addProperty(); } } @@ -1207,8 +1281,8 @@ if (propertyTable.getSelectedRowCount() == 1) { int row = propertyTable.getSelectedRow(); - propertyEdit(row); + editProperty(row); } else if (membershipTable.getSelectedRowCount() == 1) { int row = membershipTable.getSelectedRow(); - membershipEdit(row); + editMembership(row); } } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 5382) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 5383) @@ -11,4 +11,5 @@ import java.util.Arrays; import java.util.Collection; +import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -19,5 +20,8 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.Tag; import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList; import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource; import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource; @@ -118,4 +122,32 @@ .setArchive(source.zipIcons) .setOptional(true).get(); + } + + public static ImageIcon getNodeIcon(Tag tag) { + return getNodeIcon(tag, true); + } + + public static ImageIcon getNodeIcon(Tag tag, boolean includeDeprecatedIcon) { + if (tag != null) { + Node virtualNode = new Node(); + virtualNode.put(tag.getKey(), tag.getValue()); + StyleList styleList = getStyles().generateStyles(virtualNode, 0, null, false).a; + if (styleList != null) { + for (Iterator it = styleList.iterator(); it.hasNext(); ) { + ElemStyle style = it.next(); + if (style instanceof NodeElemStyle) { + MapImage mapImage = ((NodeElemStyle) style).mapImage; + if (mapImage != null) { + if (includeDeprecatedIcon || mapImage.name == null || !mapImage.name.equals("misc/deprecated.png")) { + return new ImageIcon(mapImage.getImage()); + } else { + return null; // Deprecated icon found but not wanted + } + } + } + } + } + } + return null; }