Changeset 18211 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

Timestamp:

2021-09-12T02:10:25+02:00 (3 years ago)

Author:

Don-vip

Message:

global use of !Utils.isEmpty/isBlank

File:

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

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

@@ -240 +240 @@
                 continue;
             Set<String> values = TaggingPresets.getPresetValues(key);
-            boolean allNumerical = values != null && !values.isEmpty()
+            boolean allNumerical = !Utils.isEmpty(values)
                     && values.stream().allMatch(TagChecker::isNum);
             if (allNumerical) {
@@ -428 +428 @@
      */
     static boolean containsUnwantedNonPrintingControlCharacter(String s) {
-        return s != null && !s.isEmpty() && (
+        return !Utils.isEmpty(s) && (
                 isJoiningChar(s.charAt(0)) ||
                 isJoiningChar(s.charAt(s.length() - 1)) ||
@@ -640 +640 @@
                 checkSingleTagComplex(withErrors, p, key, value);
             }
-            if (checkFixmes && key != null && value != null && !value.isEmpty() && isFixme(key, value) && !withErrors.contains(p, "FIXME")) {
+            if (checkFixmes && key != null && !Utils.isEmpty(value) && isFixme(key, value) && !withErrors.contains(p, "FIXME")) {
                 errors.add(TestError.builder(this, Severity.OTHER, FIXME)
                         .message(tr("fixme"))