Changeset 12855 in josm for trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

Timestamp:

2017-09-14T14:39:53+02:00 (7 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/gui/io/CustomConfigurator.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -425 +425 @@
         String dir;
         if ("prefs".equals(base) || base.isEmpty()) {
-            dir = Main.pref.getPreferencesDirectory().getAbsolutePath();
+            dir = Config.getDirs().getPreferencesDirectory().getAbsolutePath();
         } else if ("cache".equals(base)) {
-            dir = Main.pref.getCacheDirectory().getAbsolutePath();
+            dir = Config.getDirs().getCacheDirectory().getAbsolutePath();
         } else if ("plugins".equals(base)) {
             dir = Main.pref.getPluginsDirectory().getAbsolutePath();
@@ -477 +477 @@
                 engine.eval("API={}; API.pref={}; API.fragments={};");
 
-                engine.eval("homeDir='"+normalizeDirName(Main.pref.getPreferencesDirectory().getAbsolutePath()) +"';");
+                engine.eval("homeDir='"+normalizeDirName(Config.getDirs().getPreferencesDirectory().getAbsolutePath()) +"';");
                 engine.eval("josmVersion="+Version.getInstance().getVersion()+';');
                 String className = CustomConfigurator.class.getName();