Changeset 6042 in josm for trunk/src/org

Timestamp:

2013-06-29T09:29:40+02:00 (11 years ago)

Author:

akks

Message:

fix #8200: NPE when flushing tile cache, allow cleaning different types of TileLoader

File:

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

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

@@ -44 +44 @@
 import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
 import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader;
-import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader.TileClearController;
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileClearController;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
@@ -229 +230 @@
     void clearTileCache(ProgressMonitor monitor) {
         tileCache.clear();
-        if (tileLoader instanceof OsmFileCacheTileLoader) {
-            ((OsmFileCacheTileLoader)tileLoader).clearCache(tileSource, new TmsTileClearController(monitor));
+        if (tileLoader instanceof CachedTileLoader) {
+            ((CachedTileLoader)tileLoader).clearCache(tileSource, new TmsTileClearController(monitor));
         }
     }