Changeset 17437 in josm for trunk/src

Timestamp:

2021-01-04T12:12:03+01:00 (4 years ago)

Author:

GerdP

Message:

fix #20342: Validator results not cleared

• add code to make sure that invalidation listeners are called when buildTree is called even if the tree is empty

The new method buildTreeInternal() is not strictly needed but I think it was too easy to add a return statement somewhere without looking at the very end of the complex method and thus skipping the line
invalidationListeners.fireEvent(Runnable::run);

File:

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

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

@@ -168 +168 @@
         if (resetScheduled)
             return;
+        buildTreeInternal(expandAgain);
+        invalidationListeners.fireEvent(Runnable::run);
+    }
+
+    private void buildTreeInternal(boolean expandAgain) {
         final DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode();
 
-        if (errors == null || errors.isEmpty()) {
-            GuiHelper.runInEDTAndWait(() -> valTreeModel.setRoot(rootNode));
-            return;
-        }
+        if (errors == null)
+            errors = new ArrayList<>();
 
         // Remember first selected tree row
@@ -199 +202 @@
 
         Predicate<TestError> filterToUse = e -> !e.isIgnored();
-        if (!ValidatorPrefHelper.PREF_OTHER.get()) {
+        if (!Boolean.TRUE.equals(ValidatorPrefHelper.PREF_OTHER.get())) {
             filterToUse = filterToUse.and(e -> e.getSeverity() != Severity.OTHER);
         }
@@ -326 +329 @@
             scrollRowToVisible(selRow);
         }
-
-        invalidationListeners.fireEvent(Runnable::run);
     }