From 64f2ed6cfecd3bb465a07f6091b2ebbb8efeacfe Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 25 Jun 2023 10:47:52 +0200 Subject: [PATCH] Cache image data --- .../src/org/argeo/cms/swt/osgi/BundleSvgTheme.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleSvgTheme.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleSvgTheme.java index 038a1fca6..74de83e09 100644 --- a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleSvgTheme.java +++ b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/osgi/BundleSvgTheme.java @@ -26,7 +26,7 @@ import org.osgi.framework.BundleContext; public class BundleSvgTheme extends BundleCmsSwtTheme { private final static Logger logger = System.getLogger(BundleSvgTheme.class.getName()); -// private Map> imageCache = Collections.synchronizedMap(new HashMap<>()); + private Map> imageDataCache = Collections.synchronizedMap(new HashMap<>()); private Map transcoders = Collections.synchronizedMap(new HashMap<>()); @@ -64,6 +64,12 @@ public class BundleSvgTheme extends BundleCmsSwtTheme { } protected ImageData loadFromSvg(String path, int size) { + ImageData imageData = null; + if (imageDataCache.containsKey(path)) + imageData = imageDataCache.get(path).get(size); + if (imageData != null) + return imageData; + ImageTranscoder transcoder = null; synchronized (this) { transcoder = transcoders.get(size); @@ -75,7 +81,6 @@ public class BundleSvgTheme extends BundleCmsSwtTheme { transcoders.put(size, transcoder); } } - ImageData imageData; try (InputStream in = getResourceAsStream(path); ByteArrayOutputStream out = new ByteArrayOutputStream();) { if (in == null) throw new IllegalArgumentException(path + " not found"); @@ -90,6 +95,11 @@ public class BundleSvgTheme extends BundleCmsSwtTheme { throw new RuntimeException("Cannot transcode SVG " + path, e); } + // cache it + if (!imageDataCache.containsKey(path)) + imageDataCache.put(path, Collections.synchronizedMap(new HashMap<>())); + imageDataCache.get(path).put(size, imageData); + return imageData; } -- 2.30.2