Changeset 12042 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2017-05-03T11:19:04+02:00 (7 years ago)

Author:

bastiK

Message:

applied #13956 - memory optimization with presets cache (patch by GerdP)

File:

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

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

@@ -69 +69 @@
     /** Normalized keys: the key should be substituted by the value if the key was not found in presets */
     private static final Map<String, String> harmonizedKeys = new HashMap<>();
-    /** The spell check preset values */
-    private static volatile MultiMap<String, String> presetsValueData;
+    /** The spell check preset values which are not stored in TaggingPresets */
+    private static volatile MultiMap<String, String> additionalPresetsValueData;
     /** The TagChecker data */
     private static final List<CheckerData> checkerData = new ArrayList<>();
@@ -259 +259 @@
         Collection<TaggingPreset> presets = TaggingPresets.getTaggingPresets();
         if (!presets.isEmpty()) {
-            presetsValueData = new MultiMap<>();
+            additionalPresetsValueData = new MultiMap<>();
             for (String a : OsmPrimitive.getUninterestingKeys()) {
-                presetsValueData.putVoid(a);
+                additionalPresetsValueData.putVoid(a);
             }
             // TODO directionKeys are no longer in OsmPrimitive (search pattern is used instead)
             for (String a : Main.pref.getCollection(ValidatorPreference.PREFIX + ".knownkeys",
                     Arrays.asList(new String[]{"is_in", "int_ref", "fixme", "population"}))) {
-                presetsValueData.putVoid(a);
+                additionalPresetsValueData.putVoid(a);
             }
             for (TaggingPreset p : presets) {
@@ -285 +285 @@
         Collection<String> values = ky.getValues();
         if (ky.key != null && values != null) {
-            presetsValueData.putAll(ky.key, values);
             harmonizedKeys.put(harmonizeKey(ky.key), ky.key);
         }
@@ -305 +304 @@
     }
 
+    private static Set<String> getPresetValues(String key) {
+        Set<String> res = TaggingPresets.getPresetValues(key);
+        if (res != null)
+            return res;
+        return additionalPresetsValueData.get(key);
+    }
+
     /**
      * Determines if the given key is in internal presets.
@@ -312 +318 @@
      */
     public static boolean isKeyInPresets(String key) {
-        return presetsValueData.get(key) != null;
+        return getPresetValues(key) != null;
     }
 
@@ -323 +329 @@
      */
     public static boolean isTagInPresets(String key, String value) {
-        final Set<String> values = presetsValueData.get(key);
+        final Set<String> values = getPresetValues(key);
         return values != null && (values.isEmpty() || values.contains(value));
     }
@@ -462 +468 @@
                 withErrors.put(p, "HTML");
             }
-            if (checkValues && key != null && value != null && !value.isEmpty() && presetsValueData != null && !isTagIgnored(key, value)) {
+            if (checkValues && key != null && value != null && !value.isEmpty() && additionalPresetsValueData != null
+                    && !isTagIgnored(key, value)) {
                 if (!isKeyInPresets(key)) {
                     String prettifiedKey = harmonizeKey(key);
@@ -487 +494 @@
                     // try to fix common typos and check again if value is still unknown
                     String fixedValue = harmonizeValue(prop.getValue());
-                    Map<String, String> possibleValues = getPossibleValues(presetsValueData.get(key));
+                    Map<String, String> possibleValues = getPossibleValues(getPresetValues(key));
                     if (possibleValues.containsKey(fixedValue)) {
                         final String newKey = possibleValues.get(fixedValue);