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

Timestamp:

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

Author:

Gubaer

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• UndoRedoHandler.java (modified) (1 diff)
• osm/DataSet.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -50 +50 @@
 
         // the command may have changed the selection so tell the listeners about the current situation
-        DataSet.fireSelectionChanged(Main.main.getCurrentDataSet().getSelected());
+        Main.main.getCurrentDataSet().fireSelectionChanged();
     }
 

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

@@ -26 +26 @@
  */
 public class DataSet implements Cloneable {
-
-    /**
-     * The API version that created this data set, if any.
-     */
-    public String version;
-
-    /**
-     * All nodes goes here, even when included in other data (ways etc). This enables the instant
-     * conversion of the whole DataSet by iterating over this data structure.
-     */
-    public QuadBuckets<Node> nodes = new QuadBuckets<Node>();
-
-    /**
-     * All ways (Streets etc.) in the DataSet.
-     *
-     * The way nodes are stored only in the way list.
-     */
-    public QuadBuckets<Way> ways = new QuadBuckets<Way>();
-
-    /**
-     * All relations/relationships
-     */
-    public Collection<Relation> relations = new LinkedList<Relation>();
-
-    /**
-     * All data sources of this DataSet.
-     */
-    public Collection<DataSource> dataSources = new LinkedList<DataSource>();
-
+    
     /**
      * A list of listeners to selection changed events. The list is static, as listeners register
@@ -61 +33 @@
      */
     public static Collection<SelectionChangedListener> selListeners = new LinkedList<SelectionChangedListener>();
-
+    
+    /**
+     * notifies all registered selection change listeners about the current selection of
+     * primitives
+     * 
+     * @param sel the current selection
+     */
+    private static void notifySelectionChangeListeners(Collection<? extends OsmPrimitive> sel) {
+        for (SelectionChangedListener l : selListeners) {
+            l.selectionChanged(sel);
+        }
+    }
+
+    /**
+     * The API version that created this data set, if any.
+     */
+    public String version;
+
+    /**
+     * All nodes goes here, even when included in other data (ways etc). This enables the instant
+     * conversion of the whole DataSet by iterating over this data structure.
+     */
+    public QuadBuckets<Node> nodes = new QuadBuckets<Node>();
+
+    /**
+     * All ways (Streets etc.) in the DataSet.
+     *
+     * The way nodes are stored only in the way list.
+     */
+    public QuadBuckets<Way> ways = new QuadBuckets<Way>();
+
+    /**
+     * All relations/relationships
+     */
+    public Collection<Relation> relations = new LinkedList<Relation>();
+
+    /**
+     * All data sources of this DataSet.
+     */
+    public Collection<DataSource> dataSources = new LinkedList<DataSource>();
+    
     /**
      * @return A collection containing all primitives of the dataset. The data is ordered after:
@@ -242 +254 @@
     LinkedHashSet<OsmPrimitive> selectedPrimitives = new LinkedHashSet<OsmPrimitive>();
 
-    public boolean toggleSelected(OsmPrimitive osm) {
+    public boolean toggleSelected(Collection<OsmPrimitive> osm) {
+        for (OsmPrimitive o : osm)
+            this.__toggleSelected(o);
+        fireSelectionChanged();
+        return true;
+    }
+    public boolean toggleSelected(OsmPrimitive... osm) {
+        return this.toggleSelected(Arrays.asList(osm));
+    }
+    private boolean __toggleSelected(OsmPrimitive osm) {
         if (!selectedPrimitives.remove(osm)) {
             selectedPrimitives.add(osm);
@@ -276 +297 @@
         selectedPrimitives = new LinkedHashSet<OsmPrimitive>(selection);
         if (fireSelectionChangeEvent) {
-            fireSelectionChanged(selection);
+            fireSelectionChanged();
         }
     }
@@ -314 +335 @@
         selectedPrimitives.addAll(selection);
         if (fireSelectionChangeEvent) {
-            fireSelectionChanged(selection);
+            fireSelectionChanged();
         }
     }
@@ -326 +347 @@
         List<OsmPrimitive> list = Arrays.asList(osm);
         setSelected(list);
-        fireSelectionChanged(list);
+        fireSelectionChanged();
     }
 
@@ -359 +380 @@
         clearSelection(Arrays.asList(osm));
     }
-    private void clearSelection(Collection<? extends OsmPrimitive> list) {
+    public void clearSelection(Collection<? extends OsmPrimitive> list) {
         if (list == null)
             return;
         selectedPrimitives.removeAll(list);
+    }
+    public void clearSelection() {
+        selectedPrimitives.clear();
     }
 
@@ -381 +405 @@
 
     /**
-     * Remember to fire an selection changed event. A call to this will not fire the event
-     * immediately. For more,
-     * @see SelectionChangedListener
-     */
-    public static void fireSelectionChanged(Collection<? extends OsmPrimitive> sel) {
-        for (SelectionChangedListener l : selListeners) {
-            l.selectionChanged(sel);
-        }
-    }
+     * Notifies all registered {@see SelectionChangedListener} about the current selection in 
+     * this dataset.
+     * 
+     */
+    public void fireSelectionChanged(){
+        notifySelectionChangeListeners(selectedPrimitives);
+    }
+
 
     @Override public DataSet clone() {