Changeset 3252 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2010-05-15T18:59:10+02:00 (14 years ago)

Author:

jttt

Message:

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

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• JosmAction.java (modified) (3 diffs)
• UnselectAllAction.java (modified) (3 diffs)
• ZoomInAction.java (modified) (2 diffs)
• ZoomOutAction.java (modified) (2 diffs)
• mapmode/DrawAction.java (modified) (2 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);

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"));

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

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 
-import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 
@@ -25 +24 @@
         );
         putValue("help", ht("/Action/ZoomIn"));
-        // make numpad + behave like + (action is already registred)
-        Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD,0), tr("Zoom In"));
+        // make numpad + behave like +
+        Main.registerActionShortcut(this, KeyStroke.getKeyStroke(KeyEvent.VK_ADD, 0));
     }
 
     public void actionPerformed(ActionEvent e) {
-        Object name = Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).get(KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, 0));
-        Main.contentPane.getActionMap().put(name, this);
-
         if (!Main.isDisplayingMapView()) return;
         Main.map.mapView.zoomToFactor(0.9);

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

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 
-import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 
@@ -21 +20 @@
         putValue("help", ht("/Action/ZoomOut"));
         // make numpad - behave like -
-        Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT,0), tr("Zoom Out"));
+        Main.registerActionShortcut(this, KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT,0));
     }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -30 +30 @@
 import java.util.Set;
 
-import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 
@@ -95 +94 @@
 
         // Add extra shortcut N
-        Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-                Shortcut.registerShortcut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, Shortcut.GROUP_EDIT).getKeyStroke(), tr("Draw"));
+        Main.registerActionShortcut(this, Shortcut.registerShortcut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, Shortcut.GROUP_EDIT));
 
         cursorCrosshair = getCursor();