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

Timestamp:

2017-09-06T01:08:48+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - deprecate GuiHelper.getMenuShortcutKeyMaskEx() - replaced by PlatformHook.getMenuShortcutKeyMaskEx()

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• PlatformHook.java (modified) (2 diffs)
• PlatformHookOsx.java (modified) (1 diff)
• Shortcut.java (modified) (2 diffs)

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

@@ -3 +3 @@
 
 import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
+import java.awt.event.KeyEvent;
 import java.io.BufferedReader;
 import java.io.File;
@@ -242 +244 @@
 
     /**
+     * Returns extended modifier key used as the appropriate accelerator key for menu shortcuts.
+     * It is advised everywhere to use {@link Toolkit#getMenuShortcutKeyMask()} to get the cross-platform modifier, but:
+     * <ul>
+     * <li>it returns KeyEvent.CTRL_MASK instead of KeyEvent.CTRL_DOWN_MASK. We used the extended
+     *    modifier for years, and Oracle recommends to use it instead, so it's best to keep it</li>
+     * <li>the method throws a HeadlessException ! So we would need to handle it for unit tests anyway</li>
+     * </ul>
+     * @return extended modifier key used as the appropriate accelerator key for menu shortcuts
+     * @since 12748 (as a replacement to {@code GuiHelper.getMenuShortcutKeyMaskEx()})
+     */
+    default int getMenuShortcutKeyMaskEx() {
+        return KeyEvent.CTRL_DOWN_MASK;
+    }
+
+    /**
      * Called when an outdated version of Java is detected at startup.
      * @since 12270

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

@@ -76 +76 @@
         }
         checkExpiredJava(callback);
+    }
+
+    @Override
+    public int getMenuShortcutKeyMaskEx() {
+        return KeyEvent.META_DOWN_MASK;
     }
 

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

@@ -23 +23 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.util.GuiHelper;
 
 /**
@@ -370 +369 @@
         if (initdone) return;
         initdone = true;
-        int commandDownMask = GuiHelper.getMenuShortcutKeyMaskEx();
+        int commandDownMask = Main.platform.getMenuShortcutKeyMaskEx();
         groups.put(NONE, -1);
         groups.put(MNEMONIC, KeyEvent.ALT_DOWN_MASK);