Changeset 7539 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-09-15T19:42:31+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #5957, fix #10458, see #10455: fix various focus/shortcuts issues:

• proper use of "Command" modifier on OS X instead of "Ctrl"
• fix related focus issue on OS X in layer list dialog (copy/paste between layers not working)
• fix non-working commands after a layer selection: Ctrl-A, Tab, Ctrl-Down/Up/Left/Right, F8
• fix impossibility to use 'A', 'S' or 'X' keys in relation filter or when renaming layer

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• InputMapUtils.java (modified) (3 diffs)
• Shortcut.java (modified) (5 diffs)

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

@@ -13 +13 @@
 
 /**
- * Tools to work with Swing InputMap
- *
+ * Tools to work with Swing InputMap.
+ * @since 5200
  */
 public final class InputMapUtils {
@@ -62 +62 @@
 
     /**
-     * Enable activating button on Enter (which is replaced with spacebar for certain Look-And-Feels)
+     * Enable activating button on Enter (which is replaced with spacebar for certain Look-And-Feels).
+     * @param b Button
      */
     public static void enableEnter(JButton b) {
          b.setFocusable(true);
          b.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter");
-         b.getActionMap().put("enter",b.getAction());
+         b.getActionMap().put("enter", b.getAction());
     }
 
+    /**
+     * Add an action activated with Enter key on a component.
+     * @param c The Swing component
+     * @param a action activated with Enter key
+     */
     public static void addEnterAction(JComponent c, Action a) {
          c.getActionMap().put("enter", a);
@@ -75 +81 @@
     }
 
+    /**
+     * Add an action activated with Spacebar key on a component.
+     * @param c The Swing component
+     * @param a action activated with Spacebar key
+     */
     public static void addSpacebarAction(JComponent c, Action a) {
          c.getActionMap().put("spacebar", a);

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

@@ -19 +19 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 
 /**
@@ -27 +28 @@
  *       finally manages loading and saving shortcuts to/from the preferences.
  *
- * Action authors: You only need the {@link #registerShortcut} factory. Ignore everything
- *                 else.
+ * Action authors: You only need the {@link #registerShortcut} factory. Ignore everything else.
  *
  * All: Use only public methods that are also marked to be used. The others are
  *      public so the shortcut preferences can use them.
- *
+ * @since 1084
  */
 public final class Shortcut {
@@ -262 +262 @@
     }
 
+    /** None group: used with KeyEvent.CHAR_UNDEFINED if no shortcut is defined */
     public static final int NONE = 5000;
     public static final int MNEMONIC = 5001;
+    /** Reserved group: for system shortcuts only */
     public static final int RESERVED = 5002;
+    /** Direct group: no modifier */
     public static final int DIRECT = 5003;
+    /** Alt group */
     public static final int ALT = 5004;
+    /** Shift group */
     public static final int SHIFT = 5005;
+    /** Command group. Matches CTRL modifier on Windows/Linux but META modifier on OS X */
     public static final int CTRL = 5006;
+    /** Alt-Shift group */
     public static final int ALT_SHIFT = 5007;
+    /** Alt-Command group. Matches ALT-CTRL modifier on Windows/Linux but ALT-META modifier on OS X */
     public static final int ALT_CTRL = 5008;
+    /** Command-Shift group. Matches CTRL-SHIFT modifier on Windows/Linux but META-SHIFT modifier on OS X */
     public static final int CTRL_SHIFT = 5009;
+    /** Alt-Command-Shift group. Matches ALT-CTRL-SHIFT modifier on Windows/Linux but ALT-META-SHIFT modifier on OS X */
     public static final int ALT_CTRL_SHIFT = 5010;
 
@@ -285 +295 @@
         if (initdone) return;
         initdone = true;
+        int commandDownMask = GuiHelper.getMenuShortcutKeyMaskEx();
         groups.put(NONE, -1);
         groups.put(MNEMONIC, KeyEvent.ALT_DOWN_MASK);
@@ -290 +301 @@
         groups.put(ALT, KeyEvent.ALT_DOWN_MASK);
         groups.put(SHIFT, KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(CTRL, KeyEvent.CTRL_DOWN_MASK);
+        groups.put(CTRL, commandDownMask);
         groups.put(ALT_SHIFT, KeyEvent.ALT_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(ALT_CTRL, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK);
-        groups.put(CTRL_SHIFT, KeyEvent.CTRL_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK);
-        groups.put(ALT_CTRL_SHIFT, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK);
+        groups.put(ALT_CTRL, KeyEvent.ALT_DOWN_MASK|commandDownMask);
+        groups.put(CTRL_SHIFT, commandDownMask|KeyEvent.SHIFT_DOWN_MASK);
+        groups.put(ALT_CTRL_SHIFT, KeyEvent.ALT_DOWN_MASK|commandDownMask|KeyEvent.SHIFT_DOWN_MASK);
 
         // (1) System reserved shortcuts