Changeset 7834 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-12-19T15:05:33+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10026 - use recommended user data directory on OSX (distinct from preferences directory). Linux and Windows behaviour is unchanged.

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (2 diffs)
• PlatformHook.java (modified) (1 diff)
• PlatformHookOsx.java (modified) (1 diff)
• PlatformHookUnixoid.java (modified) (2 diffs)
• PlatformHookWindows.java (modified) (1 diff)

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

@@ -880 +880 @@
             }
         }
-        // Try user-preference directory
-        String dir = Main.pref.getPreferencesDir() + "images";
+        // Try user-data directory
+        String dir = new File(Main.pref.getUserDataDirectory(), "images").getAbsolutePath();
         try {
             u = getImageUrl(dir, imageName, additionalClassLoaders);
@@ -952 +952 @@
             });
 
-            CachedFile cf = new CachedFile(base + fn).setDestDir(new File(Main.pref.getPreferencesDir(), "images").toString());
+            CachedFile cf = new CachedFile(base + fn).setDestDir(
+                    new File(Main.pref.getUserDataDirectory(), "images").getPath());
             try (InputStream is = cf.getInputStream()) {
                 parser.parse(new InputSource(is));

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

@@ -134 +134 @@
      */
     public File getDefaultPrefDirectory();
+
+    /**
+     * Returns the platform-dependent default user data directory.
+     * @return the platform-dependent default user data directory
+     * @since 7834
+     */
+    public File getDefaultUserDataDirectory();
 }

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

@@ -333 +333 @@
         return new File(System.getProperty("user.home")+"/Library/Preferences", "JOSM");
     }
+
+    @Override
+    public File getDefaultUserDataDirectory() {
+        return new File(System.getProperty("user.home")+"/Library/Application Support", "JOSM");
+    }
 }

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

@@ -373 +373 @@
     @Override
     public File getDefaultCacheDirectory() {
-        return new File(Main.pref.getPreferencesDirFile(), "cache");
+        return new File(Main.pref.getUserDataDirectory(), "cache");
     }
 
@@ -380 +380 @@
         return new File(System.getProperty("user.home"), ".josm");
     }
+
+    @Override
+    public File getDefaultUserDataDirectory() {
+        // Use preferences directory by default
+        return Main.pref.getPreferencesDirectory();
+    }
 }

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

@@ -287 +287 @@
     public File getDefaultCacheDirectory() {
         String p = System.getenv("LOCALAPPDATA");
-        if (p == null || "".equals(p)) {
+        if (p == null || p.isEmpty()) {
+            // Fallback for Windows OS earlier than Windows Vista, where the variable is not defined
             p = System.getenv("APPDATA");
         }