diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java index 9075624..825af36 100644 --- a/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java +++ b/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java @@ -18,7 +18,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; 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; @@ -34,6 +33,7 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -47,7 +47,6 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.Box; import javax.swing.DefaultListCellRenderer; -import javax.swing.InputMap; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JDialog; @@ -451,6 +450,9 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi private static String lastAddKey = null; private static String lastAddValue = null; + // 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(5, 1.1f, true); + /** * Open the add selection dialog and add a new key/value to the table (and * to the dataset, of course). @@ -461,10 +463,10 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi Collection sel = ds.getSelected(); 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(); List keyList = autocomplete.getKeys(); @@ -492,14 +494,12 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi keys.setPossibleACItems(keyList); keys.setEditable(true); - p.add(keys, BorderLayout.CENTER); + p.add(keys, GBC.eop().fill()); - JPanel p2 = new JPanel(new BorderLayout()); - p.add(p2, BorderLayout.SOUTH); - p2.add(new JLabel(tr("Please select a value")), BorderLayout.NORTH); + 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); /* don't add single chars, as they are no properly selected */ @@ -508,6 +508,23 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi } } + if (!recentTags.isEmpty()) { + p.add(new JLabel(tr("Recently added tags")), GBC.eol()); + } + for (final Tag t : recentTags.keySet()) { + final JLabel l = new JLabel("" + + "" + + "
" + t.toString() + "
"); + l.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + keys.getEditor().setItem(t.getKey()); + values.getEditor().setItem(t.getValue()); + } + }); + p.add(l, GBC.eol()); + } + FocusAdapter focus = addFocusAdapter(-1, keys, values, autocomplete, defaultACItemComparator); // fire focus event in advance or otherwise the popup list will be too small at first focus.focusGained(null); @@ -539,6 +556,7 @@ public class PropertiesDialog extends ToggleDialog implements SelectionChangedLi return; lastAddKey = key; lastAddValue = value; + recentTags.put(new Tag(key, value), null); Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value)); btnAdd.requestFocusInWindow(); }