Changeset 2348 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-10-29T19:45:49+01:00 (17 years ago)

Author:

Gubaer

Message:

applied #3780: patch by hansendc: Shift selection is broken

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ReverseWayAction.java (modified) (1 diff)
• UploadAction.java (modified) (1 diff)
• mapmode/DrawAction.java (modified) (7 diffs)
• mapmode/SelectAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

@@ -81 +81 @@
         Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
         if (propertiesUpdated) {
-            DataSet.fireSelectionChanged(getCurrentDataSet().getSelected());
+            getCurrentDataSet().fireSelectionChanged();
         }
         Main.map.repaint();

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -688 +688 @@
             //
             layer.cleanupAfterUpload(processedPrimitives);
-            DataSet.fireSelectionChanged(layer.data.getSelected());
+            layer.data.fireSelectionChanged();
             layer.fireDataChange();
             if (lastException != null) {

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

@@ -245 +245 @@
         // primitives
         //
-        DataSet.fireSelectionChanged(getCurrentDataSet().getSelected());
+        getCurrentDataSet().fireSelectionChanged();
     }
 
@@ -272 +272 @@
     private void tryAgain(MouseEvent e) {
         getCurrentDataSet().setSelected();
-        DataSet.fireSelectionChanged(getCurrentDataSet().getSelected());
+        Main.main.getCurrentDataSet().fireSelectionChanged();
         mouseClicked(e);
     }
@@ -284 +284 @@
         // let everybody else know about the current selection
         //
-        DataSet.fireSelectionChanged(getCurrentDataSet().getSelected());
+        Main.main.getCurrentDataSet().fireSelectionChanged();
         lastUsedNode = null;
         wayIsFinished = true;
@@ -345 +345 @@
                 // (this is just a convenience option so that people don't
                 // have to switch modes)
-                newSelection.clear();
-                newSelection.add(n);
+                getCurrentDataSet().setSelected(n);
+                selection = getCurrentDataSet().getSelected();
                 // The user explicitly selected a node, so let him continue drawing
                 wayIsFinished = false;
@@ -523 +523 @@
 
                 extendedWay = true;
-                newSelection.clear();
-                newSelection.add(wayToSelect);
+                ds.setSelected(way);
+                ds.fireSelectionChanged();
             }
         }
@@ -540 +540 @@
                 }
             }
-            newSelection.add(n);
+
+            ds.setSelected(n);
+            ds.fireSelectionChanged();
         } else if (!newNode) {
             title = tr("Connect existing way to node");
@@ -585 +587 @@
                     (posn0 < selectedWay.getNodesCount()-1) && targetNode.equals(selectedWay.getNode(posn0+1))) {  // next node
                 getCurrentDataSet().setSelected(targetNode);
-                DataSet.fireSelectionChanged(getCurrentDataSet().getSelected());
+                getCurrentDataSet().fireSelectionChanged();
                 lastUsedNode = targetNode;
                 return true;

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

@@ -499 +499 @@
                     }
                 }
-                DataSet.fireSelectionChanged(selection);
+                getCurrentDataSet().fireSelectionChanged();
             }
         }
@@ -515 +515 @@
     public void selectPrims(Collection<OsmPrimitive> selectionList, boolean shift,
             boolean ctrl, boolean released, boolean area) {
+        DataSet ds = getCurrentDataSet();
         if ((shift && ctrl) || (ctrl && !released))
             return; // not allowed together
 
-        Collection<OsmPrimitive> curSel;
-        if (!ctrl && !shift) {
-            curSel = new LinkedList<OsmPrimitive>(); // new selection will replace the old.
+        // plain clicks with no modifiers clear the selection
+        if (!ctrl && !shift)
+            ds.clearSelection();
+
+        if (ctrl) {
+            // Ctrl on an item toggles its selection status,
+            // but Ctrl on an *area* just clears those items
+            // out of the selection.
+            if (area)
+                ds.clearSelection(selectionList);
+            else
+                ds.toggleSelected(selectionList);
         } else {
-            curSel = getCurrentDataSet().getSelected();
-        }
-
-        for (OsmPrimitive osm : selectionList)
-        {
-            if (ctrl)
-            {
-                if(curSel.contains(osm)) {
-                    curSel.remove(osm);
-                } else if(!area) {
-                    curSel.add(osm);
-                }
-            } else {
-                curSel.add(osm);
-            }
-        }
-        getCurrentDataSet().setSelected(curSel);
+            // This is either a plain click (which means we
+            // previously cleared the selection), or a
+            // shift-click where we are adding things to an
+            // existing selection.
+            ds.addSelected(selectionList);
+        }
+        ds.fireSelectionChanged();
         Main.map.mapView.repaint();
     }