#111: Hotkeys

In the RunScriptDialog:
	Press Ctrl-Enter or Enter to run the script
        Preiss ESC to cancel

In the ScriptingConsole:
	Press F5 to run the current script

Author: Gubaer

src/main/java/org/openstreetmap/josm/plugins/scripting/ui/RunScriptDialog.java

@@ -16,6 +16,7 @@
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
@@ -67,17 +68,32 @@ private JPanel buildInfoPanel() {
     private JPanel buildControlButtonPanel() {
         final var pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
         final var actRun = new RunAction();
-        final var btn = new JButton(actRun);
-        pnl.add(btn);
-        btn.setFocusable(true);
-        btn.registerKeyboardAction(actRun, KeyStroke.getKeyStroke("ENTER"), JComponent.WHEN_FOCUSED);
+        final var btnRun = new JButton(actRun);
+        pnl.add(btnRun);
+        btnRun.setFocusable(true);
+        btnRun.registerKeyboardAction(actRun, KeyStroke.getKeyStroke("ENTER"), JComponent.WHEN_FOCUSED);
         getRootPane().registerKeyboardAction(actRun,
             KeyStroke.getKeyStroke("ctrl ENTER"),
-            JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
+            JComponent.WHEN_IN_FOCUSED_WINDOW
         );
-        pnl.add(new JButton(new CancelAction()));
-        final var helpAction = new ContextSensitiveHelpAction(HelpUtil.ht("/Plugin/Scripting#Run"));
-        pnl.add(new JButton(helpAction));
+        getRootPane().registerKeyboardAction(actRun,
+            KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
+            JComponent.WHEN_IN_FOCUSED_WINDOW
+        );
+        final var actCancel = new CancelAction();
+        final var btnCancel = new JButton(actCancel);
+        pnl.add(btnCancel);
+        btnCancel.registerKeyboardAction(actCancel,
+            KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), JComponent.WHEN_FOCUSED);
+        getRootPane().registerKeyboardAction(actCancel,
+            KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0 /* no modifiers */),
+            JComponent.WHEN_IN_FOCUSED_WINDOW
+        );
+        final var actHelp = new ContextSensitiveHelpAction(HelpUtil.ht("/Plugin/Scripting#Run"));
+        final var btnHelp = new JButton(actHelp);
+        pnl.add(btnHelp);
+        btnHelp.registerKeyboardAction(actHelp,
+            KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), JComponent.WHEN_FOCUSED);
         return pnl;
     }
 

src/main/java/org/openstreetmap/josm/plugins/scripting/ui/console/ScriptingConsole.java

@@ -134,13 +134,11 @@ protected JPanel buildControlPanel() {
     protected void build() {
         final Container c = getContentPane();
         c.setLayout(new BorderLayout());
-        c.add(pnlScriptingConsole = new ScriptingConsolePanel(),
+        c.add(pnlScriptingConsole = new ScriptingConsolePanel(getRootPane()),
                 BorderLayout.CENTER);
         c.add(buildControlPanel(), BorderLayout.SOUTH);
-
         setJMenuBar(buildMenuBar());
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-
         setIconImage(ImageProvider.get("script-engine").getImage());
     }
 

src/main/java/org/openstreetmap/josm/plugins/scripting/ui/console/ScriptingConsolePanel.java

@@ -14,6 +14,7 @@
 import javax.validation.constraints.Null;
 import java.awt.*;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
@@ -35,13 +36,14 @@ public class ScriptingConsolePanel extends JPanel {
     private ScriptLogPanel log;
     private ScriptEditor editor;
     private ScriptErrorViewer errorViewer;
+    private RunScriptAction actRun;
 
     protected JPanel buildControlPanel() {
-        final JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
-        pnl.setBorder(null);
+        final var pnl = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
         pnl.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-        JButton btn = new JButton(new RunScriptAction(editor.getModel(), errorViewer.getModel()));
-        pnl.add(btn);
+        actRun = new RunScriptAction(editor.getModel(), errorViewer.getModel());
+        final var btnRun = new JButton(actRun);
+        pnl.add(btnRun);
         return pnl;
     }
 
@@ -77,7 +79,7 @@ protected JSplitPane buildSplitPane() {
         return sp;
     }
 
-    protected void build() {
+    protected void build(@NotNull JRootPane root) {
         // make sure errorViewer is built at the beginning
         errorViewer = new ScriptErrorViewer();
 
@@ -92,6 +94,10 @@ protected void build() {
             updateScriptContentType(desc);
         });
         updateScriptContentType(editor.getModel().getScriptEngineDescriptor());
+        root.registerKeyboardAction(actRun,
+            KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0),
+            JComponent.WHEN_IN_FOCUSED_WINDOW
+        );
     }
 
     protected void warnMissingSyntaxStyle(@Null ScriptEngineDescriptor desc) {
@@ -151,8 +157,13 @@ protected void updateScriptContentType(ScriptEngineDescriptor desc) {
         }
     }
 
-    public ScriptingConsolePanel() {
-        build();
+    /**
+     * Creates the scripting console pane
+     *
+     * @param root the root pane of the window where this panel is going to be added
+     */
+    public ScriptingConsolePanel(@NotNull JRootPane root) {
+        build(root);
     }
 
     /**
@@ -195,7 +206,7 @@ public RunScriptAction(@NotNull final ScriptEditorModel model, @NotNull final Sc
             this.model = model;
             this.errorModel = errorModel;
             putValue(SMALL_ICON, ImageProvider.get("media-playback-start", ImageProvider.ImageSizes.SMALLICON));
-            putValue(SHORT_DESCRIPTION, tr("Execute the script"));
+            putValue(SHORT_DESCRIPTION, tr("Execute the script (F5)"));
             putValue(NAME, tr("Run"));
             model.addPropertyChangeListener(this);
             updateEnabledState();