Ticket #1808: josm-1808-lakewalker_cachelimit.patch

src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
 
@@ -16 +14 @@
  */
 public class LakewalkerPlugin extends Plugin {
   public LakewalkerPlugin() {
-    Main.main.menu.add(Main.main.menu.toolsMenu, new LakewalkerAction(tr("Lake Walker")));
+    MainMenu.add(Main.main.menu.toolsMenu, new LakewalkerAction(tr("Lake Walker")));
   }
 
   public PreferenceSetting getPreferenceSetting() 

src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import javax.swing.Box;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
@@ -28 +29 @@
   public static final String PREF_START_DIR = "lakewalker.startdir";
   public static final String PREF_WAYTYPE = "lakewalker.waytype";
   public static final String PREF_WMS = "lakewalker.wms";
+  public static final String PREF_MAXCACHESIZE = "lakewalker.maxcachesize";
+  public static final String PREF_MAXCACHEAGE = "lakewalker.maxcacheage";
     
   protected IntConfigurer maxSegsConfig = new IntConfigurer();
   protected JLabel maxSegsLabel = new JLabel(tr("Maximum number of segments per way"));
@@ -51 +54 @@
   protected JLabel lakeTypeLabel = new JLabel(tr("Tag ways as"));
   protected StringEnumConfigurer wmsConfig = new StringEnumConfigurer(WMSLAYERS);
   protected JLabel wmsLabel = new JLabel(tr("WMS Layer"));
+  protected IntConfigurer maxCacheSizeConfig = new IntConfigurer();
+  protected JLabel maxCacheSizeLabel = new JLabel(tr("Maximum cache size (MB)"));
+  protected IntConfigurer maxCacheAgeConfig = new IntConfigurer();
+  protected JLabel maxCacheAgeLabel = new JLabel(tr("Maximum cache age (days)"));
   
   public void addGui(PreferenceDialog gui) {
     maxSegsConfig.setToolTipText(tr("Maximum number of segments allowed in each generated way. Default 250."));
@@ -64 +71 @@
     startDirConfig.setToolTipText(tr("Direction to search for land. Default east."));
     lakeTypeConfig.setToolTipText(tr("Tag ways as water, coastline, land or nothing. Default is water."));
     wmsConfig.setToolTipText(tr("Which WMS layer to use for tracing against. Default is IR1."));
-
+    maxCacheSizeConfig.setToolTipText(tr("Maximum size of each cache directory in bytes. Default is 300MB"));
+    maxCacheAgeConfig.setToolTipText(tr("Maximum age of each cached file in days. Default is 100"));
+    
     String description = tr("An plugin to trace water bodies on Landsat imagery.");
     JPanel prefPanel = gui.createPreferenceTab("lakewalker.png", I18n.tr("Lakewalker Plugin Preferences"), description);
     buildPreferences(prefPanel);
@@ -80 +89 @@
     startDirConfig.setValue(Main.pref.get(PREF_START_DIR, "east"));
     lakeTypeConfig.setValue(Main.pref.get(PREF_WAYTYPE, "water"));
     wmsConfig.setValue(Main.pref.get(PREF_WMS, "IR1"));
+    maxCacheSizeConfig.setValue(Main.pref.getInteger(PREF_MAXCACHESIZE, 300));
+    maxCacheAgeConfig.setValue(Main.pref.getInteger(PREF_MAXCACHEAGE, 100));
   }
   
   public void buildPreferences(JPanel prefPanel) {
@@ -108 +119 @@
     prefPanel.add(lakeTypeConfig.getControls(), dataConstraints);
     prefPanel.add(wmsLabel, labelConstraints);
     prefPanel.add(wmsConfig.getControls(), dataConstraints);
+    prefPanel.add(maxCacheSizeLabel, labelConstraints);
+    prefPanel.add(maxCacheSizeConfig.getControls(), dataConstraints);
+    prefPanel.add(maxCacheAgeLabel, labelConstraints);
+    prefPanel.add(maxCacheAgeConfig.getControls(), dataConstraints);
+
+    prefPanel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
+
   }
 
   /*
@@ -125 +143 @@
     Main.pref.put(PREF_START_DIR, startDirConfig.getValueString());
     Main.pref.put(PREF_WAYTYPE, lakeTypeConfig.getValueString());
     Main.pref.put(PREF_WMS, wmsConfig.getValueString());
+    Main.pref.put(PREF_MAXCACHESIZE, maxCacheSizeConfig.getValueString());
+    Main.pref.put(PREF_MAXCACHEAGE, maxCacheAgeConfig.getValueString());
   }
   
-}
- No newline at end of file
+}

src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java

@@ -49 +49 @@
   protected Collection<Command> commands = new LinkedList<Command>();
   protected Collection<Way> ways = new ArrayList<Way>();
 
-  /** maximum size in bytes for the sum of all tiles in a WMS-layer cache directory. */
-  private static final long MAXCACHESIZE = 20*1024*1024*1024;
-
-  /** maximum age in ms since epoch for tiles in a WMS-layer cache directory. */
-  private static final long MAXCACHEAGE = 3650*24*60*60*1000;
-  
   public LakewalkerAction(String name) {
     super(name, "lakewalker-sml", tr("Lake Walker."),
     Shortcut.registerShortcut("tools:lakewalker", tr("Tool: {0}", tr("Lake Walker")),
@@ -99 +93 @@
    * size/age limit is on a per folder basis.
    */
   private void cleanupCache() {
+          final long maxCacheAge = System.currentTimeMillis()-Main.pref.getInteger(LakewalkerPreferences.PREF_MAXCACHEAGE, 100)*24*60*60*1000L;
+          final long maxCacheSize = Main.pref.getInteger(LakewalkerPreferences.PREF_MAXCACHESIZE, 300)*1024*1024;
 
           for (String wmsFolder : LakewalkerPreferences.WMSLAYERS) {
                   String wmsCacheDirName = Main.pref.getPreferencesDir()+"plugins/Lakewalker/"+wmsFolder;
@@ -116 +112 @@
                           
                           // delete aged or oversized, keep newest. Once size/age limit was reached delete all older files
                           long folderSize = 0;
-                          long timeDefiningOverage = System.currentTimeMillis()-MAXCACHEAGE;
                           boolean quickdelete = false;
                           for (File cacheEntry : wmsCache) {
                                   if (!cacheEntry.isFile()) continue;
@@ -122 +117 @@
                                   if (!cacheEntry.isFile()) continue;
                                   if (!quickdelete) {
                                           folderSize += cacheEntry.length();
-                                          if (folderSize > MAXCACHESIZE) {
-                                                  quickdelete = true;
-                                          } else if (cacheEntry.lastModified() < timeDefiningOverage) {
+                                          if ((folderSize > maxCacheSize) || (cacheEntry.lastModified() < maxCacheAge)) {
                                                   quickdelete = true;
                                           }
                                   }