Changeset 4297 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-08-08T00:18:01+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6668 - patch by simon04 - Close HistoryBrowserDialog with Escape

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (modified) (2 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;
 
 import javax.swing.AbstractAction;
+import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -73 +76 @@
 
         btn = new SideButton(closeAction = new 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);