Changeset 2282 in josm

Timestamp:

Oct 13, 2009 5:04:53 AM (4 years ago)

Author:

Gubaer

Message:

fixed #3697: selected multipolygon not always rendered in selected state

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (1 diff)
• visitor/MapPaintVisitor.java (modified) (1 diff)

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

@@ -270 +270 @@
     public void setSelected(Collection<? extends OsmPrimitive> selection) {
         setSelected(selection, true /* fire selection change event */);
+    }
+
+    /**
+     * Adds   the primitives in <code>selection</code> to the current selection
+     * and notifies all {@see SelectionChangedListener}.
+     * 
+     * @param selection the selection
+     */
+    public void addSelected(Collection<? extends OsmPrimitive> selection) {
+        addSelected(selection, true /* fire selection change event */);
+    }
+
+    /**
+     * Adds the primitives in <code>selection</code> to the current selection.
+     * Notifies all {@see SelectionChangedListener} if <code>fireSelectionChangeEvent</code> is true.
+     * 
+     * @param selection the selection
+     * @param fireSelectionChangeEvent true, if the selection change listeners are to be notified; false, otherwise
+     */
+    public void addSelected(Collection<? extends OsmPrimitive> selection, boolean fireSelectionChangeEvent) {
+        for (OsmPrimitive osm : selection) {
+            osm.setSelected(true);
+        }
+        if (fireSelectionChangeEvent) {
+            fireSelectionChanged(selection);
+        }
     }
 

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

@@ -476 +476 @@
                 w.setNodes(n);
                 if (selected) {
-                    data.setSelected(Collections.singleton(w),false /* don't notify listeners */);
+                    data.addSelected(Collections.singleton(w),false /* don't notify listeners */);
                 } else {
                     data.clearSelection(w);