Changeset 14857 in josm for trunk/src

Timestamp:

2019-03-09T14:58:23+01:00 (6 years ago)

Author:

GerdP

Message:

see #17401, #17431

• make sure that list of errors is never null
• performance: avoid to sort list of errors when only elemets were removed from an already sorted list. This reduces time spent to rebuild the tree when primitives are removed or errors are fixed with the Fix button.

File:

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

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

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -72 +71 @@
     protected DefaultTreeModel valTreeModel = new DefaultTreeModel(new DefaultMutableTreeNode());
 
-    /** The list of errors shown in the tree */
-    private transient List<TestError> errors = new ArrayList<>();
+    /** The list of errors shown in the tree, normally identical to field validationErrors in current edit layer*/
+    private transient List<TestError> errors;
 
     /**
@@ -91 +90 @@
      */
     public ValidatorTreePanel(List<TestError> errors) {
+        setErrorList(errors);
         ToolTipManager.sharedInstance().registerComponent(this);
         this.setModel(valTreeModel);
@@ -99 +99 @@
         this.setCellRenderer(new ValidatorTreeRenderer());
         this.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
-        setErrorList(errors);
         for (KeyListener keyListener : getKeyListeners()) {
             // Fix #3596 - Remove default keyListener to avoid conflicts with JOSM commands
@@ -159 +158 @@
             return;
         }
-        // Sort validation errors - #8517
-        sortErrors(errors);
 
         // Remember first selected tree row
@@ -264 +261 @@
                     }
 
+                 // add the matching errors to the current node
                     errors.stream().map(DefaultMutableTreeNode::new).forEach(messageNode::add);
                 });
@@ -283 +281 @@
 
     /**
-     * Sort list or errors in place.
-     * @param errors error list to be sorted
-     */
-    static void sortErrors(List<TestError> errors) {
+     * Sort list of errors in place (#8517).
+     */
+    void sortErrors() {
+        if (errors.isEmpty())
+            return;
         // Calculate the string to sort only once for each element
-        // Avoids to call TestError.compare() which costly
+        // Avoids to call TestError.compare() which is costly
         List<Pair<String, TestError>> toSort = new ArrayList<>();
         for (int i = 0; i < errors.size(); i++) {
@@ -325 +324 @@
      */
     public final void setErrorList(List<TestError> errors) {
-        this.errors = errors;
+        this.errors = errors != null ? errors : new ArrayList<>();
+        sortErrors();
         if (isVisible()) {
             buildTree();
@@ -336 +336 @@
      */
     public void setErrors(List<TestError> newerrors) {
-        if (errors == null)
-            return;
-        clearErrors();
+        errors.clear();
         for (TestError error : newerrors) {
             if (!error.isIgnored()) {
@@ -344 +342 @@
             }
         }
+        sortErrors();
         if (isVisible()) {
             buildTree();
@@ -354 +353 @@
      */
     public List<TestError> getErrors() {
-        return errors != null ? errors : Collections.<TestError>emptyList();
+        return errors;
     }
 
@@ -436 +435 @@
     }
 
-    private void clearErrors() {
-        if (errors != null) {
-            errors.clear();
-        }
-    }
-
     @Override
     public void destroy() {
         DatasetEventManager.getInstance().removeDatasetListener(this);
         ToolTipManager.sharedInstance().unregisterComponent(this);
-        clearErrors();
+        errors.clear();
     }
 
@@ -546 +539 @@
      */
     private boolean filterRemovedPrimitives() {
-        return errors != null && errors.removeIf(
+        return errors.removeIf(
                 error -> error.getPrimitives().stream().anyMatch(p -> p.isDeleted() || p.getDataSet() == null));
     }