Changeset 14973 in josm

Timestamp:

2019-04-08T10:24:31+02:00 (6 years ago)

Author:

GerdP

Message:

simplify code, improve performance: Remove obsolete method sortErrors()

The sorting was introduced to fix #8517 but is no longer needed since errors are reordered in OsmValidator.getErrorsBySeverityMessageDescription() when the tree is created. The obsolete sort takes much longer and doesn't improve anything.

File:

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

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

@@ -41 +41 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ListenerList;
-import org.openstreetmap.josm.tools.Pair;
 
 /**
@@ -333 +331 @@
 
     /**
-     * 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 is costly
-        List<Pair<String, TestError>> toSort = new ArrayList<>();
-        for (int i = 0; i < errors.size(); i++) {
-            TestError e = errors.get(i);
-            toSort.add(new Pair<>(e.getNameVisitor().getText(), e));
-        }
-        toSort.sort((o1, o2) -> AlphanumComparator.getInstance().compare(o1.a, o2.a));
-        List<TestError> sortedErrors = new ArrayList<>(errors.size());
-        for (Pair<String, TestError> p : toSort) {
-            sortedErrors.add(p.b);
-        }
-        errors.clear();
-        errors.addAll(sortedErrors);
-    }
-
-    /**
      * Add a new invalidation listener
      * @param listener The listener
@@ -379 +355 @@
             return;
         this.errors = errors != null ? errors : new ArrayList<>();
-        sortErrors();
         if (isVisible()) {
             //TODO: If list is changed because another layer was activated it would be good to store/restore
@@ -399 +374 @@
             }
         }
-        sortErrors();
         if (isVisible()) {
             buildTree();