Changeset 14149 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

Timestamp:

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

Author:

Don-vip

Message:

see #15229 - deprecate Main.pref

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -130 +130 @@
             }
         });
-        readPreferences(Main.pref);
+        readPreferences(Preferences.main());
 
         applyFilter();
@@ -181 +181 @@
     private void readPreferences(Preferences tmpPrefs) {
         Map<String, Setting<?>> loaded;
-        Map<String, Setting<?>> orig = Main.pref.getAllSettings();
+        Map<String, Setting<?>> orig = Preferences.main().getAllSettings();
         Map<String, Setting<?>> defaults = tmpPrefs.getAllDefaults();
         orig.remove("osm-server.password");
         defaults.remove("osm-server.password");
-        if (tmpPrefs != Main.pref) {
+        if (tmpPrefs != Preferences.main()) {
             loaded = tmpPrefs.getAllSettings();
             // plugins preference keys may be changed directly later, after plugins are downloaded
@@ -262 +262 @@
             return;
 
-        Preferences tmpPrefs = new Preferences(Main.pref);
+        Preferences tmpPrefs = new Preferences(Preferences.main());
 
         StringBuilder log = new StringBuilder();
@@ -324 +324 @@
 
         for (Entry<String, String> e: profileTypes.entrySet()) {
-            menu.add(new ExportProfileAction(Main.pref, e.getKey(), e.getValue()));
+            menu.add(new ExportProfileAction(Preferences.main(), e.getKey(), e.getValue()));
         }
 
@@ -339 +339 @@
                         "Are you sure you want to continue?")
                         +"</html>", null, "")) {
-                    Main.pref.resetToDefault();
+                    Preferences.main().resetToDefault();
                     try {
-                        Main.pref.save();
+                        Preferences.main().save();
                     } catch (IOException | InvalidPathException e) {
                         Logging.log(Logging.LEVEL_WARN, "Exception while saving preferences:", e);
                     }
-                    readPreferences(Main.pref);
+                    readPreferences(Preferences.main());
                     applyFilter();
                 }
@@ -412 +412 @@
         @Override
         public void actionPerformed(ActionEvent ae) {
-            Preferences tmpPrefs = new Preferences(Main.pref);
+            Preferences tmpPrefs = new Preferences(Preferences.main());
             CustomConfigurator.readXML(file, tmpPrefs);
             readPreferences(tmpPrefs);
@@ -460 +460 @@
         for (PrefEntry e : allData) {
             if (e.isChanged()) {
-                Main.pref.putSetting(e.getKey(), e.getValue().getValue() == null ? null : e.getValue());
+                Preferences.main().putSetting(e.getKey(), e.getValue().getValue() == null ? null : e.getValue());
             }
         }