Changeset 14149 in josm for trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.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/testutils/JOSMTestRules.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -26 +26 @@
 import org.openstreetmap.josm.actions.DeleteAction;
 import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.UserIdentityManager;
 import org.openstreetmap.josm.data.Version;
@@ -418 +419 @@
         }
 
-        Config.setPreferencesInstance(Main.pref);
+        Preferences pref = Preferences.main();
+        Config.setPreferencesInstance(pref);
         Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
         Config.setUrlsProvider(JosmUrls.getInstance());
@@ -449 +451 @@
         if (usePreferences) {
             @SuppressWarnings("unchecked")
-            final Map<String, Setting<?>> defaultsMap = (Map<String, Setting<?>>) TestUtils.getPrivateField(Main.pref, "defaultsMap");
+            final Map<String, Setting<?>> defaultsMap = (Map<String, Setting<?>>) TestUtils.getPrivateField(pref, "defaultsMap");
             defaultsMap.clear();
-            Main.pref.resetToInitialState();
-            Main.pref.enableSaveOnPut(false);
+            pref.resetToInitialState();
+            pref.enableSaveOnPut(false);
             // No pref init -> that would only create the preferences file.
             // We force the use of a wrong API server, just in case anyone attempts an upload
@@ -543 +545 @@
         MemoryManagerTest.resetState(true);
         cleanLayerEnvironment();
-        Main.pref.resetToInitialState();
+        Preferences.main().resetToInitialState();
         System.gc();
     }
@@ -584 +586 @@
         // TODO: Remove global listeners and other global state.
         ProjectionRegistry.clearProjectionChangeListeners();
-        Main.pref.resetToInitialState();
+        Preferences.main().resetToInitialState();
 
         if (this.assumeRevisionString != null && this.originalVersion != null) {