Changeset 10791 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

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/io/UploadDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -12 +12 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -31 +30 @@
 import javax.swing.Icon;
 import javax.swing.JButton;
-import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -189 +186 @@
         CancelAction cancelAction = new CancelAction(this);
         pnl.add(new JButton(cancelAction));
-        getRootPane().registerKeyboardAction(
-                cancelAction,
-                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
-                JComponent.WHEN_IN_FOCUSED_WINDOW
-        );
+        InputMapUtils.addEscapeAction(getRootPane(), cancelAction);
         pnl.add(new JButton(new ContextSensitiveHelpAction(ht("/Dialog/Upload"))));
         HelpUtil.setHelpContext(getRootPane(), ht("/Dialog/Upload"));