Changeset 17369 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2020-11-27T22:45:55+01:00 (3 years ago)

Author:

simon04

Message:

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

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (11 diffs)
• ImageResource.java (modified) (10 diffs)

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

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

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

@@ -5 +5 @@
 import java.awt.Image;
 import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.function.Supplier;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.swing.AbstractAction;
@@ -18 +15 @@
 import javax.swing.JPanel;
 import javax.swing.UIManager;
-
-import org.apache.commons.jcs3.access.behavior.ICacheAccess;
-import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
-import org.openstreetmap.josm.data.cache.JCSCacheManager;
 
 import com.kitfox.svg.SVGDiagram;
@@ -36 +29 @@
 
     /**
-     * Caches the image data for resized versions of the same image.
-     * Depending on {@link JCSCacheManager#USE_IMAGE_RESOURCE_CACHE}, a combined memory/disk, or an in-memory-cache is used.
-     */
-    private static final ICacheAccess<String, BufferedImageCacheEntry> imgCache = JCSCacheManager.getImageResourceCache();
-
-    private final String cacheKey;
+     * Caches the image data for resized versions of the same image. The key is obtained using {@link ImageResizeMode#cacheKey(Dimension)}.
+     */
+    private final Map<Integer, BufferedImage> imgCache = new ConcurrentHashMap<>(4);
     /**
      * SVG diagram information in case of SVG vector image.
@@ -47 +37 @@
     private SVGDiagram svg;
     /**
-     * Supplier for SVG diagram information in case of possibly cached SVG vector image.
-     */
-    private Supplier<SVGDiagram> svgSupplier;
-    /**
      * Use this dimension to request original file dimension.
      */
@@ -69 +55 @@
     /**
      * Constructs a new {@code ImageResource} from an image.
-     * @param cacheKey the caching identifier of the image
      * @param img the image
      */
-    public ImageResource(String cacheKey, Image img) {
-        this.cacheKey = Objects.requireNonNull(cacheKey);
-        this.baseImage = Objects.requireNonNull(img);
+    public ImageResource(Image img) {
+        CheckParameterUtil.ensureParameterNotNull(img);
+        baseImage = img;
     }
 
     /**
      * Constructs a new {@code ImageResource} from SVG data.
-     * @param cacheKey the caching identifier of the image
      * @param svg SVG data
      */
-    public ImageResource(String cacheKey, SVGDiagram svg) {
-        this.cacheKey = Objects.requireNonNull(cacheKey);
-        this.svg = Objects.requireNonNull(svg);
-    }
-
-    public ImageResource(String cacheKey, Supplier<SVGDiagram> svgSupplier) {
-        this.cacheKey = Objects.requireNonNull(cacheKey);
-        this.svgSupplier = Objects.requireNonNull(svgSupplier);
+    public ImageResource(SVGDiagram svg) {
+        CheckParameterUtil.ensureParameterNotNull(svg);
+        this.svg = svg;
     }
 
@@ -99 +78 @@
      */
     public ImageResource(ImageResource res, List<ImageOverlay> overlayInfo) {
-        this.cacheKey = res.cacheKey;
         this.svg = res.svg;
-        this.svgSupplier = res.svgSupplier;
         this.baseImage = res.baseImage;
         this.overlayInfo = overlayInfo;
@@ -180 +157 @@
     ImageIcon getImageIcon(Dimension dim, boolean multiResolution, ImageResizeMode resizeMode) {
         return getImageIconAlreadyScaled(GuiSizesHelper.getDimensionDpiAdjusted(dim), multiResolution, false, resizeMode);
-    }
-
-    private BufferedImage getImageFromCache(String cacheKey) {
-        try {
-            BufferedImageCacheEntry image = imgCache.get(cacheKey);
-            if (image == null || image.getImage() == null) {
-                return null;
-            }
-            Logging.trace("{0} is in cache :-)", cacheKey);
-            return image.getImage();
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
     }
 
@@ -217 +181 @@
             resizeMode = ImageResizeMode.BOUNDED;
         }
-        final String cacheKey = String.format(Locale.ROOT, "%s--%s--%d--%d",
-                this.cacheKey, resizeMode.name(), dim.width, dim.height);
-        BufferedImage img = getImageFromCache(cacheKey);
+        final int cacheKey = resizeMode.cacheKey(dim);
+        BufferedImage img = imgCache.get(cacheKey);
         if (img == null) {
-            if (svgSupplier != null) {
-                svg = svgSupplier.get();
-                Logging.trace("{0} is not in cache :-(", cacheKey);
-                svgSupplier = null;
-            }
             if (svg != null) {
                 img = ImageProvider.createImageFromSvg(svg, dim, resizeMode);
@@ -253 +211 @@
                 disabledIcon.paintIcon(new JPanel(), img.getGraphics(), 0, 0);
             }
-            if (img == null) {
-                return null;
-            }
-            BufferedImageCacheEntry cacheEntry = BufferedImageCacheEntry.pngEncoded(img);
-            Logging.trace("Storing {0} ({1} bytes) in cache...", cacheKey, cacheEntry.getContent().length);
-            imgCache.put(cacheKey, cacheEntry);
+            imgCache.put(cacheKey, img);
         }
 
@@ -298 +251 @@
     }
 
-    static String statistics() {
-        return String.format("ImageResource cache: [%s]", imgCache.getStatistics());
-    }
-
     @Override
     public String toString() {