Changeset 11188 in josm for trunk/src/org/openstreetmap/josm/gui/bbox

Timestamp:

2016-10-30T00:11:11+02:00 (7 years ago)

Author:

wiktorn

Message:

Allow working on readonly JOSM Home

Return null CachedTileLoaderFactory when cache creation fails.
Adapt SlippyMapBBoxChooser so it uses un-cached loader when cached is unavailable.

Closes: #13786

File:

• trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (modified) (3 diffs)

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

@@ -39 +39 @@
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
+import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.layer.AbstractCachedTileSourceLayer;
@@ -128 +129 @@
         headers.put("User-Agent", Version.getInstance().getFullAgentString());
 
-        cachedLoader = AbstractCachedTileSourceLayer.getTileLoaderFactory("TMS", TMSCachedTileLoader.class).makeTileLoader(this, headers);
+        TileLoaderFactory cachedLoaderFactory = AbstractCachedTileSourceLayer.getTileLoaderFactory("TMS", TMSCachedTileLoader.class);
+        if (cachedLoaderFactory != null) {
+            cachedLoader = cachedLoaderFactory.makeTileLoader(this, headers);
+        } else {
+            cachedLoader = null;
+        }
 
         uncachedLoader = new OsmTileLoader(this);
@@ -206 +212 @@
 
     public final void setFileCacheEnabled(boolean enabled) {
-        if (enabled) {
+        if (enabled && cachedLoader != null) {
             setTileLoader(cachedLoader);
         } else {