Changeset 2279 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2009-10-12T20:39:13+02:00 (15 years ago)

Author:

Gubaer

Message:

see #3697: way member of relation can't be selected in version 2276 SVN

Location:

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

Files:

• DataSet.java (modified) (2 diffs)
• visitor/MapPaintVisitor.java (modified) (3 diffs)

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

@@ -243 +243 @@
     }
 
-    public void setSelected(Collection<? extends OsmPrimitive> selection) {
+    /**
+     * Sets the current selection to the primitives in <code>selection</code>.
+     * 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 setSelected(Collection<? extends OsmPrimitive> selection, boolean fireSelectionChangeEvent) {
         clearSelection(nodes);
         clearSelection(ways);
@@ -250 +257 @@
             osm.setSelected(true);
         }
-        fireSelectionChanged(selection);
-    }
+        if (fireSelectionChangeEvent) {
+            fireSelectionChanged(selection);
+        }
+    }
+
+    /**
+     * Sets the current selection to the primitives in <code>selection</code>
+     * and notifies all {@see SelectionChangedListener}.
+     * 
+     * @param selection the selection
+     */
+    public void setSelected(Collection<? extends OsmPrimitive> selection) {
+        setSelected(selection, true /* fire selection change event */);
+    }
+
 
     public void setSelected(OsmPrimitive... osm) {

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

@@ -19 +19 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -474 +475 @@
                 w = new Way(w);
                 w.setNodes(n);
-                if (selected)
-                    data.setSelected(w);
-                else
+                if (selected) {
+                    data.setSelected(Collections.singleton(w),false /* don't notify listeners */);
+                } else {
                     data.clearSelection(w);
+                }
             }
             if(!w.isClosed())
@@ -680 +682 @@
                     firstNode = lastNode;
                     lastNode = firstNode;
-                }
-                else
+                } else {
                     onewayvia = OsmUtils.getOsmBoolean(onewayviastr);
+                }
             }