Ticket #19752: 19752.patch

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Optional;
+import java.util.function.Function;
 
-import org.openstreetmap.josm.data.osm.Storage;
 import org.openstreetmap.josm.tools.Pair;
 
 /**
@@ -15 +16 @@
 public final class StyleCache {
 
     // 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 HashMap<StyleCache, StyleCache> internPool = new HashMap<>();
 
     /**
      * An empty style cache entry
@@ -97 +98 @@
      * @return style cache
      */
     private StyleCache intern() {
-        return internPool.putUnique(this);
+        return internPool.computeIfAbsent(this, Function.identity());
     }
 
     /**

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

@@ -649 +649 @@
         @Override
         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;
+            });
         }
 
         @Override