Changeset 2264 in josm

Timestamp:

Oct 10, 2009 2:14:28 PM (4 years ago)

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UnGlueAction.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (4 diffs)
• actions/search/SearchAction.java (modified) (3 diffs)
• actions/search/SearchCompiler.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (2 diffs)
• data/osm/OsmPrimitive.java (modified) (2 diffs)
• data/osm/visitor/MapPaintVisitor.java (modified) (23 diffs)
• data/osm/visitor/SimplePaintVisitor.java (modified) (9 diffs)
• gui/MapStatus.java (modified) (5 diffs)
• gui/NavigatableComponent.java (modified) (2 diffs)

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

@@ -152 +152 @@
         Node c = new Node(selectedNode);
         c.removeAll();
-        c.setSelected(false);
+        getCurrentDataSet().clearSelection(c);
         cmds.add(new ChangeCommand(selectedNode, c));
 

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

@@ -325 +325 @@
         mousePos = e.getPoint();
 
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
+        DataSet ds = getCurrentDataSet();
+        Collection<OsmPrimitive> selection = ds.getSelected();
         Collection<Command> cmds = new LinkedList<Command>();
 
@@ -405 +406 @@
                     // here so /only/ the new way will be selected after this method finishes.
                     if(alt) {
-                        wnew.setSelected(false);
+                        ds.addSelected(wnew);
                     }
 
@@ -519 +520 @@
                 extendedWay = true;
                 getCurrentDataSet().setSelected(way);
-                DataSet.fireSelectionChanged(getCurrentDataSet().getSelected());
+                DataSet.fireSelectionChanged(ds.getSelected());
             }
         }
