Changeset 17364 in josm for trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

Timestamp:

2020-11-26T22:24:27+01:00 (3 years ago)

Author:

simon04

Message:

see #20141 - ImageProvider: cache rendered SVG images using JCS

This experimental feature is disabled by default. Set the advanced preference jcs.cache.use_image_resource_cache=true to enable. No cache eviction for altered images is implemented at the moment.

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (11 diffs)

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

@@ -954 +954 @@
                         continue;
                     }
-                    ir = getIfAvailableLocalURL(path, type);
+                    ir = getIfAvailableLocalURL(subdir + name, path, type);
                     if (ir != null) {
                         cache.put(cacheName, ir);
@@ -984 +984 @@
                     svg = getSvgUniverse().getDiagram(uri);
                 }
-                return svg == null ? null : new ImageResource(svg);
+                return svg == null ? null : new ImageResource(url, svg);
             case OTHER:
                 BufferedImage img = null;
@@ -992 +992 @@
                     Logging.log(Logging.LEVEL_WARN, "Exception while reading HTTP image:", e);
                 }
-                return img == null ? null : new ImageResource(img);
+                return img == null ? null : new ImageResource(url, img);
             default:
                 throw new AssertionError("Unsupported type: " + type);
@@ -1041 +1041 @@
                     return null;
                 }
-                return new ImageResource(svg);
+                return new ImageResource(url, svg);
             } else {
                 try {
@@ -1050 +1050 @@
                     // CHECKSTYLE.ON: LineLength
                     Image img = read(new ByteArrayInputStream(bytes), false, true);
-                    return img == null ? null : new ImageResource(img);
+                    return img == null ? null : new ImageResource(url, img);
                 } catch (IOException | UnsatisfiedLinkError e) {
                     Logging.log(Logging.LEVEL_WARN, "Exception while reading image:", e);
@@ -1125 +1125 @@
                             svg = getSvgUniverse().getDiagram(uri);
                         }
-                        return svg == null ? null : new ImageResource(svg);
+                        return svg == null ? null : new ImageResource(fullName, svg);
                     case OTHER:
                         while (size > 0) {
@@ -1138 +1138 @@
                             Logging.warn(e);
                         }
-                        return img == null ? null : new ImageResource(img);
+                        return img == null ? null : new ImageResource(fullName, img);
                     default:
                         throw new AssertionError("Unknown ImageType: "+type);
@@ -1157 +1157 @@
      * @return the requested image or null if the request failed
      */
-    private static ImageResource getIfAvailableLocalURL(URL path, ImageType type) {
+    private static ImageResource getIfAvailableLocalURL(String cacheKey, URL path, ImageType type) {
         switch (type) {
         case SVG:
-            SVGDiagram svg = null;
-            synchronized (getSvgUniverse()) {
-                try {
-                    URI uri = null;
+            return new ImageResource(cacheKey, () -> {
+                synchronized (getSvgUniverse()) {
                     try {
-                        uri = getSvgUniverse().loadSVG(path);
-                    } catch (InvalidPathException e) {
-                        Logging.error("Cannot open {0}: {1}", path, e.getMessage());
-                        Logging.trace(e);
+                        URI uri = null;
+                        try {
+                            uri = getSvgUniverse().loadSVG(path);
+                        } catch (InvalidPathException e) {
+                            Logging.error("Cannot open {0}: {1}", path, e.getMessage());
+                            Logging.trace(e);
+                        }
+                        if (uri == null && "jar".equals(path.getProtocol())) {
+                            URL betterPath = Utils.betterJarUrl(path);
+                            if (betterPath != null) {
+                                uri = getSvgUniverse().loadSVG(betterPath);
+                            }
+                        }
+                        return getSvgUniverse().getDiagram(uri);
+                    } catch (SecurityException | IOException e) {
+                        Logging.log(Logging.LEVEL_WARN, "Unable to read SVG", e);
                     }
-                    if (uri == null && "jar".equals(path.getProtocol())) {
-                        URL betterPath = Utils.betterJarUrl(path);
-                        if (betterPath != null) {
-                            uri = getSvgUniverse().loadSVG(betterPath);
-                        }
-                    }
-                    svg = getSvgUniverse().getDiagram(uri);
-                } catch (SecurityException | IOException e) {
-                    Logging.log(Logging.LEVEL_WARN, "Unable to read SVG", e);
-                }
-            }
-            return svg == null ? null : new ImageResource(svg);
+                }
+                return null;
+            });
         case OTHER:
             BufferedImage img = null;
@@ -1196 +1197 @@
                 Logging.debug(e);
             }
-            return img == null ? null : new ImageResource(img);
+            return img == null ? null : new ImageResource(path.toString(), img);
         default:
             throw new AssertionError();
@@ -1394 +1395 @@
      */
     public static Image createBoundedImage(Image img, int maxSize) {
-        return new ImageResource(img).getImageIconBounded(new Dimension(maxSize, maxSize)).getImage();
+        return new ImageResource(img.toString(), img).getImageIconBounded(new Dimension(maxSize, maxSize)).getImage();
     }
 
@@ -1933 +1934 @@
     }
 
+    /**
+     * Prints statistics concerning the image loading caches.
+     */
+    public static void printStatistics() {
+        Logging.info(getSvgUniverse().statistics());
+        Logging.info(ImageResource.statistics());
+    }
+
     @Override
     public String toString() {