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

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/preferences/PreferenceDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -12 +12 @@
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -20 +19 @@
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
-import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.actions.ExpertToggleAction;
@@ -32 +29 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -79 +77 @@
         addWindowListener(new WindowEventHandler());
 
-        getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "cancel");
-        getRootPane().getActionMap().put("cancel", new CancelAction());
+        InputMapUtils.addEscapeAction(getRootPane(), new CancelAction());
         HelpUtil.setHelpContext(getRootPane(), HelpUtil.ht("/Action/Preferences"));
     }