Changeset 18277 in josm for trunk/src/org

Timestamp:

2021-10-17T06:10:48+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21438 - NPE (patch by marcello)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/TagChecker.java (modified) (2 diffs)
• gui/tagging/presets/TaggingPresets.java (modified) (2 diffs)

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

@@ -546 +546 @@
     private static Set<String> getPresetValues(String key) {
         Set<String> res = TaggingPresets.getPresetValues(key);
-        if (res != null)
+        if (!Utils.isEmpty(res))
             return res;
         if (additionalPresetsValueData.contains(key))
@@ -561 +561 @@
      */
     public static boolean isKeyInPresets(String key) {
-        return TaggingPresets.getPresetValues(key) != null;
+        return !Utils.isEmpty(TaggingPresets.getPresetValues(key));
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java

@@ -205 +205 @@
      * Return set of values for a key in the tagging presets
      * @param key the key
-     * @return set of values for a key in the tagging presets or null if none is found
+     * @return set of values for a key in the tagging presets
      */
     public static Set<String> getPresetValues(String key) {
@@ -211 +211 @@
         if (values != null)
             return Collections.unmodifiableSet(values);
-        return null;
+        return Collections.emptySet();
     }