GH-454 shortcut for run action added

Author: thurka

visualvm/heapviewer.console/src/org/graalvm/visualvm/heapviewer/console/r/RConsoleView.java

@@ -73,6 +73,7 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JToggleButton;
 import javax.swing.JToolBar;
+import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicSplitPaneDivider;
@@ -111,7 +112,7 @@
 //    "OQLConsoleView_ViewName=Results",
     "RConsoleView_RQuery=R Query:",
     "RConsoleView_RunAction=Run",
-    "RConsoleView_RunActionTooltip=Execute R script",
+    "RConsoleView_RunActionTooltip=Execute R script - Crtl+R",
     "RConsoleView_CancelAction=Cancel",
     "RConsoleView_CancelActionTooltip=Cancel R script execution",
     "RConsoleView_LoadAction=Load Script",
@@ -492,14 +493,7 @@ private void init() {
             toolbar.add(new GrayLabel(Bundle.RConsoleView_RQuery()));
             toolbar.addSpace(2);
 
-            runAction = new AbstractAction(Bundle.RConsoleView_RunAction(), Icons.getIcon(GeneralIcons.START)) {
-                {
-                    putValue(Action.SHORT_DESCRIPTION, Bundle.RConsoleView_RunActionTooltip());
-                }
-                public void actionPerformed(ActionEvent e) {
-                    executeQuery();
-                }
-            };
+            runAction = new RunAction();
 
             JButton runButton = new JButton(runAction) {
                 public Dimension getPreferredSize() {
@@ -770,6 +764,10 @@ protected void validityChanged(boolean valid) {
             component = new JPanel(new BorderLayout());
             component.add(masterSplit, BorderLayout.CENTER);
 
+            JComponent toolbarComp = toolbar.getComponent();
+            setShortcut(runAction, toolbarComp);
+            setShortcut(runAction, component);
+            toolbarComp.repaint();
             updateUIState();
 //        } else {
 //            component = new JPanel(new BorderLayout());
@@ -783,6 +781,13 @@ protected void validityChanged(boolean valid) {
 //        }
     }
 
+    private void setShortcut(Action a, JComponent jc) {
+        Object actionName = a.getValue(Action.ACTION_COMMAND_KEY);
+        KeyStroke shortcut = (KeyStroke) a.getValue(Action.ACCELERATOR_KEY);
+        jc.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(shortcut, actionName);
+        jc.getActionMap().put(actionName, a);
+    }
+
 
     private static HeapViewerNode getNode(URL url, HeapContext context) {
         String urls = url.toString();
@@ -843,6 +848,22 @@ public void run() {
         }
     }
 
+    private final class RunAction extends AbstractAction {
+        private static final String ACTION_NAME  = "runScript_Action";     // NOI18N
+        private final KeyStroke shortcut = KeyStroke.getKeyStroke("ctrl R");  // NOI18N
+
+        private RunAction() {
+            super(Bundle.RConsoleView_RunAction(), Icons.getIcon(GeneralIcons.START));
+            putValue(Action.SHORT_DESCRIPTION, Bundle.RConsoleView_RunActionTooltip());
+            putValue(Action.ACTION_COMMAND_KEY, ACTION_NAME);
+            putValue(Action.ACCELERATOR_KEY, shortcut);
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            executeQuery();
+        }
+    }
+
 
     private class EditorView extends JPanel {
 

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/oql/OQLConsoleView.java

@@ -62,6 +62,7 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JToggleButton;
 import javax.swing.JToolBar;
+import javax.swing.KeyStroke;
 import javax.swing.ListCellRenderer;
 import javax.swing.SortOrder;
 import javax.swing.SwingUtilities;
@@ -120,7 +121,7 @@
     "OQLConsoleView_ViewName=Results",
     "OQLConsoleView_OQLQuery=OQL Query:",
     "OQLConsoleView_RunAction=Run",
-    "OQLConsoleView_RunActionTooltip=Execute OQL script",
+    "OQLConsoleView_RunActionTooltip=Execute OQL script - Ctrl+R",
     "OQLConsoleView_CancelAction=Cancel",
     "OQLConsoleView_CancelActionTooltip=Cancel OQL script execution",
     "OQLConsoleView_LoadAction=Load Script",
@@ -351,14 +352,7 @@ public void run() {
 //                            toolbar.add(new GrayLabel(Bundle.OQLConsoleView_OQLQuery()));
 //                            toolbar.addSpace(2);
 
-                            runAction = new AbstractAction(Bundle.OQLConsoleView_RunAction(), Icons.getIcon(GeneralIcons.START)) {
-                                {
-                                    putValue(Action.SHORT_DESCRIPTION, Bundle.OQLConsoleView_RunActionTooltip());
-                                }
-                                public void actionPerformed(ActionEvent e) {
-                                    executeQuery();
-                                }
-                            };
+                            runAction = new RunAction();
 
                             JButton runButton = new JButton(runAction) {
                                 public Dimension getPreferredSize() {
@@ -648,7 +642,10 @@ protected void validityChanged(boolean valid) {
                                 parent.repaint();
                             }
 
-                            toolbar.getComponent().repaint();
+                            JComponent toolbarComp = toolbar.getComponent();
+                            setShortcut(runAction, toolbarComp);
+                            setShortcut(runAction, component);
+                            toolbarComp.repaint();
 
                             updateUIState();
                         }
@@ -660,6 +657,13 @@ protected void validityChanged(boolean valid) {
         });
     }
 
+    private void setShortcut(Action a, JComponent jc) {
+        Object actionName = a.getValue(Action.ACTION_COMMAND_KEY);
+        KeyStroke shortcut = (KeyStroke) a.getValue(Action.ACCELERATOR_KEY);
+        jc.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(shortcut, actionName);
+        jc.getActionMap().put(actionName, a);
+    }
+
     private void notifyFailedOQL(final boolean available) {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
@@ -833,7 +837,22 @@ private static HeapViewerNode getNode(URL url, HeapContext context) {
         return null;
     }
 
-    
+    private final class RunAction extends AbstractAction {
+        private static final String ACTION_NAME  = "runScript_Action";     // NOI18N
+        private final KeyStroke shortcut = KeyStroke.getKeyStroke("ctrl R");  // NOI18N
+
+        private RunAction() {
+            super(Bundle.OQLConsoleView_RunAction(), Icons.getIcon(GeneralIcons.START));
+            putValue(Action.SHORT_DESCRIPTION, Bundle.OQLConsoleView_RunActionTooltip());
+            putValue(Action.ACTION_COMMAND_KEY, ACTION_NAME);
+            putValue(Action.ACCELERATOR_KEY, shortcut);
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            executeQuery();
+        }
+    }
+
     private class EditorView extends JPanel {
 
         EditorView(OQLEditorComponent editor) {