Changeset 4619 in josm for trunk/src

Timestamp:

2011-11-29T01:34:22+01:00 (13 years ago)

Author:

Don-vip

Message:

fix #7071 - One dialog where Esc doesn't cancel

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (modified) (3 diffs)

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

@@ -20 +20 @@
 import javax.swing.Action;
 import javax.swing.BorderFactory;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -27 +28 @@
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
+import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
@@ -262 +264 @@
             putValue(Action.NAME, tr("Cancel"));
             putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
+            getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) 
+            .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE"); 
+            getRootPane().getActionMap().put("ESCAPE", this);
             setEnabled(true);
         }