Changeset 15 in josm for src/org/openstreetmap/josm/actions/mapmode/MoveAction.java

Timestamp:

2005-10-07T01:13:49+02:00 (19 years ago)

Author:

imi

Message:

renamed alot (Layer instead of MapView) and removed feature of having
projections on every Layer.

File:

• src/org/openstreetmap/josm/actions/mapmode/MoveAction.java (modified) (5 diffs)

src/org/openstreetmap/josm/actions/mapmode/MoveAction.java

@@ -48 +48 @@
         public void registerListener() {
                 super.registerListener();
-                mv.addMouseListener(this);
-                mv.addMouseMotionListener(this);
+                layer.addMouseListener(this);
+                layer.addMouseMotionListener(this);
         }
 
@@ -55 +55 @@
         public void unregisterListener() {
                 super.unregisterListener();
-                mv.removeMouseListener(this);
-                mv.removeMouseMotionListener(this);
+                layer.removeMouseListener(this);
+                layer.removeMouseMotionListener(this);
         }
 
@@ -86 +86 @@
 
                 for (Node n : movingNodes) {
-                        Point pos = mv.getScreenPoint(n.coor);
+                        Point pos = layer.getScreenPoint(n.coor);
                         pos.x += dx;
                         pos.y += dy;
-                        n.coor = mv.getPoint(pos.x, pos.y, true);
+                        n.coor = layer.getPoint(pos.x, pos.y, true);
                 }
-                mv.repaint();
+                layer.repaint();
                 
                 mousePos = e.getPoint();
@@ -111 +111 @@
 
                 if (ds.getSelected().size() == 0) {
-                        OsmPrimitive osm = mv.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0);
+                        OsmPrimitive osm = layer.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0);
                         if (osm != null)
                                 osm.setSelected(true, ds);
                         singleOsmPrimitive = osm;
-                        mv.repaint();
+                        layer.repaint();
                 } else
                         singleOsmPrimitive = null;
                 
                 mousePos = e.getPoint();
-                oldCursor = mv.getCursor();
-                mv.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+                oldCursor = layer.getCursor();
+                layer.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
         }
         
@@ -129 +129 @@
         @Override
         public void mouseReleased(MouseEvent e) {
-                mv.setCursor(oldCursor);
+                layer.setCursor(oldCursor);
                 if (singleOsmPrimitive != null) {
                         singleOsmPrimitive.setSelected(false, ds);
-                        mv.repaint();
+                        layer.repaint();
                 }
         }