Changeset 14145 in josm

Timestamp:

2018-08-12T14:52:47+02:00 (6 years ago)

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• plugins/PluginInformation.java (modified) (2 diffs)
• tools/ImageProvider.java (modified) (2 diffs)

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

@@ -275 +275 @@
      * @return A set of all existing directories where resources could be stored.
      */
-    public Collection<String> getAllPossiblePreferenceDirs() {
+    public static Collection<String> getAllPossiblePreferenceDirs() {
         Set<String> locations = new HashSet<>();
-        addPossibleResourceDir(locations, dirs.getPreferencesDirectory(false).getPath());
-        addPossibleResourceDir(locations, dirs.getUserDataDirectory(false).getPath());
+        addPossibleResourceDir(locations, Config.getDirs().getPreferencesDirectory(false).getPath());
+        addPossibleResourceDir(locations, Config.getDirs().getUserDataDirectory(false).getPath());
         addPossibleResourceDir(locations, getSystemEnv("JOSM_RESOURCES"));
         addPossibleResourceDir(locations, getSystemProperty("josm.resources"));

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -26 +26 @@
 import javax.swing.ImageIcon;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -416 +416 @@
      */
     public static Collection<String> getPluginLocations() {
-        Collection<String> locations = Main.pref.getAllPossiblePreferenceDirs();
+        Collection<String> locations = Preferences.getAllPossiblePreferenceDirs();
         Collection<String> all = new ArrayList<>(locations.size());
         for (String s : locations) {

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

@@ -61 +61 @@
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -1244 +1244 @@
 
         // Try all other resource directories
-        if (Main.pref != null) {
-            for (String location : Main.pref.getAllPossiblePreferenceDirs()) {
-                u = getImageUrl(location + "images", imageName);
-                if (u != null)
-                    return u;
-                u = getImageUrl(location, imageName);
-                if (u != null)
-                    return u;
-            }
+        for (String location : Preferences.getAllPossiblePreferenceDirs()) {
+            u = getImageUrl(location + "images", imageName);
+            if (u != null)
+                return u;
+            u = getImageUrl(location, imageName);
+            if (u != null)
+                return u;
         }