Changeset 14238 in josm for trunk/src

Timestamp:

2018-09-09T23:10:41+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16510 - improve performance of Ctrl-A by caching icons used to display OSM primitive types

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmUtils.java (modified) (2 diffs)
• tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java

@@ -7 +7 @@
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
@@ -165 +164 @@
      */
     public static boolean isOsmCollectionEditable(Collection<? extends IPrimitive> collection) {
-        return collection != null && !collection.isEmpty()
-            && collection.stream().map(IPrimitive::getDataSet).filter(Objects::nonNull).noneMatch(OsmData::isLocked);
+        if (collection == null || collection.isEmpty()) {
+            return false;
+        }
+        // see #16510: optimization: only consider the first primitive, as collection always refer to the same dataset
+        OsmData<?, ?, ?, ?> ds = collection.iterator().next().getDataSet();
+        return ds == null || !ds.isLocked();
     }
 }

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -34 +34 @@
 import java.util.Base64;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -270 +271 @@
     }
 
+    /** small cache of critical images used in many parts of the application */
+    private static final Map<OsmPrimitiveType, ImageIcon> osmPrimitiveTypeCache = Collections.synchronizedMap(new HashMap<>());
+
     /** directories in which images are searched */
     protected Collection<String> dirs;
@@ -1474 +1478 @@
     public static ImageIcon get(OsmPrimitiveType type) {
         CheckParameterUtil.ensureParameterNotNull(type, "type");
-        return get("data", type.getAPIName());
+        return osmPrimitiveTypeCache.computeIfAbsent(type, t -> get("data", t.getAPIName()));
     }