Changeset 2402 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2009-11-07T18:01:20+01:00 (14 years ago)

Author:

jttt

Message:

Remove some unnecessary calls to fireSelectionChanged()

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)

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

@@ -783 +783 @@
 
     public void clenupDeletedPrimitives() {
-        cleanupDeleted(nodes.iterator());
-        cleanupDeleted(ways.iterator());
-        cleanupDeleted(relations.iterator());
-    }
-
-    private void cleanupDeleted(Iterator<? extends OsmPrimitive> it) {
+        if (cleanupDeleted(nodes.iterator())
+                | cleanupDeleted(ways.iterator())
+                | cleanupDeleted(relations.iterator())) {
+            fireSelectionChanged();
+        }
+    }
+
+    private boolean cleanupDeleted(Iterator<? extends OsmPrimitive> it) {
+        boolean changed = false;
         while (it.hasNext()) {
-            if (it.next().isDeleted()) {
+            OsmPrimitive primitive = it.next();
+            if (primitive.isDeleted()) {
+                selectedPrimitives.remove(primitive);
+                allPrimitives.remove(primitive);
+                changed = true;
                 it.remove();
             }
         }
+        return changed;
     }