Changeset 6636 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2014-01-05T19:32:00+01:00 (10 years ago)

Author:

simon04

Message:

see #9414 - MapCSS validator: skip tests with informational severity if that isn't enabled

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
+import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference;
 import org.openstreetmap.josm.gui.widgets.EditableList;
 import org.openstreetmap.josm.io.MirroredInputStream;
@@ -284 +285 @@
          */
         String getMessage() {
-            return errors.keySet().iterator().next();
+            return errors.isEmpty() ? null : errors.keySet().iterator().next();
         }
 
@@ -313 +314 @@
 
         Severity getSeverity() {
-            return errors.values().iterator().next();
+            return errors.isEmpty() ? null : errors.values().iterator().next();
         }
 
@@ -364 +365 @@
      * Obtains all {@link TestError}s for the {@link OsmPrimitive} {@code p}.
      */
-    public Collection<TestError> getErrorsForPrimitive(OsmPrimitive p) {
+    public Collection<TestError> getErrorsForPrimitive(OsmPrimitive p, boolean includeOtherSeverity) {
         final ArrayList<TestError> r = new ArrayList<TestError>();
         final Environment env = new Environment(p, new MultiCascade(), Environment.DEFAULT_LAYER, null);
         for (TagCheck check : checks) {
+            if (Severity.OTHER.equals(check.getSeverity()) && !includeOtherSeverity) {
+                continue;
+            }
             final Selector selector = check.whichSelectorMatchesEnvironment(env);
             if (selector != null) {
@@ -388 +392 @@
     @Override
     public void check(OsmPrimitive p) {
-        errors.addAll(getErrorsForPrimitive(p));
+        errors.addAll(getErrorsForPrimitive(p, ValidatorPreference.PREF_OTHER.get()));
     }