Changeset 14145 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (2 diffs)

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;
         }