Changeset 6636 in josm

Timestamp:

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

Author:

simon04

Message:

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

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreference.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java (modified) (1 diff)

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

@@ -60 +60 @@
             test.visit(selection);
             test.endTest();
-            if (Main.pref.getBoolean(ValidatorPreference.PREF_OTHER, false) &&
+            if (ValidatorPreference.PREF_OTHER.get() &&
                 Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false)) {
                 errors.addAll(test.getErrors());

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()));
     }
 

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

@@ -161 +161 @@
         }
 
-        boolean other = Main.pref.getBoolean(ValidatorPreference.PREF_OTHER, false);
+        final Boolean other = ValidatorPreference.PREF_OTHER.get();
         for (TestError e : errors) {
             if (e.getIgnored()) {

trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreference.java

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.Test;
@@ -64 +65 @@
     public static final String PREF_OTHER_UPLOAD = PREFIX + ".otherUpload";
 
-    /** The preferences key for ignored severity other */
-    public static final String PREF_OTHER = PREFIX + ".other";
+    /** The preferences for ignored severity other */
+    public static final BooleanProperty PREF_OTHER = new BooleanProperty(PREFIX + ".other", false);
 
     /**
@@ -95 +96 @@
         testPanel.add(prefUseLayer, GBC.eol());
 
-        prefOther = new JCheckBox(tr("Show informational level."), Main.pref.getBoolean(PREF_OTHER, false));
+        prefOther = new JCheckBox(tr("Show informational level."), PREF_OTHER.get());
         prefOther.setToolTipText(tr("Show the informational tests."));
         testPanel.add(prefOther, GBC.eol());
@@ -143 +144 @@
         Main.pref.putCollection(PREF_SKIP_TESTS_BEFORE_UPLOAD, testsBeforeUpload);
         Main.pref.put(PREF_USE_IGNORE, prefUseIgnore.isSelected());
-        Main.pref.put(PREF_OTHER, prefOther.isSelected());
+        PREF_OTHER.put(prefOther.isSelected());
         Main.pref.put(PREF_OTHER_UPLOAD, prefOtherUpload.isSelected());
         Main.pref.put(PREF_LAYER, prefUseLayer.isSelected());

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -74 +74 @@
             for (final Map.Entry<String, Boolean> i : check.assertions.entrySet()) {
                 final OsmPrimitive p = TestUtils.createPrimitive(i.getKey());
-                final boolean isError = Utils.exists(c.getErrorsForPrimitive(p), new Predicate<TestError>() {
+                final boolean isError = Utils.exists(c.getErrorsForPrimitive(p, true), new Predicate<TestError>() {
                     @Override
                     public boolean evaluate(TestError e) {