Changeset 297 in josm

Timestamp:

2007-07-27T10:50:54+02:00 (17 years ago)

Author:

imi

Message:

• fixed bug that selection listener were informed twice on selection changes

Files:

• src/org/openstreetmap/josm/actions/UnselectAllAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/MapView.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java (modified) (1 diff)

src/org/openstreetmap/josm/actions/UnselectAllAction.java

@@ -15 +15 @@
 
         public void actionPerformed(ActionEvent e) {
-                Main.ds.clearSelection();
+                Main.ds.setSelected();
         }
 }

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

@@ -82 +82 @@
         /**
          * Remove the selection of the whole dataset.
+         * @deprecated Use setSelected() instead.
          */
+        @Deprecated
         public void clearSelection() {
                 clearSelection(nodes);
@@ -103 +105 @@
 
         public void setSelected(Collection<? extends OsmPrimitive> selection) {
-                clearSelection();
+                clearSelection(nodes);
+                clearSelection(segments);
+                clearSelection(ways);
                 for (OsmPrimitive osm : selection)
                         osm.selected = true;
@@ -110 +114 @@
 
         public void setSelected(OsmPrimitive... osm) {
-                clearSelection();
-                if (osm.length == 0 || (osm.length == 1 && osm[0] == null))
+                if (osm.length == 1 && osm[0] == null) {
+                        setSelected();
                         return;
+                }
+                clearSelection(nodes);
+                clearSelection(segments);
+                clearSelection(ways);
                 for (OsmPrimitive o : osm)
-                        o.selected = true;
+                        if (o != null)
+                                o.selected = true;
                 fireSelectionChanged(Arrays.asList(osm));
         }

src/org/openstreetmap/josm/gui/MapView.java

@@ -132 +132 @@
                 if (layer == editLayer) {
                         editLayer = null;
-                        Main.ds.clearSelection();
+                        Main.ds.setSelected();
                 }
                 layer.destroy();

src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -230 +230 @@
                 redoCommands.push(c);
                 setModified(uploadedModified || !commands.isEmpty());
-                Main.ds.clearSelection();
+                Main.ds.setSelected();
                 fireCommandsChanged();
         }

test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java

@@ -46 +46 @@
         }
 
-        public void testClearSelection() {
-                node1.selected = true;
-                ds.clearSelection();
-                assertFalse(node1.selected);
-        }
-
         public void testGetSelected() {
                 node1.selected = true;