Changeset 151 in josm for src/org/openstreetmap

Timestamp:

2006-10-07T00:14:05+02:00 (18 years ago)

Author:

imi

Message:

• changed move action to move the object under cursor, not the selected one
• fixed plugins under linux/mac

Location:

src/org/openstreetmap/josm

Files:

• actions/mapmode/MoveAction.java (modified) (9 diffs)
• actions/mapmode/SelectionAction.java (modified) (2 diffs)
• plugins/PluginLoader.java (modified) (1 diff)

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

@@ -5 +5 @@
 import java.awt.Cursor;
 import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
@@ -19 +20 @@
 import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.SelectionManager;
+import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded;
 import org.openstreetmap.josm.tools.ImageProvider;
 /**
  * Move is an action that can move all kind of OsmPrimitives (except Keys for now).
- * 
- * If any object is selected, all selected objects are moved. If no object is 
- * selected, the nearest object will be selected and moved. In this case, the
- * object will be unselected as soon as movement stopped.
+ *
+ * If an selected object is under the mouse when dragging, move all selected objects.
+ * If an unselected object is under the mouse when dragging, it becomes selected
+ * and will be moved.
+ * If no object is under the mouse, move all selected objects (if any)
  * 
  * @author imi
  */
-public class MoveAction extends MapMode {
+public class MoveAction extends MapMode implements SelectionEnded {
         /**
          * The old cursor before the user pressed the mouse button.
@@ -38 +42 @@
          */
         private Point mousePos;
-        /**
-         * Non-<code>null</code>, if no object was selected before movement 
-         * (and so the object get unselected after mouse release).
-         */
-        private OsmPrimitive singleOsmPrimitive;
+        private SelectionManager selectionManager;
+        private boolean selectionMode = false;
 
         /**
@@ -50 +51 @@
         public MoveAction(MapFrame mapFrame) {
                 super(tr("Move"), 
-                                "move", 
-                                tr("Move selected objects around."), 
-                                KeyEvent.VK_M, 
-                                mapFrame, 
+                                "move",
+                                tr("Move around objects that are under the mouse or selected."), 
+                                KeyEvent.VK_M,
+                                mapFrame,
                                 ImageProvider.getCursor("normal", "move"));
+                selectionManager = new SelectionManager(this, false, mapFrame.mapView);
         }
 
@@ -69 +71 @@
         }
 
-        
+
         /**
          * If the left mouse button is pressed, move all currently selected
-         * objects.
+         * objects (if one of them is under the mouse) or the current one under the
+         * mouse (which will become selected).
          */
         @Override public void mouseDragged(MouseEvent e) {
                 if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0)
                         return;
+
+                if (selectionMode)
+                        return;
                 
-                if (mousePos == null) {
+                if (mousePos == null)
                         mousePos = e.getPoint();
-                        singleOsmPrimitive = null;
-                }
 
-                EastNorth mouseGeo = Main.map.mapView.getEastNorth(e.getX(), e.getY());
-                EastNorth mouseStartGeo = Main.map.mapView.getEastNorth(mousePos.x, mousePos.y);
-                double dx = mouseGeo.east() - mouseStartGeo.east();
-                double dy = mouseGeo.north() - mouseStartGeo.north();
+                EastNorth mouseEN = Main.map.mapView.getEastNorth(e.getX(), e.getY());
+                EastNorth mouseStartEN = Main.map.mapView.getEastNorth(mousePos.x, mousePos.y);
+                double dx = mouseEN.east() - mouseStartEN.east();
+                double dy = mouseEN.north() - mouseStartEN.north();
                 if (dx == 0 && dy == 0)
                         return;
@@ -92 +96 @@
                 Collection<OsmPrimitive> selection = Main.ds.getSelected();
                 Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
-                
+
                 // check if any coordinate would be outside the world
                 for (OsmPrimitive osm : affectedNodes) {
@@ -100 +104 @@
                         }
                 }
-                
+
                 Command c = !Main.main.editLayer().commands.isEmpty() ? Main.main.editLayer().commands.getLast() : null;
                 if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects))
@@ -106 +110 @@
                 else
                         Main.main.editLayer().add(new MoveCommand(selection, dx, dy));
-                
+
                 Main.map.mapView.repaint();
                 mousePos = e.getPoint();
@@ -124 +128 @@
                         return;
 
-                if (Main.ds.getSelected().size() == 0) {
-                        OsmPrimitive osm = Main.map.mapView.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0);
-                        if (osm != null)
-                                Main.ds.setSelected(osm);
-                        singleOsmPrimitive = osm;
-                        Main.map.mapView.repaint();
-                } else
-                        singleOsmPrimitive = null;
-                
+                Collection<OsmPrimitive> sel = Main.ds.getSelected();
+                OsmPrimitive osm = Main.map.mapView.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0);
+                if (osm != null) {
+                if (!sel.contains(osm))
+                        Main.ds.setSelected(osm);
+                oldCursor = Main.map.mapView.getCursor();
+                Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+        } else {
+                selectionMode = true;
+                        selectionManager.register(Main.map.mapView);
+        }
+
+                Main.map.mapView.repaint();
+
                 mousePos = e.getPoint();
-                oldCursor = Main.map.mapView.getCursor();
-                Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
         }
-        
+
         /**
          * Restore the old mouse cursor.
          */
         @Override public void mouseReleased(MouseEvent e) {
-                Main.map.mapView.setCursor(oldCursor);
-                if (singleOsmPrimitive != null) {
-                        Main.ds.clearSelection();
-                        Main.map.mapView.repaint();
-                }
+                if (selectionMode) {
+                        selectionManager.unregister(Main.map.mapView);
+                        selectionMode = false;
+                } else
+                        Main.map.mapView.setCursor(oldCursor);
         }
+
+        
+        public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) {
+                SelectionAction.selectEverythingInRectangle(selectionManager, r, alt, shift, ctrl);
+    }
 }

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

@@ -138 +138 @@
          */
         public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) {
-                if (shift && ctrl)
+                selectEverythingInRectangle(selectionManager, r, alt, shift, ctrl);
+        }
+
+        public static void selectEverythingInRectangle(SelectionManager selectionManager, Rectangle r, boolean alt, boolean shift, boolean ctrl) {
+            if (shift && ctrl)
                         return; // not allowed together
 
@@ -155 +159 @@
                 Main.ds.setSelected(curSel);
                 Main.map.mapView.repaint();
-        }
+    }
 
         @Override public void mouseDragged(MouseEvent e) {

src/org/openstreetmap/josm/plugins/PluginLoader.java

@@ -43 +43 @@
                 try {
                         ClassLoader loader = URLClassLoader.newInstance(
-                                        new URL[]{new URL("file:/"+pluginFile.getAbsolutePath())},
+                                        new URL[]{new URL("file://"+pluginFile.getAbsolutePath())},
                                         getClass().getClassLoader());
                         Object plugin = Class.forName(pluginClass, true, loader).newInstance();