Changeset 7841 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-12-19T22:34:37+01:00 (9 years ago)

Author:

bastiK

Message:

rework command line switches to set JOSM directories:
-Djosm.pref=... - set the preferences directory
-Djosm.userdata=... - set the user data directory
-Djosm.cache=... - set the cache directory
-Djosm.home=homedir relocate all 3 directories to homedir.
Cache directory will be in homedir/cache (unless -Djosm.cache is set)
-Djosm.home has lower precedence, i.e. the specific setting overrides
the general one.

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (4 diffs)

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

@@ -94 +94 @@
      */
     private File cacheDir = null;
+    
+    /**
+     * Internal storage for the user data directory.
+     */
+    private File userdataDir = null;
 
     /**
@@ -552 +557 @@
             return preferencesDir;
         String path;
-        path = System.getProperty("josm.home");
+        path = System.getProperty("josm.pref");
         if (path != null) {
             preferencesDir = new File(path).getAbsoluteFile();
         } else {
-            preferencesDir = Main.platform.getDefaultPrefDirectory();
+            path = System.getProperty("josm.home");
+            if (path != null) {
+                preferencesDir = new File(path).getAbsoluteFile();
+            } else {
+                preferencesDir = Main.platform.getDefaultPrefDirectory();
+            }
         }
         return preferencesDir;
@@ -568 +578 @@
      */
     public File getUserDataDirectory() {
-        return Main.platform.getDefaultUserDataDirectory();
+        if (userdataDir != null)
+            return userdataDir;
+        String path;
+        path = System.getProperty("josm.userdata");
+        if (path != null) {
+            userdataDir = new File(path).getAbsoluteFile();
+        } else {
+            path = System.getProperty("josm.home");
+            if (path != null) {
+                userdataDir = new File(path).getAbsoluteFile();
+            } else {
+                userdataDir = Main.platform.getDefaultUserDataDirectory();
+            }
+        }
+        return userdataDir;
     }
 
@@ -602 +626 @@
             cacheDir = new File(path).getAbsoluteFile();
         } else {
-            path = get("cache.folder", null);
+            path = System.getProperty("josm.home");
             if (path != null) {
-                cacheDir = new File(path);
+                cacheDir = new File(path, "cache");
             } else {
-                cacheDir = Main.platform.getDefaultCacheDirectory();
+                path = get("cache.folder", null);
+                if (path != null) {
+                    cacheDir = new File(path).getAbsoluteFile();
+                } else {
+                    cacheDir = Main.platform.getDefaultCacheDirectory();
+                }
             }
         }