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

Timestamp:

2016-08-12T21:08:00+02:00 (8 years ago)

Author:

simon04

Message:

see #13319 - Use InputMapUtils where applicable (VK_ESCAPE)

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• InputMapUtils.java (modified) (1 diff)
• bugreport/BugReportDialog.java (modified) (4 diffs)

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

@@ -105 +105 @@
          c.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0), "spacebar");
     }
+
+    /**
+     * Add an action activated with ESCAPE key on a component or its children.
+     * @param c The Swing component
+     * @param a action activated with ESCAPE key
+     * @see JComponent#WHEN_ANCESTOR_OF_FOCUSED_COMPONENT
+     * @since 10791
+     */
+    public static void addEscapeAction(JComponent c, Action a) {
+         c.getActionMap().put("escape", a);
+         c.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "escape");
+    }
 }

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java

@@ -9 +9 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 
 import javax.swing.AbstractAction;
@@ -16 +15 @@
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
-import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.KeyStroke;
 import javax.swing.UIManager;
 
@@ -29 +26 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.InputMapUtils;
 
 /**
@@ -72 +70 @@
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 
-        getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "escape");
-        getRootPane().getActionMap().put("escape", new AbstractAction() {
+        InputMapUtils.addEscapeAction(getRootPane(), new AbstractAction() {
             @Override
             public void actionPerformed(ActionEvent e) {