Changeset 9259 in josm for trunk

Timestamp:

2016-01-02T14:52:39+01:00 (8 years ago)

Author:

simon04

Message:

Do not register more than 10 shortcuts for "Use this tag again"

This was possible due to r5704.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -705 +705 @@
             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;
-                String actionShortcutShiftKey = "properties:recent:shift:"+count;
-                // CHECKSTYLE.OFF: LineLength
-                Shortcut sc = Shortcut.registerShortcut(actionShortcutKey, tr("Choose recent tag {0}", count), KeyEvent.VK_0+count, Shortcut.CTRL);
-                // CHECKSTYLE.ON: LineLength
+                // Create action for reusing the tag, with keyboard shortcut
+                final String actionShortcutKey = "properties:recent:" + count;
+                final String actionShortcutShiftKey = "properties:recent:shift:" + count;
+                final Shortcut sc = count > 10 ? null : Shortcut.registerShortcut(
+                        actionShortcutKey, tr("Choose recent tag {0}", count), KeyEvent.VK_0 + count, Shortcut.CTRL);
                 final JosmAction action = new JosmAction(actionShortcutKey, null, tr("Use this tag again"), sc, false) {
                     @Override
@@ -721 +720 @@
                     }
                 };
-                Shortcut scShift = Shortcut.registerShortcut(actionShortcutShiftKey, tr("Apply recent tag {0}", count),
-                        KeyEvent.VK_0+count, Shortcut.CTRL_SHIFT);
+                final Shortcut scShift = count > 10 ? null : Shortcut.registerShortcut(
+                        actionShortcutShiftKey, tr("Apply recent tag {0}", count), KeyEvent.VK_0 + count, Shortcut.CTRL_SHIFT);
                 final JosmAction actionShift = new JosmAction(actionShortcutShiftKey, null, tr("Use this tag again"), scShift, false) {
                     @Override
@@ -763 +762 @@
                         "/td></tr></table></html>");
                 tagLabel.setFont(tagLabel.getFont().deriveFont(Font.PLAIN));
-                if (action.isEnabled()) {
+                if (action.isEnabled() && sc != null && scShift != null) {
                     // Register action
                     mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), actionShortcutKey);
@@ -769 +768 @@
                     mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scShift.getKeyStroke(), actionShortcutShiftKey);
                     mainPanel.getActionMap().put(actionShortcutShiftKey, actionShift);
+                }
+                if (action.isEnabled()) {
                     // 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));