Changeset 14148 in josm

Timestamp:

2018-08-12T15:37:38+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - code refactoring - make Preferences.getJOSMDirectoryBaseName() static

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• tools/PlatformHookOsx.java (modified) (4 diffs)
• tools/PlatformHookUnixoid.java (modified) (5 diffs)
• tools/PlatformHookWindows.java (modified) (2 diffs)

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

@@ -219 +219 @@
      * @return the base name of the JOSM directories for preferences, cache and user data
      */
-    public String getJOSMDirectoryBaseName() {
+    public static String getJOSMDirectoryBaseName() {
         String name = getSystemProperty("josm.dir.name");
         if (name != null)

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

@@ -30 +30 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend;
 
@@ -423 +424 @@
     public File getDefaultCacheDirectory() {
         return new File(getSystemProperty("user.home")+"/Library/Caches",
-                Main.pref.getJOSMDirectoryBaseName());
+                Preferences.getJOSMDirectoryBaseName());
     }
 
@@ -429 +430 @@
     public File getDefaultPrefDirectory() {
         return new File(getSystemProperty("user.home")+"/Library/Preferences",
-                Main.pref.getJOSMDirectoryBaseName());
+                Preferences.getJOSMDirectoryBaseName());
     }
 
@@ -435 +436 @@
     public File getDefaultUserDataDirectory() {
         return new File(getSystemProperty("user.home")+"/Library",
-                Main.pref.getJOSMDirectoryBaseName());
+                Preferences.getJOSMDirectoryBaseName());
     }
 

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

@@ -30 +30 @@
 import java.util.concurrent.ExecutionException;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -349 +349 @@
      */
     private static File getDotDirectory() {
-        String dirName = "." + Main.pref.getJOSMDirectoryBaseName().toLowerCase(Locale.ENGLISH);
+        String dirName = "." + Preferences.getJOSMDirectoryBaseName().toLowerCase(Locale.ENGLISH);
         return new File(getSystemProperty("user.home"), dirName);
     }
@@ -370 +370 @@
             String xdgCacheDir = getSystemEnv("XDG_CACHE_HOME");
             if (xdgCacheDir != null && !xdgCacheDir.isEmpty()) {
-                return new File(xdgCacheDir, Main.pref.getJOSMDirectoryBaseName());
+                return new File(xdgCacheDir, Preferences.getJOSMDirectoryBaseName());
             } else {
                 return new File(getSystemProperty("user.home") + File.separator +
-                        ".cache" + File.separator + Main.pref.getJOSMDirectoryBaseName());
+                        ".cache" + File.separator + Preferences.getJOSMDirectoryBaseName());
             }
         }
@@ -385 +385 @@
             String xdgConfigDir = getSystemEnv("XDG_CONFIG_HOME");
             if (xdgConfigDir != null && !xdgConfigDir.isEmpty()) {
-                return new File(xdgConfigDir, Main.pref.getJOSMDirectoryBaseName());
+                return new File(xdgConfigDir, Preferences.getJOSMDirectoryBaseName());
             } else {
                 return new File(getSystemProperty("user.home") + File.separator +
-                        ".config" + File.separator + Main.pref.getJOSMDirectoryBaseName());
+                        ".config" + File.separator + Preferences.getJOSMDirectoryBaseName());
             }
         }
@@ -400 +400 @@
             String xdgDataDir = getSystemEnv("XDG_DATA_HOME");
             if (xdgDataDir != null && !xdgDataDir.isEmpty()) {
-                return new File(xdgDataDir, Main.pref.getJOSMDirectoryBaseName());
+                return new File(xdgDataDir, Preferences.getJOSMDirectoryBaseName());
             } else {
                 return new File(getSystemProperty("user.home") + File.separator +
-                        ".local" + File.separator + "share" + File.separator + Main.pref.getJOSMDirectoryBaseName());
+                        ".local" + File.separator + "share" + File.separator + Preferences.getJOSMDirectoryBaseName());
             }
         }

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

@@ -78 +78 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.StructUtils.StructEntry;
@@ -484 +485 @@
             p = getSystemEnv("APPDATA");
         }
-        return new File(new File(p, Main.pref.getJOSMDirectoryBaseName()), "cache");
+        return new File(new File(p, Preferences.getJOSMDirectoryBaseName()), "cache");
     }
 
     @Override
     public File getDefaultPrefDirectory() {
-        return new File(getSystemEnv("APPDATA"), Main.pref.getJOSMDirectoryBaseName());
+        return new File(getSystemEnv("APPDATA"), Preferences.getJOSMDirectoryBaseName());
     }