Changeset 18281 in josm for trunk/src/org

Timestamp:

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

Author:

GerdP

Message:

fix #21438: NPE in AutoCompletionManager.getAllForKeys()

• fix regression introduced with r18277

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -545 +545 @@
      */
     private static Set<String> getPresetValues(String key) {
-        Set<String> res = TaggingPresets.getPresetValues(key);
-        if (!Utils.isEmpty(res))
-            return res;
+        if (TaggingPresets.isKeyInPresets(key)) {
+            return TaggingPresets.getPresetValues(key);
+        }
         if (additionalPresetsValueData.contains(key))
             return Collections.emptySet();
@@ -559 +559 @@
      * @return {@code true} if the given key is in internal presets
      * @since 9023
-     */
+     * @deprecated Use {@link TaggingPresets#isKeyInPresets(String)} instead
+     */
+    @Deprecated
     public static boolean isKeyInPresets(String key) {
-        return !Utils.isEmpty(TaggingPresets.getPresetValues(key));
+        return TaggingPresets.isKeyInPresets(key);
     }
 
@@ -883 +885 @@
             return;
         if (additionalPresetsValueData != null && !isTagIgnored(key, value)) {
-            if (!isKeyInPresets(key)) {
+            if (!TaggingPresets.isKeyInPresets(key)) {
                 spellCheckKey(withErrors, p, key);
             } else if (!isTagInPresets(key, value)) {
@@ -907 +909 @@
             fixedKey = prettifiedKey;
         } else {
-            fixedKey = isKeyInPresets(prettifiedKey) ? prettifiedKey : harmonizedKeys.get(prettifiedKey);
+            fixedKey = TaggingPresets.isKeyInPresets(prettifiedKey) ? prettifiedKey : harmonizedKeys.get(prettifiedKey);
         }
         if (fixedKey == null && ignoreDataTag.stream().anyMatch(a -> a.getKey().equals(prettifiedKey))) {

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

@@ -215 +215 @@
 
     /**
+     * Determines if the given key is in the loaded presets.
+     * @param key key
+     * @return {@code true} if the given key in the loaded presets
+     * @since xxx
+     */
+    public static boolean isKeyInPresets(String key) {
+        return PRESET_TAG_CACHE.get(key) != null;
+    }
+
+    /**
      * Replies a new collection of all presets matching the parameters.
      *