Changeset 10791 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

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

Author:

simon04

Message:

see #13319 - Use InputMapUtils where applicable (VK_ESCAPE)

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

@@ -9 +9 @@
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -15 +14 @@
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
-import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -30 +27 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.InputMapUtils;
 
 /**
@@ -107 +105 @@
         btn = new JButton(closeAction);
         final String closeHistoryBrowserDialogKey = "CloseHistoryBrowserDialog";
-        KeyStroke escapeKey = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, false);
-        getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(escapeKey, closeHistoryBrowserDialogKey);
-        getRootPane().getActionMap().put(closeHistoryBrowserDialogKey, closeAction);
         btn.setName("btn.close");
         pnl.add(btn);
+        InputMapUtils.addEscapeAction(getRootPane(), closeAction);
 
         btn = new JButton(new ContextSensitiveHelpAction(ht("/Action/ObjectHistory")));