Changeset 7831 in josm for trunk

Timestamp:

2014-12-19T13:30:53+01:00 (10 years ago)

Author:

Don-vip

Message:

see #10026 - use recommended preferences directory on OSX. Linux and Windows 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

@@ -550 +550 @@
             preferencesDirFile = new File(path).getAbsoluteFile();
         } else {
-            path = System.getenv("APPDATA");
-            if (path != null) {
-                preferencesDirFile = new File(path, "JOSM");
-            } else {
-                preferencesDirFile = new File(System.getProperty("user.home"), ".josm");
-            }
+            preferencesDirFile = Main.platform.getDefaultPrefDirectory();
         }
         return preferencesDirFile;

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

@@ -127 +127 @@
      */
     public File getDefaultCacheDirectory();
+
+    /**
+     * Returns the platform-dependent default preferences directory.
+     * @return the platform-dependent default preferences directory
+     * @since 7831
+     */
+    public File getDefaultPrefDirectory();
 }

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

@@ -328 +328 @@
         return new File(System.getProperty("user.home")+"/Library/Caches", "JOSM");
     }
+
+    @Override
+    public File getDefaultPrefDirectory() {
+        return new File(System.getProperty("user.home")+"/Library/Preferences", "JOSM");
+    }
 }

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

@@ -375 +375 @@
         return new File(Main.pref.getPreferencesDirFile(), "cache");
     }
+
+    @Override
+    public File getDefaultPrefDirectory() {
+        return new File(System.getProperty("user.home"), ".josm");
+    }
 }

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

@@ -288 +288 @@
         return new File(System.getenv("LOCALAPPDATA")+"/JOSM", "cache");
     }
+
+    @Override
+    public File getDefaultPrefDirectory() {
+        return new File(System.getenv("APPDATA"), "JOSM");
+    }
 }