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

Timestamp:

2023-07-10T17:07:42+02:00 (19 months ago)

Author:

taylor.smock

Message:

Fix #23049: Informational errors cause validator dialog to occur on upload, even if they are not enabled

File:

• trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
 import org.openstreetmap.josm.data.validation.OsmValidator;
+import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.data.validation.ValidationTask;
@@ -51 +53 @@
         OsmValidator.initializeTests();
         new ValidationTask(errors -> {
+            if (!Boolean.TRUE.equals(ValidatorPrefHelper.PREF_OTHER_UPLOAD.get())) {
+                // Use >= just in case we add additional levels.
+                errors.removeIf(error -> error.getSeverity().getLevel() >= Severity.OTHER.getLevel());
+            }
             if (errors.stream().allMatch(TestError::isIgnored)) {
                 returnCode.set(true);