Changeset 4604 in josm for trunk/src/org/openstreetmap/josm/tools/MultikeyShortcutAction.java

Timestamp:

2011-11-21T22:16:25+01:00 (12 years ago)

Author:

jttt

Message:

Multikey action improvements (see #5515):

• show text in status bar after shortcut is pressed
• number layers from 1
• do not allow Repeat for last layer if layer index conflicts with shortcut

File:

• trunk/src/org/openstreetmap/josm/tools/MultikeyShortcutAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/MultikeyShortcutAction.java

@@ -22 +22 @@
 
         public char getShortcut() {
-            if (index < 10)
-                return (char)('0' + index);
+            if (index < 9)
+                return (char)('1' + index);
+            else if (index == 9)
+                return '0';
             else
                 return (char)('A' +  index - 10);
@@ -33 +35 @@
     }
 
-    void executeMultikeyAction(int index);
-    void repeateLastMultikeyAction();
+    void executeMultikeyAction(int index, boolean repeatLastAction);
     List<MultikeyInfo> getMultikeyCombinations();
     MultikeyInfo getLastMultikeyAction();