Changeset 13023 in josm for trunk/src

Timestamp:

2017-10-18T18:18:33+02:00 (7 years ago)

Author:

bastiK

Message:

see #15451 - fix initialization

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• data/Preferences.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -37 +37 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
@@ -115 +116 @@
      * Global application preferences
      */
-    public static final Preferences pref = new Preferences();
+    public static final Preferences pref = new Preferences(JosmBaseDirectories.getInstance());
 
     /**

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

@@ -42 +42 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.preferences.ColorInfo;
-import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
 import org.openstreetmap.josm.data.preferences.LongProperty;
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
@@ -464 +463 @@
      */
     public File getPreferenceFile() {
-        return new File(getPreferencesDirectory(false), "preferences.xml");
+        return new File(dirs.getPreferencesDirectory(false), "preferences.xml");
     }
 
@@ -472 +471 @@
      */
     public File getDefaultsCacheFile() {
-        return new File(getCacheDirectory(true), "default_preferences.xml");
+        return new File(dirs.getCacheDirectory(true), "default_preferences.xml");
     }
 
@@ -480 +479 @@
      */
     public File getPluginsDirectory() {
-        return new File(getUserDataDirectory(false), "plugins");
+        return new File(dirs.getUserDataDirectory(false), "plugins");
     }
 
@@ -519 +518 @@
     public Collection<String> getAllPossiblePreferenceDirs() {
         Set<String> locations = new HashSet<>();
-        addPossibleResourceDir(locations, getPreferencesDirectory(false).getPath());
-        addPossibleResourceDir(locations, getUserDataDirectory(false).getPath());
+        addPossibleResourceDir(locations, dirs.getPreferencesDirectory(false).getPath());
+        addPossibleResourceDir(locations, dirs.getUserDataDirectory(false).getPath());
         addPossibleResourceDir(locations, System.getenv("JOSM_RESOURCES"));
         addPossibleResourceDir(locations, System.getProperty("josm.resources"));
@@ -818 +817 @@
         initSuccessful = false;
         // get the preferences.
-        File prefDir = getPreferencesDirectory(false);
+        File prefDir = dirs.getPreferencesDirectory(false);
         if (prefDir.exists()) {
             if (!prefDir.isDirectory()) {