Changeset 237 in josm for src/org/openstreetmap/josm/gui/MapMover.java

Timestamp:

2007-05-17T03:20:42+02:00 (19 years ago)

Author:

framm

Message:

Major download dialog reorg (now uses tabs, modified World Chooser with keyboard control, plugin interface allows adding of tabs)
New Userlist dialog shows people having edited selected items

File:

• src/org/openstreetmap/josm/gui/MapMover.java (modified) (4 diffs)

src/org/openstreetmap/josm/gui/MapMover.java

@@ -13 +13 @@
 import javax.swing.AbstractAction;
 import javax.swing.JComponent;
+import javax.swing.JPanel;
 import javax.swing.KeyStroke;
 
@@ -24 +25 @@
  * @author imi
  */
-class MapMover extends MouseAdapter implements MouseMotionListener, MouseWheelListener {
+public class MapMover extends MouseAdapter implements MouseMotionListener, MouseWheelListener {
 
         private final class ZoomerAction extends AbstractAction {
@@ -72 +73 @@
          * Create a new MapMover
          */
-        MapMover(NavigatableComponent navComp, boolean registerKeys) {
+        public MapMover(NavigatableComponent navComp, JPanel contentPane) {
                 this.nc = navComp;
                 nc.addMouseListener(this);
@@ -81 +82 @@
                 int[] k = {KeyEvent.VK_COMMA, KeyEvent.VK_PERIOD, KeyEvent.VK_UP, KeyEvent.VK_RIGHT, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT};
 
-                if (registerKeys) {
+                if (contentPane != null) {
                         for (int i = 0; i < n.length; ++i) {
-                                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(k[i], KeyEvent.CTRL_DOWN_MASK), "MapMover.Zoomer."+n[i]);
-                                Main.contentPane.getActionMap().put("MapMover.Zoomer."+n[i], new ZoomerAction(n[i]));
+                                contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(k[i], KeyEvent.CTRL_DOWN_MASK), "MapMover.Zoomer."+n[i]);
+                                contentPane.getActionMap().put("MapMover.Zoomer."+n[i], new ZoomerAction(n[i]));
                         }
                 }