Changeset 1454 in josm for trunk

Timestamp:

2009-02-28T21:54:34+01:00 (16 years ago)

Author:

stoecker

Message:

fix #2242. CTRL now toggles selection instead of only deselecting

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (7 diffs)

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

@@ -197 +197 @@
 
             Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds));
-            selectPrims(Collections.singleton((OsmPrimitive)virtualNode), false, false);
+            selectPrims(Collections.singleton((OsmPrimitive)virtualNode), false, false, false);
             virtualWays.clear();
             virtualNode = null;
@@ -333 +333 @@
 
         if (ctrl && shift) {
-            if (Main.ds.getSelected().isEmpty()) selectPrims(osmColl, true, false);
+            if (Main.ds.getSelected().isEmpty()) selectPrims(osmColl, true, false, false);
             mode = Mode.rotate;
             setCursor(ImageProvider.getCursor("rotate", null));
@@ -343 +343 @@
             selectPrims(osmColl,
                 shift || Main.ds.getSelected().containsAll(osmColl),
-                ctrl);
+                ctrl, false);
             mode = Mode.move;
         } else {
@@ -391 +391 @@
                 selectPrims(
                     Main.map.mapView.getNearestCollection(e.getPoint()),
-                    shift, ctrl);
+                    shift, ctrl, true);
 
                 // If the user double-clicked a node, change to draw mode
@@ -433 +433 @@
 
     public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) {
-        selectPrims(selectionManager.getObjectsInRectangle(r, alt), shift, ctrl);
-    }
-
-    public void selectPrims(Collection<OsmPrimitive> selectionList, boolean shift, boolean ctrl) {
-        if (shift && ctrl)
+        selectPrims(selectionManager.getObjectsInRectangle(r, alt), shift, ctrl, false);
+    }
+
+    public void selectPrims(Collection<OsmPrimitive> selectionList, boolean shift, boolean ctrl, boolean released) {
+        if ((shift && ctrl) || (ctrl && !released))
             return; // not allowed together
 
@@ -447 +447 @@
 
         for (OsmPrimitive osm : selectionList)
+        {
             if (ctrl)
-                curSel.remove(osm);
+            {
+                if(curSel.contains(osm))
+                    curSel.remove(osm);
+                else
+                    curSel.add(osm);
+            }
             else
                 curSel.add(osm);
+        }
         Main.ds.setSelected(curSel);
         Main.map.mapView.repaint();
@@ -463 +470 @@
             return tr("Release the mouse button to stop rotating.");
         } else {
-            return tr("Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-Ctrl to rotate selected; or change selection");
+            return tr("Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-Ctrl to rotate selected; or change selection");
         }
     }