Changeset 4999 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-02-19T18:49:37+01:00 (13 years ago)

Author:

stoecker

Message:

fix #7402 - multikey shortcut handling

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/FilterDialog.java (modified) (2 diffs)
• gui/dialogs/LayerListDialog.java (modified) (5 diffs)
• gui/layer/JumpToMarkerActions.java (modified) (3 diffs)
• tools/MultikeyActionsHandler.java (modified) (8 diffs)
• tools/MultikeyShortcutAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -337 +337 @@
         EnableFilterAction() {
             putValue(SHORT_DESCRIPTION, tr("Enable filter"));
-            ENABLE_FILTER_SHORTCUT.setAccelerator(this);
+        }
+
+        @Override
+        public Shortcut getMultikeyShortcut() {
+            return ENABLE_FILTER_SHORTCUT;
         }
 
@@ -356 +360 @@
         public HidingFilterAction() {
             putValue(SHORT_DESCRIPTION, tr("Hiding filter"));
-            HIDING_FILTER_SHORTCUT.setAccelerator(this);
+        }
+
+        @Override
+        public Shortcut getMultikeyShortcut() {
+            return HIDING_FILTER_SHORTCUT;
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -432 +432 @@
 
         private WeakReference<Layer> lastLayer;
+        private Shortcut multikeyShortcut;
 
         /**
@@ -442 +443 @@
             putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the selected layer."));
             putValue("help", HelpUtil.ht("/Dialog/LayerList#ShowHideLayer"));
-            Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}",
-            tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.SHIFT).setAccelerator(this);
+            multikeyShortcut = Shortcut.registerShortcut("core_multikey:showHideLayer", tr("Multikey: {0}",
+            tr("Show/hide layer")), KeyEvent.VK_S, Shortcut.SHIFT);
             if (init) {
                 updateEnabledState();
@@ -451 +452 @@
         public ShowHideLayerAction() {
             this(true);
+        }
+
+        @Override
+        public Shortcut getMultikeyShortcut() {
+            return multikeyShortcut;
         }
 
@@ -618 +624 @@
     public final class ActivateLayerAction extends AbstractAction implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction{
         private  Layer layer;
+        private Shortcut multikeyShortcut;
 
         public ActivateLayerAction(Layer layer) {
@@ -630 +637 @@
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "activate"));
             putValue(SHORT_DESCRIPTION, tr("Activate the selected layer"));
-            Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}",
-            tr("Activate layer")), KeyEvent.VK_A, Shortcut.SHIFT).setAccelerator(this);
+            multikeyShortcut = Shortcut.registerShortcut("core_multikey:activateLayer", tr("Multikey: {0}",
+            tr("Activate layer")), KeyEvent.VK_A, Shortcut.SHIFT);
             putValue("help", HelpUtil.ht("/Dialog/LayerList#ActivateLayer"));
+        }
+
+        @Override
+        public Shortcut getMultikeyShortcut() {
+            return multikeyShortcut;
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java

@@ -32 +32 @@
         private final Layer layer;
         private WeakReference<Layer> lastLayer;
+        private Shortcut multikeyShortcut;
 
         public JumpToNextMarker(JumpToMarkerLayer layer) {
-            Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")),
-                KeyEvent.VK_J, Shortcut.ALT_CTRL).setAccelerator(this);
+            multikeyShortcut = Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")),
+                KeyEvent.VK_J, Shortcut.ALT_CTRL);
             putValue(SHORT_DESCRIPTION, tr("Jump to next marker"));
             putValue(NAME, tr("Jump to next marker"));
 
             this.layer = (Layer)layer;
+        }
+
+        @Override
+        public Shortcut getMultikeyShortcut() {
+            return multikeyShortcut;
         }
 
@@ -86 +92 @@
         private WeakReference<Layer> lastLayer;
         private final Layer layer;
+        private Shortcut multikeyShortcut;
 
         public JumpToPreviousMarker(JumpToMarkerLayer layer) {
@@ -94 +101 @@
             putValue(SHORT_DESCRIPTION, tr("Jump to previous marker"));
             putValue(NAME, tr("Jump to previous marker"));
+        }
+
+        @Override
+        public Shortcut getMultikeyShortcut() {
+            return multikeyShortcut;
         }
 

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

@@ -24 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.MultikeyShortcutAction.MultikeyInfo;
+import org.openstreetmap.josm.tools.Shortcut;
 
 public class MultikeyActionsHandler {
@@ -40 +41 @@
                 int index = getIndex(e.getKeyCode());
                 if (index >= 0) {
-                    lastAction.action.executeMultikeyAction(index, e.getKeyCode() == lastAction.shortcut.getKeyCode());
+                    lastAction.action.executeMultikeyAction(index, e.getKeyCode() == lastAction.shortcut.getKeyStroke().getKeyCode());
                 }
                 lastAction = null;
@@ -64 +65 @@
 
         final MultikeyShortcutAction action;
-        final KeyStroke shortcut;
+        final Shortcut shortcut;
 
         MyAction(MultikeyShortcutAction action) {
             this.action = action;
-            this.shortcut = (KeyStroke) action.getValue(ACCELERATOR_KEY);
+            this.shortcut = action.getMultikeyShortcut();
         }
 
@@ -102 +103 @@
             }
         }
-
     }
 
@@ -143 +143 @@
                 layers.add(pnTitle);
 
-                char repeatKey = (char) action.shortcut.getKeyCode();
+                char repeatKey = (char) action.shortcut.getKeyStroke().getKeyCode();
                 boolean repeatKeyUsed = false;
 
@@ -153 +153 @@
                     }
 
-                    JMenuItem item = new JMenuItem(formatMenuText(action.shortcut, String.valueOf(info.getShortcut()), info.getDescription()));
+                    JMenuItem item = new JMenuItem(formatMenuText(action.shortcut.getKeyStroke(), String.valueOf(info.getShortcut()), info.getDescription()));
                     item.setMnemonic(info.getShortcut());
                     item.addActionListener(new ActionListener() {
@@ -167 +167 @@
                     MultikeyInfo lastLayer = action.action.getLastMultikeyAction();
                     if (lastLayer != null) {
-                        JMenuItem repeateItem = new JMenuItem(formatMenuText(action.shortcut,
-                                KeyEvent.getKeyText(action.shortcut.getKeyCode()),
+                        JMenuItem repeateItem = new JMenuItem(formatMenuText(action.shortcut.getKeyStroke(),
+                                KeyEvent.getKeyText(action.shortcut.getKeyStroke().getKeyCode()),
                                 "Repeat " + lastLayer.getDescription()));
-                        repeateItem.setMnemonic(action.shortcut.getKeyCode());
+                        repeateItem.setMnemonic(action.shortcut.getKeyStroke().getKeyCode());
                         repeateItem.addActionListener(new ActionListener() {
                             @Override
@@ -201 +201 @@
 
     public void addAction(MultikeyShortcutAction action) {
-        if (!(action.getValue(Action.ACCELERATOR_KEY) instanceof KeyStroke))
-            throw new IllegalArgumentException("Action must have shortcut set");
-        MyAction myAction = new MyAction(action);
-        Main.registerActionShortcut(myAction, myAction.shortcut);
-    }
-
-
+        if(action.getMultikeyShortcut() != null) {
+            MyAction myAction = new MyAction(action);
+            Main.registerActionShortcut(myAction, myAction.shortcut);
+        }
+    }
 }

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

@@ -35 +35 @@
     }
 
+    public Shortcut getMultikeyShortcut();
+
     void executeMultikeyAction(int index, boolean repeatLastAction);
     List<MultikeyInfo> getMultikeyCombinations();