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

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -29 +29 @@
 
 import javax.swing.AbstractButton;
-import javax.swing.JComponent;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AutoScaleAction;
-import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
@@ -189 +188 @@
     private Rectangle lastClipBounds = new Rectangle();
 
-    public MapView() {
+    public MapView(final JPanel contentPane) {
         Main.pref.addPreferenceChangeListener(this);
         addComponentListener(new ComponentAdapter(){
@@ -213 +212 @@
                 }
 
-                new MapMover(MapView.this, Main.contentPane);
-                JosmAction mv;
-                mv = new MoveAction(MoveAction.Direction.UP);
-                if (mv.getShortcut() != null) {
-                    Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(mv.getShortcut().getKeyStroke(), "UP");
-                    Main.contentPane.getActionMap().put("UP", mv);
-                }
-                mv = new MoveAction(MoveAction.Direction.DOWN);
-                if (mv.getShortcut() != null) {
-                    Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(mv.getShortcut().getKeyStroke(), "DOWN");
-                    Main.contentPane.getActionMap().put("DOWN", mv);
-                }
-                mv = new MoveAction(MoveAction.Direction.LEFT);
-                if (mv.getShortcut() != null) {
-                    Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(mv.getShortcut().getKeyStroke(), "LEFT");
-                    Main.contentPane.getActionMap().put("LEFT", mv);
-                }
-                mv = new MoveAction(MoveAction.Direction.RIGHT);
-                if (mv.getShortcut() != null) {
-                    Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(mv.getShortcut().getKeyStroke(), "RIGHT");
-                    Main.contentPane.getActionMap().put("RIGHT", mv);
-                }
+                new MapMover(MapView.this, contentPane);
+                new MoveAction(MoveAction.Direction.UP);
+                new MoveAction(MoveAction.Direction.DOWN);
+                new MoveAction(MoveAction.Direction.LEFT);
+                new MoveAction(MoveAction.Direction.RIGHT);
             }
         });