Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/gui/GettingStarted.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/GettingStarted.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -29 +29 @@
 import org.openstreetmap.josm.io.CacheCustomContent;
 import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Logging;
@@ -95 +96 @@
             String motd = new WikiReader().readLang("StartupPage");
             // Save this to prefs in case JOSM is updated so MOTD can be refreshed
-            Main.pref.putInt("cache.motd.html.version", myVersion);
-            Main.pref.put("cache.motd.html.java", myJava);
-            Main.pref.put("cache.motd.html.lang", myLang);
+            Config.getPref().putInt("cache.motd.html.version", myVersion);
+            Config.getPref().put("cache.motd.html.java", myJava);
+            Config.getPref().put("cache.motd.html.lang", myLang);
             return motd.getBytes(StandardCharsets.UTF_8);
         }
@@ -115 +116 @@
             // 2. Cannot be written (e.g. while developing). Obviously we don't want to update
             // everytime because of something we can't read.
-            return (Main.pref.getInt("cache.motd.html.version", -999) == myVersion)
-            && Main.pref.get("cache.motd.html.java").equals(myJava)
-            && Main.pref.get("cache.motd.html.lang").equals(myLang);
+            return (Config.getPref().getInt("cache.motd.html.version", -999) == myVersion)
+            && Config.getPref().get("cache.motd.html.java").equals(myJava)
+            && Config.getPref().get("cache.motd.html.lang").equals(myLang);
         }
     }
@@ -146 +147 @@
         // Asynchronously get MOTD to speed-up JOSM startup
         Thread t = new Thread((Runnable) () -> {
-            if (!contentInitialized && Main.pref.getBoolean("help.displaymotd", true)) {
+            if (!contentInitialized && Config.getPref().getBoolean("help.displaymotd", true)) {
                 try {
                     content = new MotdContent().updateIfRequiredString();