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

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