Changeset 14704 in josm for trunk

Timestamp:

2019-01-19T17:52:54+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17219 TagChecker.isTagInPresets() doesn't work

File:

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

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

@@ -396 +396 @@
      */
     public static boolean isKeyInPresets(String key) {
-        return getPresetValues(key) != null;
+        return TaggingPresets.getPresetValues(key) != null;
     }
 
@@ -408 +408 @@
     public static boolean isTagInPresets(String key, String value) {
         final Set<String> values = getPresetValues(key);
-        return values != null && (values.isEmpty() || values.contains(value));
+        return values != null && values.contains(value);
     }
 
@@ -451 +451 @@
     public static boolean isTagIgnored(String key, String value) {
         if (isKeyIgnored(key))
+            return true;
+        final Set<String> values = getPresetValues(key);
+        if (values != null && values.isEmpty())
             return true;
         if (!isTagInPresets(key, value)) {