@@ -532 +533 @@
                 title = tr("Add node into way");
                 for (Way w : reuseWays) {
-                    w.setSelected(false);
+                    ds.clearSelection(w);
                 }
             }

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.data.osm.Filter;
+import org.openstreetmap.josm.data.osm.DataSet;
 
 public class SearchAction extends JosmAction{
@@ -89 +90 @@
         left.add(input, GBC.eop().fill(GBC.HORIZONTAL));
         left.add(replace, GBC.eol());
+        DataSet ds = Main.main.getCurrentDataSet();
         left.add(add, GBC.eol());
         left.add(remove, GBC.eol());
@@ -237 +239 @@
         //        }
 
-        Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
+        final DataSet ds = Main.main.getCurrentDataSet();
+        Collection<OsmPrimitive> sel = ds.getSelected();
         int foundMatches = getSelection(s, sel, new Function(){
             public Boolean isSomething(OsmPrimitive o){
-                return o.isSelected();
+                return ds.isSelected(o);
             }
         });
-        Main.main.getCurrentDataSet().setSelected(sel);
+        ds.setSelected(sel);
         if (foundMatches == 0) {
             String msg = null;

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -424 +424 @@
     private static class Selected extends Match {
         @Override public boolean match(OsmPrimitive osm) {
-            return osm.isSelected();
+            return Main.main.getCurrentDataSet().isSelected(osm);
         }
         @Override public String toString() {return "selected";}

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -217 +217 @@
     }
 
+    public boolean addSelected(OsmPrimitive osm) {
+        osm.setSelected(true);
+        return true;
+    }
+
+    public boolean toggleSelected(OsmPrimitive osm) {
+        osm.setSelected(!osm.isSelected());
+        return true;
+    }
+    public boolean isSelected(OsmPrimitive osm) {
+        return osm.isSelected();
+    }
+
     public void setDisabled(OsmPrimitive... osm) {
         if (osm.length == 1 && osm[0] == null) {
@@ -283 +296 @@
      * @param list The collection to remove the selection from.
      */
+    public void clearSelection(OsmPrimitive... osm) {
+        clearSelection(Arrays.asList(osm));
+    }
     private void clearSelection(Collection<? extends OsmPrimitive> list) {
         if (list == null)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -221 +221 @@
      * @since 1899
      */
-    public void setSelected(boolean selected) {
+    @Deprecated public void setSelected(boolean selected) {
         if (selected) {
             flags |= FLAG_SELECTED;
@@ -234 +234 @@
      * @since 1899
      */
-    public boolean isSelected() {
+    @Deprecated public boolean isSelected() {
         return (flags & FLAG_SELECTED) != 0;
     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -152 +152 @@
 
         if (nodeStyle != null && isZoomOk(nodeStyle) && showIcons > dist) {
-            drawNode(n, nodeStyle.icon, nodeStyle.annotate, n.isSelected());
+            drawNode(n, nodeStyle.icon, nodeStyle.annotate, data.isSelected(n));
         } else if (n.highlighted) {
             drawNode(n, highlightColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
-        } else if (n.isSelected()) {
+        } else if (data.isSelected(n)) {
             drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
         } else if (n.isTagged()) {
@@ -227 +227 @@
             //profilerVisibleWays++;
             //if(!profilerOmitDraw)
-            drawWay(w, null, untaggedColor, w.isSelected());
+            drawWay(w, null, untaggedColor, data.isSelected(w));
         }
         else if(wayStyle instanceof LineElemStyle)
@@ -234 +234 @@
             //profilerVisibleWays++;
             //if(!profilerOmitDraw)
-            drawWay(w, (LineElemStyle)wayStyle, untaggedColor, w.isSelected());
+            drawWay(w, (LineElemStyle)wayStyle, untaggedColor, data.isSelected(w));
         }
         else if (wayStyle instanceof AreaElemStyle)
@@ -245 +245 @@
             {
                 //    profilerVisibleAreas++;
-                drawArea(w, w.isSelected() ? selectedColor : areaStyle.color);
+                drawArea(w, data.isSelected(w) ? selectedColor : areaStyle.color);
                 if(!w.isClosed()) {
                     w.putError(tr("Area style way is not closed."), true);
                 }
             }
-            drawWay(w, areaStyle.line, areaStyle.color, w.isSelected());
+            drawWay(w, areaStyle.line, areaStyle.color, data.isSelected(w));
             //}
         }
@@ -259 +259 @@
            the way is tagged with a direction key
            (even if the tag is negated as in oneway=false) or the way is selected */
-        boolean showDirection = w.isSelected() || ((!useRealWidth) && (showDirectionArrow
+        boolean showDirection = data.isSelected(w) || ((!useRealWidth) && (showDirectionArrow
                 && (!showRelevantDirectionsOnly || w.hasDirectionKeys())));
         /* head only takes over control if the option is true,
            the direction should be shown at all and not only because it's selected */
-        boolean showOnlyHeadArrowOnly = showDirection && !w.isSelected() && showHeadArrowOnly;
+        boolean showOnlyHeadArrowOnly = showDirection && !data.isSelected(w) && showHeadArrowOnly;
         int width = defaultSegmentWidth;
         int realWidth = 0; /* the real width of the element in meters */
@@ -307 +307 @@
         if(w.highlighted) {
             color = highlightColor;
-        } else if(w.isSelected()) {
+        } else if(data.isSelected(w)) {
             color = selectedColor;
         } else if(w.isDisabled()) {
@@ -325 +325 @@
                         if(lastN != null)
                         {
-                            drawSeg(lastN, n, s.color != null  && !w.isSelected() ? s.color : color,
+                            drawSeg(lastN, n, s.color != null  && !data.isSelected(w) ? s.color : color,
                                     false, s.getWidth(width), s.dashed, s.dashedColor);
                         }
@@ -359 +359 @@
                         if(lastN != null)
                         {
-                            drawSeg(lastN, n, s.color != null && !w.isSelected() ? s.color : color,
+                            drawSeg(lastN, n, s.color != null && !data.isSelected(w) ? s.color : color,
                                     false, s.getWidth(width), s.dashed, s.dashedColor);
                         }
@@ -405 +405 @@
                         Way c = (Way)joinArray[i];
                         if(w == null)
-                        { w = c; selected = w.isSelected(); joinArray[i] = null; --left; }
+                        { w = c; selected = data.isSelected(w); joinArray[i] = null; --left; }
                         else
                         {
@@ -441 +441 @@
                                 joinArray[i] = null;
                                 joined = true;
-                                if(c.isSelected()) {
+                                if(data.isSelected(c)) {
                                     selected = true;
                                 }
@@ -474 +474 @@
                 w = new Way(w);
                 w.setNodes(n);
-                w.setSelected(selected);
+                if (selected)
+                    data.setSelected(w);
+                else
+                    data.clearSelection(w);
             }
             if(!w.isClosed())
@@ -551 +554 @@
         }
 
-        if(r.isSelected()) /* draw ways*/
+        if(data.isSelected(r)) /* draw ways*/
         {
             for (RelationMember m : r.getMembers())
@@ -828 +831 @@
         smallIcon.paintIcon ( Main.map.mapView, g, (int)(pVia.x+vx+vx2)-w/2, (int)(pVia.y+vy+vy2)-h/2 );
 
-        if (r.isSelected())
+        if (data.isSelected(r))
         {
             g.setColor (  selectedColor );
@@ -872 +875 @@
                         if(!m.hasRole()) {
                             outer.add(w);
-                        } else if(r.isSelected()) {
+                        } else if(data.isSelected(r)) {
                             drawSelectedMember(m.getMember(), styles != null
                                     ? getPrimitiveStyle(m.getMember()) : null, true, true);
@@ -1052 +1055 @@
                     if(isPolygonVisible(p))
                     {
-                        drawAreaPolygon(p, (pd.way.isSelected() || r.isSelected()) ? selectedColor
+                        drawAreaPolygon(p, (data.isSelected(pd.way) || data.isSelected(r)) ? selectedColor
                                 : areaStyle.color);
                         visible = true;
@@ -1078 +1081 @@
                     {
                         drawWay(wInner, ((AreaElemStyle)wayStyle).line,
-                                ((AreaElemStyle)wayStyle).color, wInner.isSelected()
-                                || r.isSelected());
+                                ((AreaElemStyle)wayStyle).color, data.isSelected(wInner)
+                                || data.isSelected(r));
                     }
                     wInner.mappaintDrawnCode = paintid;
@@ -1085 +1088 @@
                 else
                 {
-                    if(r.isSelected())
+                    if(data.isSelected(r))
                     {
                         drawSelectedMember(wInner, innerStyle,
-                                !wayStyle.equals(innerStyle), wInner.isSelected());
+                                !wayStyle.equals(innerStyle), data.isSelected(wInner));
                     }
                     if(wayStyle.equals(innerStyle))
@@ -1094 +1097 @@
                         r.putError(tr("Style for inner way ''{0}'' equals multipolygon.",
                                 wInner.getDisplayName(DefaultNameFormatter.getInstance())), false);
-                        if(!r.isSelected()) {
+                        if(!data.isSelected(r)) {
                             wInner.mappaintDrawnAreaCode = paintid;
                         }
@@ -1108 +1111 @@
                     {
                         drawWay(wOuter, ((AreaElemStyle)wayStyle).line,
-                                ((AreaElemStyle)wayStyle).color, wOuter.isSelected()
-                                || r.isSelected());
+                                ((AreaElemStyle)wayStyle).color, data.isSelected(wOuter)
+                                || data.isSelected(r));
                     }
                     wOuter.mappaintDrawnCode = paintid;
@@ -1121 +1124 @@
                                 wOuter.getDisplayName(DefaultNameFormatter.getInstance())), true);
                     }
-                    if(r.isSelected())
+                    if(data.isSelected(r))
                     {
                         drawSelectedMember(wOuter, outerStyle, false, false);
@@ -1326 +1329 @@
     }
 
+    DataSet data;
+
     /* Shows areas before non-areas */
     @Override
     public void visitAll(DataSet data, Boolean virtual) {
-
+        this.data = data;
         //boolean profiler = Main.pref.getBoolean("mappaint.profiler",false);
         //profilerOmitDraw = Main.pref.getBoolean("mappaint.profiler.omitdraw",false);
@@ -1450 +1455 @@
             //    profilerN = 0;
             for (final OsmPrimitive osm : data.ways)
-                if (!osm.incomplete && !osm.isDeleted() && !osm.isFiltered() && !osm.isSelected()
+                if (!osm.incomplete && !osm.isDeleted() && !osm.isFiltered() && !data.isSelected(osm)
                         && osm.mappaintVisibleCode != viewid )
                 {
@@ -1489 +1494 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.nodes)
-            if (!osm.incomplete && !osm.isDeleted() && (osm.isSelected() || !osm.isFiltered())
+            if (!osm.incomplete && !osm.isDeleted() && (data.isSelected(osm) || !osm.isFiltered())
                     && osm.mappaintVisibleCode != viewid && osm.mappaintDrawnCode != paintid)
             {

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -128 +128 @@
     }
 
+    DataSet ds;
     public void visitAll(DataSet data, Boolean virtual) {
+        this.ds = data;
         //boolean profiler = Main.pref.getBoolean("simplepaint.profiler",false);
         //long profilerStart = java.lang.System.currentTimeMillis();
@@ -149 +151 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.relations)
-            if (!osm.isDeleted() && !osm.isSelected() && !osm.isFiltered())
+            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered())
             {
                 osm.visit(this);
@@ -163 +165 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.ways)
-            if (!osm.isDeleted() && !osm.isSelected() && !osm.isFiltered() && osm.isTagged())
+            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered() && osm.isTagged())
             {
                 osm.visit(this);
@@ -171 +173 @@
 
         for (final OsmPrimitive osm : data.ways)
-            if (!osm.isDeleted() && !osm.isSelected() && !osm.isFiltered() && !osm.isTagged())
+            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered() && !osm.isTagged())
             {
                 osm.visit(this);
@@ -202 +204 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.nodes)
-            if (!osm.isDeleted() && !osm.isSelected() && !osm.isFiltered())
+            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered())
             {
                 osm.visit(this);
@@ -253 +255 @@
         } else if (n.highlighted) {
             drawNode(n, highlightColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
-        } else if (n.isSelected()) {
+        } else if (ds.isSelected(n)) {
             drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
         } else if(n.isTagged()) {
@@ -305 +307 @@
            (even if the tag is negated as in oneway=false) or the way is selected */
 
-        boolean showThisDirectionArrow = w.isSelected()
+        boolean showThisDirectionArrow = ds.isSelected(w)
         || (showDirectionArrow && (!showRelevantDirectionsOnly || w.hasDirectionKeys()));
         /* head only takes over control if the option is true,
            the direction should be shown at all and not only because it's selected */
-        boolean showOnlyHeadArrowOnly = showThisDirectionArrow && !w.isSelected() && showHeadArrowOnly;
+        boolean showOnlyHeadArrowOnly = showThisDirectionArrow && !ds.isSelected(w) && showHeadArrowOnly;
         Color wayColor;
 
@@ -316 +318 @@
         } else if(w.highlighted) {
             wayColor = highlightColor;
-        } else if(w.isSelected()) {
+        } else if(ds.isSelected(w)) {
             wayColor = selectedColor;
         } else if (!w.isTagged()) {
@@ -347 +349 @@
         if (inactive || r.isDisabled()) {
             col = inactiveColor;
-        } else if (r.isSelected()) {
+        } else if (ds.isSelected(r)) {
             col = selectedColor;
         } else {

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;
                     }