Changeset 15682 in josm for trunk

Timestamp:

2020-01-11T17:04:04+01:00 (4 years ago)

Author:

Don-vip

Message:

see #18455 - don't perform INFO level tests in TagChecker if not enabled

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• Test.java (modified) (2 diffs)
• tests/MapCSSTagChecker.java (modified) (1 diff)
• tests/TagChecker.java (modified) (6 diffs)

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

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.NotOutsideDataSourceArea;
 import org.openstreetmap.josm.data.osm.visitor.OsmPrimitiveVisitor;
+import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -141 +142 @@
         public void visit(Relation r) {
             check(r);
+        }
+
+        protected final boolean includeOtherSeverityChecks() {
+            return isBeforeUpload ? ValidatorPrefHelper.PREF_OTHER_UPLOAD.get() : ValidatorPrefHelper.PREF_OTHER.get();
         }
     }

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

@@ -1005 +1005 @@
         indexData = null;
     }
-
-    private boolean includeOtherSeverityChecks() {
-        return isBeforeUpload ? ValidatorPrefHelper.PREF_OTHER_UPLOAD.get() : ValidatorPrefHelper.PREF_OTHER.get();
-    }
-
 }

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

@@ -144 +144 @@
 
     private static final int MAX_LEVENSHTEIN_DISTANCE = 2;
+
+    protected boolean includeOtherSeverity;
 
     protected boolean checkKeys;
@@ -694 +696 @@
             withErrors.put(p, errTypeSpace);
         }
-        if (!value.equals(Entities.unescape(value)) && !withErrors.contains(p, "HTML")) {
+        if (includeOtherSeverity && !value.equals(Entities.unescape(value)) && !withErrors.contains(p, "HTML")) {
             errors.add(TestError.builder(this, Severity.OTHER, INVALID_HTML)
                     .message(tr("Property values contain HTML entity"), s, key)
@@ -781 +783 @@
             }
             withErrors.put(p, "WPK");
-        } else {
+        } else if (includeOtherSeverity) {
             errors.add(TestError.builder(this, Severity.OTHER, INVALID_KEY)
                     .message(tr("Presets do not contain property key"), marktr("Key ''{0}'' not in presets."), key)
@@ -867 +869 @@
                     .build());
             withErrors.put(p, "WPV");
-        } else {
+        } else if (includeOtherSeverity) {
             // unknown preset value
             errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
@@ -903 +905 @@
     public void startTest(ProgressMonitor monitor) {
         super.startTest(monitor);
+        includeOtherSeverity = includeOtherSeverityChecks();
         checkKeys = Config.getPref().getBoolean(PREF_CHECK_KEYS, true);
         if (isBeforeUpload) {
@@ -918 +921 @@
         }
 
-        checkFixmes = Config.getPref().getBoolean(PREF_CHECK_FIXMES, true);
+        checkFixmes = includeOtherSeverity && Config.getPref().getBoolean(PREF_CHECK_FIXMES, true);
         if (isBeforeUpload) {
             checkFixmes = checkFixmes && Config.getPref().getBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, true);
         }
 
-        checkPresetsTypes = Config.getPref().getBoolean(PREF_CHECK_PRESETS_TYPES, true);
+        checkPresetsTypes = includeOtherSeverity && Config.getPref().getBoolean(PREF_CHECK_PRESETS_TYPES, true);
         if (isBeforeUpload) {
             checkPresetsTypes = checkPresetsTypes && Config.getPref().getBoolean(PREF_CHECK_PRESETS_TYPES_BEFORE_UPLOAD, true);