Changeset 14149 in josm for trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

Timestamp:

2018-08-12T17:24:32+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.pref

File:

• trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -16 +16 @@
 import org.openstreetmap.josm.actions.DeleteAction;
 import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
 import org.openstreetmap.josm.data.preferences.JosmUrls;
@@ -104 +105 @@
         System.setProperty("josm.home", josmHome);
         TimeZone.setDefault(DateUtils.UTC);
-        Config.setPreferencesInstance(Main.pref);
+        Preferences pref = Preferences.main();
+        Config.setPreferencesInstance(pref);
         Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
         Config.setUrlsProvider(JosmUrls.getInstance());
-        Main.pref.resetToInitialState();
-        Main.pref.enableSaveOnPut(false);
+        pref.resetToInitialState();
+        pref.enableSaveOnPut(false);
         I18n.init();
         // initialize the plaform hook, and
@@ -115 +117 @@
 
         Logging.setLogLevel(Logging.LEVEL_INFO);
-        Main.pref.init(false);
+        pref.init(false);
         String url = Config.getPref().get("osm-server.url");
         if (url == null || url.isEmpty() || isProductionApiUrl(url)) {