Changeset 11335 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-11-28T19:26:16+01:00 (7 years ago)

Author:

simon04

Message:

fix #13948 fix #14040 - UnsupportedOperationException in ValidatorTreePanel

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -437 +437 @@
         // Remove purged primitives (fix #8639)
         if (errors != null) {
-            for (TestError err : errors) {
-                try {
-                    err.getPrimitives().removeAll(event.getPrimitives());
-                } catch (UnsupportedOperationException e) {
-                    if (event.getPrimitives().containsAll(err.getPrimitives())) {
-                        err.getPrimitives().clear();
-                    } else {
-                        Main.warn(e, "Unable to remove primitives from "+err+'.');
-                    }
-                }
-            }
+            final Set<? extends OsmPrimitive> deletedPrimitives = new HashSet<>(event.getPrimitives());
+            errors.removeIf(error -> error.getPrimitives().stream().anyMatch(deletedPrimitives::contains));
         }
     }