Changeset 3252 in josm for trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java

Timestamp:

15.05.2010 18:59:10 (2 years ago)

Author:

jttt

Message:

Fix #2234: Translation can cause JosmActions to illegally handle shortcuts

File:

• trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-
-import javax.swing.JComponent;
 
 import org.openstreetmap.josm.Main;
@@ -22 +20 @@
 
         // Add extra shortcut C-S-a
-        Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-                Shortcut.registerShortcut("edit:unselectallfocus", tr("Edit: {0}", tr("Unselect All (Focus)")),
-                        KeyEvent.VK_A, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT).getKeyStroke(),
-                        tr("Unselect All"));
+        Main.registerActionShortcut(this, Shortcut.registerShortcut("edit:unselectallfocus", tr("Edit: {0}", tr("Unselect All (Focus)")),
+                KeyEvent.VK_A, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT));
+
+
 
         // Add extra shortcut ESCAPE
@@ -33 +31 @@
          * for now this is a reasonable approximation.
          */
-        Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-                Shortcut.registerShortcut("edit:unselectallescape", tr("Edit: {0}", tr("Unselect All (Escape)")),
-                        KeyEvent.VK_ESCAPE, Shortcut.GROUP_DIRECT).getKeyStroke(),
-                        tr("Unselect All"));
+        Main.registerActionShortcut(this, Shortcut.registerShortcut("edit:unselectallescape", tr("Edit: {0}", tr("Unselect All (Escape)")),
+                KeyEvent.VK_ESCAPE, Shortcut.GROUP_DIRECT));
 
         putValue("help", ht("/Action/UnselectAll"));