Changeset 10791 in josm for trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

Timestamp:

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

Author:

simon04

Message:

see #13319 - Use InputMapUtils where applicable (VK_ESCAPE)

File:

• trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -17 +17 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -27 +26 @@
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
-import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.KeyStroke;
 import javax.swing.UIManager;
 import javax.swing.event.HyperlinkEvent;
@@ -51 +48 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.UserCancelException;
@@ -232 +230 @@
 
         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());
 
         refreshAuthorisationProcedurePanel();