Changeset 4529 in josm for trunk

Timestamp:

2011-10-20T01:47:10+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #6109 and #6288 - Right Click "Flush Tile Cache" in TMS layers doesn't work anymore

File:

• trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -15 +15 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.font.TextAttribute;
-import java.awt.geom.Rectangle2D;
 import java.awt.image.ImageObserver;
 import java.io.File;
@@ -22 +20 @@
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -69 +66 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
-import org.openstreetmap.josm.tools.OpenBrowser;
 
 /**
@@ -132 +128 @@
         }*/
     }
+    
     @Override
     public TileCache getTileCache()
@@ -137 +134 @@
         return tileCache;
     }
+
     void clearTileCache()
     {
-        /*if (debug) {
-            Main.debug("clearing tile storage");
-        }*/
-        tileCache = new MemoryTileCache();
-        tileCache.setCacheSize(200);
+        tileCache.clear();
+        if (tileLoader instanceof OsmFileCacheTileLoader) {
+            ((OsmFileCacheTileLoader)tileLoader).clearCache(tileSource);
+        }
     }
 
@@ -244 +241 @@
         currentZoomLevel = getBestZoom();
 
-        clearTileCache();
+        tileCache = new MemoryTileCache();
+
         String cachePath = TMSLayer.PROP_TILECACHE_DIR.get();
         tileLoader = null;
@@ -441 +439 @@
                     @Override
                     public void actionPerformed(ActionEvent ae) {
-                        //Main.debug("flushing all tiles...");
                         clearTileCache();
-                        //Main.debug("done");
                     }
                 }));
@@ -560 +556 @@
     }
     public boolean decreaseZoomLevel() {
-        int minZoom = this.getMinZoomLvl();
+        //int minZoom = this.getMinZoomLvl();
         if (zoomDecreaseAllowed()) {
             /*if (debug) {
@@ -784 +780 @@
         // need to return *all* tiles to the callers, so force creation
         // here.
-        boolean forceTileCreation = true;
+        //boolean forceTileCreation = true;
         for (Tile tile : ts.allTilesCreate()) {
             Image img = getLoadedTileImage(tile);
@@ -842 +838 @@
         }
 
-        String tileStatus = tile.getStatus();
-        /*if (!tile.isLoaded() && PROP_DRAW_DEBUG.get()) {
+        /*String tileStatus = tile.getStatus();
+        if (!tile.isLoaded() && PROP_DRAW_DEBUG.get()) {
             myDrawString(g, tr("image " + tileStatus), p.x + 2, texty);
             texty += 1 + fontHeight;