Changeset 452 in josm for trunk/src/org

Timestamp:

2007-11-04T14:14:48+01:00 (17 years ago)

Author:

framm

Message:

• fix moving of selected groups of objects (JOSM always cleared selection and selected clicked object which was wrong)

File:

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

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

@@ -73 +73 @@
                 selectionManager = new SelectionManager(this, false, mapFrame.mapView);         
                 try { initialMoveDelay = Integer.parseInt(Main.pref.get("edit.initial-move-delay","100")); } catch (NumberFormatException x) {};
-
-
         }
 
@@ -197 +195 @@
                 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());
-                Collection<OsmPrimitive> osmColl;
                 if (osm == null) {
                         osmColl = Collections.emptySet();
+                        Main.ds.setSelected();
                 } else {
                         osmColl = Collections.singleton(osm);
-                }
-
+                        if (!Main.ds.getSelected().contains(osm)) Main.ds.setSelected();
+                }
+                
                 if (ctrl && shift) {
-                        selectPrims(osmColl, true, false);
+                        if (Main.ds.getSelected().isEmpty()) selectPrims(osmColl, true, false);
                         mode = Mode.rotate;
                         setCursor(ImageProvider.getCursor("rotate", null));
-                } else if (osm != null) {
-                        selectPrims(osmColl, shift, ctrl);
+                } else if (!osmColl.isEmpty()) {
+                        if (Main.ds.getSelected().isEmpty()) selectPrims(osmColl, shift, ctrl);
                         mode = Mode.move;
                 } else {