Changeset 17101 in josm for trunk/src

Timestamp:

2020-10-07T20:01:13+02:00 (4 years ago)

Author:

simon04

Message:

fix #19752 - StyleCache.intern: use HashMap instead of Storage

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• StyleCache.java (modified) (3 diffs)
• mapcss/Selector.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

@@ -3 +3 @@
 
 import java.util.Arrays;
+import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 
-import org.openstreetmap.josm.data.osm.Storage;
 import org.openstreetmap.josm.tools.Pair;
 
@@ -16 +18 @@
 
     // TODO: clean up the intern pool from time to time (after purge or layer removal)
-    private static final Storage<StyleCache> internPool = new Storage<>();
+    private static final Map<StyleCache, StyleCache> internPool = new ConcurrentHashMap<>();
 
     /**
@@ -98 +100 @@
      */
     private StyleCache intern() {
-        return internPool.putUnique(this);
+        return internPool.computeIfAbsent(this, Function.identity());
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -653 +653 @@
         public boolean matches(Environment env) {
             CheckParameterUtil.ensureParameterNotNull(env, "env");
-            for (Condition c : conds) {
+            return conds.stream().allMatch(c -> {
                 try {
-                    if (!c.applies(env)) return false;
+                    return c.applies(env);
                 } catch (PatternSyntaxException e) {
                     Logging.log(Logging.LEVEL_ERROR, "PatternSyntaxException while applying condition" + c + ':', e);
                     return false;
                 }
-            }
-            return true;
+            });
         }