Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

Timestamp:

2017-09-13T23:24:50+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - use Config.getPref() wherever possible

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -27 +27 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
 import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ListenerList;
@@ -256 +257 @@
         }
 
-        Collection<String> prefIconDirs = Main.pref.getList("mappaint.icon.sources");
+        Collection<String> prefIconDirs = Config.getPref().getList("mappaint.icon.sources");
         for (String fileset : prefIconDirs) {
             String[] a;
@@ -271 +272 @@
         }
 
-        if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
+        if (Config.getPref().getBoolean("mappaint.icon.enable-defaults", true)) {
             /* don't prefix icon path, as it should be generic */
             dirs.add("resource://images/");
@@ -299 +300 @@
         final long startTime = System.currentTimeMillis();
         source.loadStyleSource();
-        if (Main.pref.getBoolean("mappaint.auto_reload_local_styles", true) && source.isLocal()) {
+        if (Config.getPref().getBoolean("mappaint.auto_reload_local_styles", true) && source.isLocal()) {
             try {
                 Main.fileWatcher.registerSource(source);