Changeset 2264 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-10-10T14:14:28+02:00 (17 years ago)

Author:

stoecker

Message:

applied #3676 - patch by Dave Hansen - cleanup selection handling interface

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (5 diffs)
• NavigatableComponent.java (modified) (2 diffs)

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

@@ -300 +300 @@
          */
         private final void popupCycleSelection(Collection<OsmPrimitive> osms, int mods) {
+            DataSet ds = Main.main.getCurrentDataSet();
             // Find some items that are required for cycling through
             OsmPrimitive firstItem = null;
@@ -311 +312 @@
                     nextSelected = osm;
                 }
-                if(firstSelected == null && osm.isSelected()) {
+                if(firstSelected == null && ds.isSelected(osm)) {
                     firstSelected = osm;
                 }
@@ -319 +320 @@
             // pressed. Cannot use "setSelected()" because it will cause a
             // fireSelectionChanged event which is unnecessary at this point.
-            if((mods & MouseEvent.SHIFT_DOWN_MASK) == 0) {
-                for(OsmPrimitive o : Main.main.getCurrentDataSet().getSelected()) {
-                    o.setSelected(false);
-                }
-            }
+            if((mods & MouseEvent.SHIFT_DOWN_MASK) == 0)
+                ds.clearSelection();
 
             // This will cycle through the available items.
             if(firstSelected == null) {
-                firstItem.setSelected(true);
+                ds.addSelected(firstItem);
             } else {
-                firstSelected.setSelected(false);
+                ds.clearSelection(firstSelected);
                 if(nextSelected != null) {
-                    nextSelected.setSelected(true);
-                }
-            }
-            DataSet.fireSelectionChanged(Main.main.getCurrentDataSet().getSelected());
+                    ds.addSelected(nextSelected);
+                }
+            }
+            DataSet.fireSelectionChanged(ds.getSelected());
         }
 
@@ -398 +396 @@
          */
         private final void popupSetLabelColors(JLabel lbl, OsmPrimitive osm) {
-            if(osm.isSelected()) {
+            DataSet ds = Main.main.getCurrentDataSet();
+            if(ds.isSelected(osm)) {
                 lbl.setBackground(SystemColor.textHighlight);
                 lbl.setForeground(SystemColor.textHighlightText);
@@ -460 +459 @@
                 }
                 @Override public void mouseClicked(MouseEvent e) {
+                    DataSet ds = Main.main.getCurrentDataSet();
                     // Let the user toggle the selection
-                    osm.setSelected(!osm.isSelected());
-                    DataSet.fireSelectionChanged(Main.main.getCurrentDataSet().getSelected());
+                    ds.toggleSelected(osm);
+                    DataSet.fireSelectionChanged(ds.getSelected());
                     l.validate();
                 }

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

@@ -318 +318 @@
             // when multiple nodes on one point, prefer new or selected nodes
             else if(dist == minDistanceSq && minPrimitive != null
-                    && ((n.getId() == 0 && n.isSelected())
-                            || (!minPrimitive.isSelected() && (n.isSelected() || n.getId() == 0)))) {
+                    && ((n.getId() == 0 && ds.isSelected(n))
+                            || (!ds.isSelected(minPrimitive) && (ds.isSelected(n) || n.getId() == 0)))) {
                 minPrimitive = n;
             }
@@ -360 +360 @@
                 double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
                 if (perDist < snapDistance && a < c+snapDistance && b < c+snapDistance) {
-                    if(w.isSelected()) {
+                    if(ds.isSelected(w)) {
                         perDist -= 0.00001;
                     }