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

Timestamp:

2021-05-02T05:53:40+02:00 (4 years ago)

Author:

GerdP

Message:

fix #20729: Improve validation with data filters enabled

• show notification when validator was executed with filters and at least one element in the error message is hidden

File:

• trunk/src/org/openstreetmap/josm/data/validation/ValidationTask.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/ValidationTask.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -6 +14 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.ValidatorLayer;
@@ -11 +20 @@
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -102 +105 @@
             }
         }
+
+        if (errors.stream().anyMatch(e -> !e.getPrimitives().stream().allMatch(OsmPrimitive::isDrawable))) {
+            final String msg = "<b>" + tr("Validation results contain elements hidden by a filter.") + "</b><br/>"
+                    + tr("Please review active filters to see the hidden results.");
+            GuiHelper.runInEDT(() -> new Notification(msg)
+                    .setDuration(Notification.TIME_LONG)
+                    .setIcon(JOptionPane.WARNING_MESSAGE)
+                    .setHelpTopic("Dialog/Validator")
+                    .show());
+        }
     }