Changeset 454 in josm

Timestamp:

2007-11-04T21:22:34+01:00 (18 years ago)

Author:

gebner

Message:

SelectAction: Fix shift-select and ctrl-select.

Before r452 if you wanted to move all the selected objects you had to
shift-click on the selection and then drag. r452 tried to remedy this
situation by clearing the selection if you didn't click on an already selected
object. This made it impossible to add something to the selection by
shift-clicking it.

This change postpones replacing the selection until after the mouse released,
i.e. when we know whether the user wanted to select or move.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (5 diffs)
• gui/NavigatableComponent.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -45 +45 @@
         private Mode mode = null;
         private long mouseDownTime = 0;
+        private boolean didMove = false;
 
         /**
@@ -175 +176 @@
                 Main.map.mapView.repaint();
                 mousePos = e.getPoint();
+
+                didMove = true;
         }
 
@@ -194 +197 @@
                 
                 mouseDownTime = System.currentTimeMillis();
-
-                // find the object that was clicked on.
-                // if the object is not part of the current selection, clear current
-                // selection before proceeding.
-                Collection<OsmPrimitive> osmColl = null;
-                OsmPrimitive osm = Main.map.mapView.getNearest(e.getPoint());
-                if (osm == null) {
-                        osmColl = Collections.emptySet();
-                        Main.ds.setSelected();
-                } else {
-                        osmColl = Collections.singleton(osm);
-                        if (!Main.ds.getSelected().contains(osm)) Main.ds.setSelected();
-                }
-                
+                didMove = false;
+
+                Collection<OsmPrimitive> osmColl =
+                        Main.map.mapView.getNearestCollection(e.getPoint());
+
                 if (ctrl && shift) {
                         if (Main.ds.getSelected().isEmpty()) selectPrims(osmColl, true, false);
@@ -213 +207 @@
                         setCursor(ImageProvider.getCursor("rotate", null));
                 } else if (!osmColl.isEmpty()) {
-                        if (Main.ds.getSelected().isEmpty()) selectPrims(osmColl, shift, ctrl);
+                        // Only add to selection for now, we only do replace and remove in
+                        // mouseReleased if the user didn't try to move.
+                        selectPrims(osmColl, true, ctrl);
                         mode = Mode.move;
                 } else {
@@ -239 +235 @@
                 if (mode == Mode.move) {
                         boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
-                        if (ctrl) {
+                        boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
+                        if (!didMove) {
+                                selectPrims(
+                                        Main.map.mapView.getNearestCollection(e.getPoint()),
+                                        shift, ctrl);
+                        } else if (ctrl) {
                                 Collection<OsmPrimitive> selection = Main.ds.getSelected();
                                 Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);

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

@@ -4 +4 @@
 import java.awt.Point;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.TreeMap;
@@ -242 +243 @@
                         osm = getNearestWay(p);
                 return osm;
+        }
+
+        /**
+         * Returns a singleton of the nearest object, or else an empty collection.
+         */
+        public Collection<OsmPrimitive> getNearestCollection(Point p) {
+                OsmPrimitive osm = getNearest(p);
+                if (osm == null) {
+                        return Collections.emptySet();
+                } else {
+                        return Collections.singleton(osm);
+                }
         }