Changeset 5779 in josm for trunk/src/org

Timestamp:

2013-03-15T17:29:38+01:00 (11 years ago)

Author:

akks

Message:

Allow plugins to replace default tile loader (OsmFileCacheTileLoader)
by calling TMSLayer.setCustomTileLoaderFactory

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• bbox/SlippyMapBBoxChooser.java (modified) (2 diffs)
• layer/TMSLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -32 +32 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOpenAerialTileSource;
@@ -185 +186 @@
         super();
         TMSLayer.setMaxWorkers();
-        cachedLoader = null;
-        String cachePath = TMSLayer.PROP_TILECACHE_DIR.get();
-        if (cachePath != null && !cachePath.isEmpty()) {
-            try {
-                cachedLoader = new OsmFileCacheTileLoader(this, new File(cachePath));
-            } catch (IOException e) {
-            }
-        }
+        cachedLoader = TMSLayer.loaderFactory.makeTileLoader(this);
 
         uncachedLoader = new OsmTileLoader(this);

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

@@ -118 +118 @@
     /*boolean debug = true;*/
 
+    public interface TileLoaderFactory {
+        OsmTileLoader makeTileLoader(TileLoaderListener listener);
+    }
+
     protected MemoryTileCache tileCache;
     protected TileSource tileSource;
     protected OsmTileLoader tileLoader;
-
+    
+    public static TileLoaderFactory loaderFactory = new TileLoaderFactory() {
+        @Override
+        public OsmTileLoader makeTileLoader(TileLoaderListener listener) {
+            String cachePath = TMSLayer.PROP_TILECACHE_DIR.get();
+            if (cachePath != null && !cachePath.isEmpty()) {
+                try {
+                    return new OsmFileCacheTileLoader(listener, new File(cachePath));
+                } catch (IOException e) {
+                }
+            }
+            return null;
+        }
+    };
+    
+    /**
+    * Plugins that wish to set custom tile loader should call this method
+    */
+    public static void setCustomTileLoaderFactory(TileLoaderFactory loaderFactory) {
+        TMSLayer.loaderFactory = loaderFactory;
+    }
+    
     HashSet<Tile> tileRequestsOutstanding = new HashSet<Tile>();
     @Override
@@ -380 +405 @@
         tileCache = new MemoryTileCache();
 
-        String cachePath = TMSLayer.PROP_TILECACHE_DIR.get();
-        tileLoader = null;
-        if (cachePath != null && !cachePath.isEmpty()) {
-            try {
-                tileLoader = new OsmFileCacheTileLoader(this, new File(cachePath));
-            } catch (IOException e) {
-            }
-        }
+        tileLoader = loaderFactory.makeTileLoader(this);
         if (tileLoader == null) {
             tileLoader = new OsmTileLoader(this);