Changeset 14632 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheSettingsPanel.java

Timestamp:

2019-01-03T20:46:14+01:00 (5 years ago)

Author:

simon04

Message:

fix #15817 - Imagery Preferences: collect all cache settings in the same tab

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheSettingsPanel.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java ) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheSettingsPanel.java

@@ -6 +6 @@
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -19 +20 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
 import javax.swing.JTable;
+import javax.swing.SpinnerNumberModel;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
@@ -29 +32 @@
 import org.apache.commons.jcs.engine.stats.behavior.IStats;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
+import org.openstreetmap.josm.data.cache.JCSCacheManager;
+import org.openstreetmap.josm.data.imagery.CachedTileLoaderFactory;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.layer.AbstractCachedTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
@@ -35 +41 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.ButtonColumn;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
@@ -41 +48 @@
 
 /**
- * Panel for cache content management.
+ * Panel for cache size, location and content management.
  *
  * @author Wiktor Niesiobędzki
  *
  */
-public class CacheContentsPanel extends JPanel {
+public class CacheSettingsPanel extends JPanel {
+
+    private final JosmTextField cacheDir = new JosmTextField(11);
+    private final JSpinner maxElementsOnDisk = new JSpinner(new SpinnerNumberModel(
+            AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get().intValue(), 0, Integer.MAX_VALUE, 1));
 
     /**
      * Creates cache content panel
      */
-    public CacheContentsPanel() {
+    public CacheSettingsPanel() {
         super(new GridBagLayout());
+
+        add(new JLabel(tr("Tile cache directory: ")), GBC.std());
+        add(GBC.glue(5, 0), GBC.std());
+        add(cacheDir, GBC.eol().fill(GBC.HORIZONTAL));
+
+        add(new JLabel(tr("Maximum size of disk cache (per imagery) in MB: ")), GBC.std());
+        add(GBC.glue(5, 0), GBC.std());
+        add(maxElementsOnDisk, GBC.eop());
+
         MainApplication.worker.submit(() -> {
             addToPanel(TMSLayer.getCache(), "TMS");
@@ -152 +172 @@
         };
     }
+
+    /**
+     * Loads the common settings.
+     */
+    void loadSettings() {
+        this.cacheDir.setText(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get());
+        this.maxElementsOnDisk.setValue(AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get());
+    }
+
+    /**
+     * Saves the common settings.
+     * @return true when restart is required
+     */
+    boolean saveSettings() {
+        boolean restartRequired = removeCacheFiles(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get(),
+                1024L * 1024L * ((Integer) this.maxElementsOnDisk.getValue()));
+
+        if (!AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.get().equals(this.maxElementsOnDisk.getValue())) {
+            AbstractCachedTileSourceLayer.MAX_DISK_CACHE_SIZE.put((Integer) this.maxElementsOnDisk.getValue());
+            restartRequired = true;
+        }
+
+
+        if (!CachedTileLoaderFactory.PROP_TILECACHE_DIR.get().equals(this.cacheDir.getText())) {
+            restartRequired = true;
+            removeCacheFiles(CachedTileLoaderFactory.PROP_TILECACHE_DIR.get(), 0); // clear old cache directory
+            CachedTileLoaderFactory.PROP_TILECACHE_DIR.put(this.cacheDir.getText());
+        }
+
+        return restartRequired;
+    }
+
+    private static boolean removeCacheFiles(String path, long maxSize) {
+        File directory = new File(path);
+        File[] cacheFiles = directory.listFiles((dir, name) -> name.endsWith(".data") || name.endsWith(".key"));
+        boolean restartRequired = false;
+        if (cacheFiles != null) {
+            for (File cacheFile: cacheFiles) {
+                if (cacheFile.length() > maxSize) {
+                    if (!restartRequired) {
+                        JCSCacheManager.shutdown(); // shutdown Cache - so files can by safely deleted
+                        restartRequired = true;
+                    }
+                    Utils.deleteFile(cacheFile);
+                    File otherFile = null;
+                    if (cacheFile.getName().endsWith(".data")) {
+                        otherFile = new File(cacheFile.getPath().replaceAll("\\.data$", ".key"));
+                    } else if (cacheFile.getName().endsWith(".key")) {
+                        otherFile = new File(cacheFile.getPath().replaceAll("\\.key$", ".data"));
+                    }
+                    if (otherFile != null) {
+                        Utils.deleteFileIfExists(otherFile);
+                    }
+                }
+            }
+        }
+        return restartRequired;
+    }
 }