Changeset 1018 in josm

Timestamp:

2008-10-05T12:50:00+02:00 (16 years ago)

Author:

stoecker

Message:

close bug #1628

File:

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

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

@@ -32 +32 @@
  */
 public class Preferences {
-
+    
+    /**
+    * Internal storage for the preferenced directory. 
+    * Do not access this variable directly!
+    * @see #getPreferencesDirFile()
+    */
+    private File preferencesDirFile = null;
+     
         public static interface PreferenceChangedListener {
                 void preferenceChanged(String key, String newValue);
@@ -80 +87 @@
         }
 
-        public File getPreferencesDirFile() {
-                if (System.getenv("APPDATA") != null)
-                        return new File(System.getenv("APPDATA"), "JOSM");
-                return new File(System.getProperty("user.home"), ".josm");
-        }
-        
+    public File getPreferencesDirFile() {
+        if (preferencesDirFile != null)
+            return preferencesDirFile;
+        String path;
+        path = System.getProperty("josm.home");
+        if (path != null) {
+            preferencesDirFile = new File(path);
+        } else {
+            path = System.getenv("APPDATA");
+            if (path != null) {
+                preferencesDirFile = new File(path, "JOSM");
+            } else {
+                preferencesDirFile = new File(System.getProperty("user.home"), ".josm");
+            }
+        }
+        return preferencesDirFile;
+    }
+    
         public File getPluginsDirFile() {
                 return new File(getPreferencesDirFile(), "plugins");