Changeset 7911 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2014-12-30T11:03:41+01:00 (9 years ago)

Author:

bastiK

Message:

see #9813 - activate new TMS cache

File:

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

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

@@ -112 +112 @@
     public static final StringProperty PROP_TILECACHE_DIR;
 
-    private static final boolean newcache = Main.pref.getBoolean("tms.newcache");
-
     static {
         String defPath = null;
         try {
-            if (newcache) {
-                defPath = new File(Main.pref.getCacheDirectory(), "tms").getAbsolutePath();
-            } else {
-                defPath = OsmFileCacheTileLoader.getDefaultCacheDir().getAbsolutePath();
-            }
+            defPath = new File(Main.pref.getCacheDirectory(), "tms").getAbsolutePath();
         } catch (SecurityException e) {
             Main.warn(e);
         }
-        PROP_TILECACHE_DIR = new StringProperty(PREFERENCE_PREFIX + (newcache ? ".tilecache" : ".tilecache_path"), defPath);
+        PROP_TILECACHE_DIR = new StringProperty(PREFERENCE_PREFIX + ".tilecache", defPath);
     }
 
@@ -143 +137 @@
                 try {
                     OsmFileCacheTileLoader loader;
-                    if (newcache) {
-                        loader = new TMSFileCacheTileLoader(listener, new File(cachePath));
-                    } else {
-                        loader = new OsmFileCacheTileLoader(listener, new File(cachePath));
-                    }
+                    loader = new TMSFileCacheTileLoader(listener, new File(cachePath));
                     loader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
                     return loader;