Changeset 3371 in josm for trunk/src/org/openstreetmap/josm/data/osm

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/data/osm/FilterWorker.java (modified) (1 diff)

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

@@ -61 +61 @@
     }
 
+    public static boolean executeFilters(OsmPrimitive primitive, FilterMatcher filterMatcher) {
+        boolean hidden = primitive.isDisabledAndHidden();
+        boolean disabled = primitive.isDisabled();
+        if (filterMatcher.isHidden(primitive)) {
+            primitive.setDisabledState(true);
+        } else if (filterMatcher.isDisabled(primitive)) {
+            primitive.setDisabledState(false);
+        } else {
+            primitive.unsetDisabledState();
+        }
+        return hidden != primitive.isDisabledAndHidden() || disabled != primitive.isDisabled();
+    }
+
     public static void clearFilterFlags(Collection<OsmPrimitive> prims) {
         for (OsmPrimitive osm : prims) {