Changeset 3252 in josm for trunk/src/org/openstreetmap/josm/actions/JosmAction.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/JosmAction.java (modified) (3 diffs)

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

@@ -7 +7 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.JComponent;
 
 import org.openstreetmap.josm.Main;
@@ -72 +71 @@
         sc = shortcut;
         if (sc != null) {
-            Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), name);
-            Main.contentPane.getActionMap().put(name, this);
+            Main.registerActionShortcut(this, sc);
         }
         putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
@@ -90 +88 @@
     public void destroy() {
         if (sc != null) {
-            Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(sc.getKeyStroke());
-            Main.contentPane.getActionMap().remove(sc.getKeyStroke());
+            Main.unregisterActionShortcut(sc);
         }
         MapView.removeLayerChangeListener(layerChangeAdapter);