Changeset 3371 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

Timestamp:

2010-07-09T08:24:57+02:00 (14 years ago)

Author:

jttt

Message:

Fix #5018 DataIntegrityProblemException: Primitive must be part of the dataset

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

@@ -8 +8 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -25 +26 @@
 import org.openstreetmap.josm.data.osm.FilterMatcher;
 import org.openstreetmap.josm.data.osm.FilterWorker;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
@@ -59 +61 @@
 
 
-    
+
     public void executeFilters() {
         DataSet ds = Main.main.getCurrentDataSet();
@@ -65 +67 @@
             return;
 
-        final Collection<OsmPrimitive> all = ds.allNonDeletedCompletePrimitives();
-
-        FilterWorker.executeFilters(all, filterMatcher);
-
-        disabledCount = 0;
-        disabledAndHiddenCount = 0;
-        // collect disabled and selected the primitives
         final Collection<OsmPrimitive> deselect = new HashSet<OsmPrimitive>();
-        for (OsmPrimitive osm : all) {
-            if (osm.isDisabled()) {
-                disabledCount++;
-                if (osm.isSelected()) {
-                    deselect.add(osm);
-                }
-                if (osm.isDisabledAndHidden()) {
-                    disabledAndHiddenCount++;
+
+        ds.beginUpdate();
+        try {
+
+            final Collection<OsmPrimitive> all = ds.allNonDeletedCompletePrimitives();
+
+            FilterWorker.executeFilters(all, filterMatcher);
+
+            disabledCount = 0;
+            disabledAndHiddenCount = 0;
+            // collect disabled and selected the primitives
+            for (OsmPrimitive osm : all) {
+                if (osm.isDisabled()) {
+                    disabledCount++;
+                    if (osm.isSelected()) {
+                        deselect.add(osm);
+                    }
+                    if (osm.isDisabledAndHidden()) {
+                        disabledAndHiddenCount++;
+                    }
                 }
             }
-        }
-        disabledCount -= disabledAndHiddenCount;
+            disabledCount -= disabledAndHiddenCount;
+        } finally {
+            ds.endUpdate();
+        }
+
         if (!deselect.isEmpty()) {
             ds.clearSelection(deselect);
@@ -91 +101 @@
         Main.map.mapView.repaint();
         Main.map.filterDialog.updateDialogHeader();
+    }
+
+
+    public void executeFilters(Collection<? extends OsmPrimitive> primitives) {
+        DataSet ds = Main.main.getCurrentDataSet();
+        if (ds == null)
+            return;
+
+        boolean changed = false;
+        List<OsmPrimitive> deselect = new ArrayList<OsmPrimitive>();
+
+        ds.beginUpdate();
+        try {
+            for (int i=0; i<2; i++) {
+                for (OsmPrimitive primitive: primitives) {
+
+                    if (i == 0 && primitive instanceof Node) {
+                        continue;
+                    }
+
+                    if (i == 1 && !(primitive instanceof Node)) {
+                        continue;
+                    }
+
+                    if (primitive.isDisabled()) {
+                        disabledCount--;
+                    }
+                    if (primitive.isDisabledAndHidden()) {
+                        disabledAndHiddenCount--;
+                    }
+                    changed = changed | FilterWorker.executeFilters(primitive, filterMatcher);
+                    if (primitive.isDisabled()) {
+                        disabledCount++;
+                    }
+                    if (primitive.isDisabledAndHidden()) {
+                        disabledAndHiddenCount++;
+                    }
+
+                    if (primitive.isSelected() && primitive.isDisabled()) {
+                        deselect.add(primitive);
+                    }
+
+                }
+            }
+        } finally {
+            ds.endUpdate();
+        }
+
+        if (changed) {
+            Main.map.mapView.repaint();
+            Main.map.filterDialog.updateDialogHeader();
+            ds.clearSelection(deselect);
+        }
+
     }