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

Timestamp:

2019-03-06T16:38:08+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17412: Update validator tree when primitives are purged or removed and existing errors refer to those primitives

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• ValidatorDialog.java (modified) (5 diffs)
• validator/ValidatorTreePanel.java (modified) (5 diffs)

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

@@ -63 +63 @@
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -610 +611 @@
         protected void fixError(TestError error) throws InterruptedException, InvocationTargetException {
             if (error.isFixable()) {
-                if (error.getPrimitives().stream().noneMatch(OsmPrimitive::isDeleted)) {
+                if (error.getPrimitives().stream().noneMatch(p -> p.isDeleted() || p.getDataSet() == null)) {
                     final Command fixCommand = error.getFix();
                     if (fixCommand != null) {
@@ -632 +633 @@
                 int i = 0;
                 SwingUtilities.invokeAndWait(ds::beginUpdate);
+                tree.setResetScheduled();
                 try {
                     for (TestError error: testErrors) {
@@ -651 +653 @@
                     }
                     invalidateValidatorLayers();
-                    tree.resetErrors();
                 });
             } catch (InterruptedException e) {
@@ -663 +664 @@
                     tryUndo();
                 }
+                GuiHelper.runInEDTAndWait(tree::resetErrors);
                 monitor.finishTask();
             }

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

@@ -81 +81 @@
     private transient Set<? extends OsmPrimitive> filter;
 
-    private final ListenerList<Runnable> invalidationListeners = ListenerList.create();
+    private final transient ListenerList<Runnable> invalidationListeners = ListenerList.create();
+
+    /** if true, buildTree() does nothing */
+    private boolean resetScheduled;
 
     /**
@@ -148 +151 @@
      */
     public void buildTree() {
+        if (resetScheduled)
+            return;
         final DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode();
 
@@ -402 +407 @@
      */
     public void resetErrors() {
+        resetScheduled = false;
+        filterRemovedPrimitives();
         setErrors(new ArrayList<>(errors));
     }
@@ -481 +488 @@
     @Override public void primitivesRemoved(PrimitivesRemovedEvent event) {
         // Remove purged primitives (fix #8639)
-        if (errors != null) {
-            final Set<? extends OsmPrimitive> deletedPrimitives = new HashSet<>(event.getPrimitives());
-            errors.removeIf(error -> error.getPrimitives().stream().anyMatch(deletedPrimitives::contains));
+        if (filterRemovedPrimitives()) {
+            buildTree();
         }
     }
@@ -512 +518 @@
 
     @Override public void dataChanged(DataChangedEvent event) {
-        // Do nothing
-    }
+        if (filterRemovedPrimitives()) {
+            buildTree();
+        }
+    }
+
+    /**
+     * Can be called to suppress execution of buildTree() while doing multiple updates. Caller must
+     * call resetErrors() to end this state.
+     * @since 14848
+     */
+    public void setResetScheduled() {
+        resetScheduled = true;
+    }
+
+    /**
+     * Remove errors which refer to removed or purged primitives.
+     * @return true if error list was changed
+     */
+    private boolean filterRemovedPrimitives() {
+        return errors != null && errors.removeIf(
+                error -> error.getPrimitives().stream().anyMatch(p -> p.isDeleted() || p.getDataSet() == null));
+    }
+
 }