Changeset 7829 in josm for trunk

Timestamp:

2014-12-19T03:08:43+01:00 (10 years ago)

Author:

Don-vip

Message:

see #6248, #10026 - use recommended cache directories on Windows and OSX. Linux behaviour is unchanged

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• tools/PlatformHook.java (modified) (1 diff)
• tools/PlatformHookOsx.java (modified) (1 diff)
• tools/PlatformHookUnixoid.java (modified) (1 diff)
• tools/PlatformHookWindows.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -595 +595 @@
                 cacheDirFile = new File(path);
             } else {
-                cacheDirFile = new File(getPreferencesDirFile(), "cache");
+                cacheDirFile = Main.platform.getDefaultCacheDirectory();
             }
         }

trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

@@ -120 +120 @@
     public boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
             throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException;
+
+    /**
+     * Returns the platform-dependent default cache directory.
+     * @return the platform-dependent default cache directory
+     * @since 7829
+     */
+    public File getDefaultCacheDirectory();
 }

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -323 +323 @@
         return System.getProperty("os.name") + " " + System.getProperty("os.version");
     }
+
+    @Override
+    public File getDefaultCacheDirectory() {
+        return new File(System.getProperty("user.home")+"/Library/Caches", "JOSM");
+    }
 }

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -370 +370 @@
         return false;
     }
+
+    @Override
+    public File getDefaultCacheDirectory() {
+        return new File(Main.pref.getPreferencesDirFile(), "cache");
+    }
 }

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -283 +283 @@
         return true;
     }
+
+    @Override
+    public File getDefaultCacheDirectory() {
+        return new File(System.getenv("LOCALAPPDATA")+"/JOSM", "cache");
+    }
 }