Changeset 1879 in josm for trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java

Timestamp:

02.08.2009 14:36:40 (3 years ago)

Author:

Gubaer

Message:

towards a fix for #3142: JOSM applet class no longer functional

File:

• trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java

@@ -66 +66 @@
     public SlippyMapChooser() {
         super();
-        cachedLoader = new OsmFileCacheTileLoader(this);
+        try {
+            cachedLoader = new OsmFileCacheTileLoader(this);
+        } catch(SecurityException e) {
+            // set to null if a SecurityException was thrown
+            // while creating the cachedLoader
+            //
+            cachedLoader = null;
+        }
         uncachedLoader = new OsmTileLoader(this);
         setZoomContolsVisible(false);
@@ -74 +81 @@
         // the area before the component has been displayed the first time
         setBounds(new Rectangle(getMinimumSize()));
-        setFileCacheEnabled(Main.pref.getBoolean("slippy_map_chooser.file_cache", true));
+        if (cachedLoader == null) {
+            setFileCacheEnabled(false);
+        } else {
+            setFileCacheEnabled(Main.pref.getBoolean("slippy_map_chooser.file_cache", true));
+        }
         setMaxTilesInMemory(Main.pref.getInteger("slippy_map_chooser.max_tiles", 1000));