Changeset 8762 in josm

Timestamp:

2015-09-17T19:12:34+02:00 (9 years ago)

Author:

wiktorn

Message:

Replace CacheFiles with JCS and remove CacheFiles

Closes: #11869

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/geoimage/ThumbsLoader.java (modified) (5 diffs)
• io/CacheFiles.java (deleted)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -9 +9 @@
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.imageio.ImageIO;
+
+import org.apache.commons.jcs.access.behavior.ICacheAccess;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.io.CacheFiles;
+import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
+import org.openstreetmap.josm.data.cache.JCSCacheManager;
 import org.openstreetmap.josm.tools.ExifReader;
 
@@ -23 +30 @@
     private GeoImageLayer layer;
     private MediaTracker tracker;
-    private CacheFiles cache;
+    private ICacheAccess<String , BufferedImageCacheEntry> cache;
     private boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false);
 
@@ -30 +37 @@
         this.data = new ArrayList<>(layer.data);
         if (!cacheOff) {
-            cache = new CacheFiles("geoimage-thumbnails", false);
-            cache.setExpire(CacheFiles.EXPIRE_NEVER, false);
-            cache.setMaxSize(120, false);
+            try {
+                cache = JCSCacheManager.getCache("geoimage-thumbnails", 0, 120, Main.pref.getCacheDirectory().getPath() + File.separator + "geoimage-thumbnails");
+            } catch (IOException e) {
+                Main.warn("Failed to initialize cache for geoimage-thumbnails");
+                Main.warn(e);
+            }
         }
     }
@@ -61 +71 @@
         final String cacheIdent = entry.getFile()+":"+maxSize;
 
-        if (!cacheOff) {
-            BufferedImage cached = cache.getImg(cacheIdent);
-            if (cached != null) {
-                Main.debug(" from cache");
-                return cached;
+        if (!cacheOff && cache != null) {
+            try {
+                BufferedImageCacheEntry cacheEntry = cache.get(cacheIdent);
+                if (cacheEntry != null && cacheEntry.getImage() != null) {
+                    Main.debug(" from cache");
+                    return cacheEntry.getImage();
+                }
+            } catch (IOException e) {
+                Main.warn(e);
             }
         }
@@ -118 +132 @@
         }
 
-        if (!cacheOff) {
-            cache.saveImg(cacheIdent, scaledBI);
+        if (!cacheOff && cache != null) {
+            try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+                ImageIO.write(scaledBI,"png", output);
+                cache.put(cacheIdent, new BufferedImageCacheEntry(output.toByteArray()));
+            } catch (IOException e) {
+                Main.warn("Failed to save geoimage thumb to cache");
+                Main.warn(e);
+            }
         }