MacOS shortcuts - use Toolkit.getMenuShortcutKeyMask() instead of CTRL_MASK

Author: thurka

visualvm/appui/src/org/graalvm/visualvm/modules/appui/actions/VisualVMActionsSupportProvider.java

@@ -24,6 +24,7 @@
  */
 package org.graalvm.visualvm.modules.appui.actions;
 
+import java.awt.Toolkit;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import javax.swing.Action;
@@ -47,9 +48,9 @@ public KeyStroke registerAction(String actionKey, Action action, ActionMap actio
         KeyStroke ks = null;
 
         if (FilterUtils.FILTER_ACTION_KEY.equals(actionKey)) {
-            ks = KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_MASK);
+            ks = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
         } else if (SearchUtils.FIND_ACTION_KEY.equals(actionKey)) {
-            ks = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK);
+            ks = KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
         } else if (SearchUtils.FIND_NEXT_ACTION_KEY.equals(actionKey)) {
             ks = KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0);
         } else if (SearchUtils.FIND_PREV_ACTION_KEY.equals(actionKey)) {

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/FilterUtils.java

@@ -44,6 +44,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
@@ -429,7 +430,7 @@ public static final class FilterActionProvider extends ActionsSupportProvider {
             public KeyStroke registerAction(String actionKey, Action action, ActionMap actionMap, InputMap inputMap) {
                 if (!FILTER_ACTION_KEY.equals(actionKey)) return null;
 
-                KeyStroke ks = KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_MASK);
+                KeyStroke ks = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
                 actionMap.put(actionKey, action);
                 inputMap.put(ks, actionKey);
 

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/SearchUtils.java

@@ -44,6 +44,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
@@ -478,7 +479,7 @@ public KeyStroke registerAction(String actionKey, Action action, ActionMap actio
                 KeyStroke ks = null;
 
                 if (FIND_ACTION_KEY.equals(actionKey)) {
-                    ks = KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_MASK);
+                    ks = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
                 } else if (FIND_NEXT_ACTION_KEY.equals(actionKey)) {
                     ks = KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0);
                 } else if (FIND_PREV_ACTION_KEY.equals(actionKey)) {