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

Timestamp:

2017-10-08T17:52:06+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14665 - Validator incorrectly folds first-level categories when ignoring elements + avoid repaint of complete mapview, invalidate validator layer instead

Location:

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

Files:

• ValidatorDialog.java (modified) (2 diffs)
• validator/ValidatorTreePanel.java (modified) (3 diffs)

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

@@ -50 +50 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
@@ -319 +320 @@
             tree.resetErrors();
             OsmValidator.saveIgnoredErrors();
-            MainApplication.getMap().repaint();
+            MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(Layer::invalidate);
         }
     }

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

@@ -232 +232 @@
 
                 errorsByDescription.forEach((description, errors) -> {
+                    boolean emptyDescription = description == null || description.isEmpty();
                     // Message node
                     final String msg;
                     if (groupNode != null) {
                         msg = tr("{0} ({1})", description, errors.size());
-                    } else if (description == null || description.isEmpty()) {
+                    } else if (emptyDescription) {
                         msg = tr("{0} ({1})", message, errors.size());
                     } else {
@@ -248 +249 @@
                     }
 
-                    if (oldSelectedRows.contains(description)) {
+                    if (oldSelectedRows.contains(description) || (emptyDescription && oldSelectedRows.contains(message))) {
                         if (groupNode != null) {
                             expandedPaths.add(new TreePath(new Object[] {rootNode, severityNode, groupNode, messageNode}));
@@ -381 +382 @@
      */
     public void resetErrors() {
-        List<TestError> e = new ArrayList<>(errors);
-        setErrors(e);
+        setErrors(new ArrayList<>(errors));
     }