Changeset 12855 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2017-09-14T14:39:53+02:00 (2 years ago)

Author:

bastiK

Message:

see #15229 - add separate interface IBaseDirectories to look up pref, user data and cache dir

File:

• trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -38 +38 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.PlatformHookUnixoid;
@@ -230 +231 @@
         final String propJavaHome = System.getProperty("java.home");
         final String propJavaHomeAlt = "<java.home>";
-        final String prefDir = Main.pref.getPreferencesDirectory().toString();
+        final String prefDir = Config.getDirs().getPreferencesDirectory().toString();
         final String prefDirAlt = "<josm.pref>";
-        final String userDataDir = Main.pref.getUserDataDirectory().toString();
+        final String userDataDir = Config.getDirs().getUserDataDirectory().toString();
         final String userDataDirAlt = "<josm.userdata>";
-        final String userCacheDir = Main.pref.getCacheDirectory().toString();
+        final String userCacheDir = Config.getDirs().getCacheDirectory().toString();
         final String userCacheDirAlt = "<josm.cache>";
         final String userHomeDir = System.getProperty("user.home");