Changeset 4829 in josm for trunk

Timestamp:

2012-01-20T20:26:46+01:00 (13 years ago)

Author:

bastiK

Message:

fixed #7291 - Can't use WMS layer in 4818

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

@@ -53 +53 @@
     //TODO Do loading from partial cache and downloading at the same time, don't wait for partical cache to load
 
-    private static final StringProperty PROP_CACHE_PATH = new StringProperty("imagery.wms-cache.path", new File(Main.pref.getCacheDirectory(), "wms").getPath());
+    private static final StringProperty PROP_CACHE_PATH = new StringProperty("imagery.wms-cache.path", "wms");
     private static final String INDEX_FILENAME = "index.xml";
     private static final String LAYERS_INDEX_FILENAME = "layers.properties";
@@ -98 +98 @@
     protected String cacheDirPath() {
         String cPath = PROP_CACHE_PATH.get();
-        if (!(cPath.startsWith("/") || cPath.startsWith(":/",1))) {
-            //Not an absolute path
-            cPath = Main.pref.getCacheDirectory() + cPath;
+        if (!(new File(cPath).isAbsolute())) {
+            cPath = Main.pref.getCacheDirectory() + File.separator + cPath;
         }
         return cPath;