Changeset 14149 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

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

Author:

Don-vip

Message:

see #15229 - deprecate Main.pref

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (5 diffs)
• MainTermination.java (modified) (2 diffs)
• io/CustomConfigurator.java (modified) (5 diffs)
• preferences/advanced/AdvancedPreference.java (modified) (7 diffs)
• preferences/display/ColorPreference.java (modified) (2 diffs)
• preferences/plugin/PluginPreference.java (modified) (5 diffs)

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

@@ -83 +83 @@
 import org.openstreetmap.josm.command.SplitWayCommand;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueListener;
@@ -819 +820 @@
         PlatformManager.getPlatform().preStartupHook();
 
-        Config.setPreferencesInstance(Main.pref);
+        Preferences prefs = Preferences.main();
+        Config.setPreferencesInstance(prefs);
         Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
         Config.setUrlsProvider(JosmUrls.getInstance());
@@ -843 +845 @@
 
         try {
-            Main.pref.init(args.hasOption(Option.RESET_PREFERENCES));
+            Preferences.main().init(args.hasOption(Option.RESET_PREFERENCES));
         } catch (SecurityException e) {
             Logging.log(Logging.LEVEL_ERROR, "Unable to initialize preferences", e);
         }
 
-        args.getPreferencesToSet().forEach(Main.pref::put);
+        args.getPreferencesToSet().forEach(prefs::put);
 
         if (!language.isPresent()) {
@@ -854 +856 @@
         }
         updateSystemProperties();
-        Main.pref.addPreferenceChangeListener(new PreferenceChangedListener() {
+        Preferences.main().addPreferenceChangeListener(new PreferenceChangedListener() {
             @Override
             public void preferenceChanged(PreferenceChangeEvent e) {
@@ -887 +889 @@
 
         if (args.hasOption(Option.LOAD_PREFERENCES)) {
-            XMLCommandProcessor config = new XMLCommandProcessor(Main.pref);
+            XMLCommandProcessor config = new XMLCommandProcessor(prefs);
             for (String i : args.get(Option.LOAD_PREFERENCES)) {
                 try {

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

@@ -8 +8 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.cache.JCSCacheManager;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -48 +48 @@
         ImageProvider.shutdown(false);
         try {
-            Main.pref.saveDefaults();
+            Preferences.main().saveDefaults();
         } catch (IOException | InvalidPathException ex) {
             Logging.log(Logging.LEVEL_WARN, tr("Failed to save default preferences."), ex);

trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -100 +100 @@
      */
     public static void readXML(File file) {
-        readXML(file, Main.pref);
+        readXML(file, Preferences.main());
     }
 
@@ -206 +206 @@
     public static void exportPreferencesKeysByPatternToFile(String fileName, boolean append, String pattern) {
         List<String> keySet = new ArrayList<>();
-        Map<String, Setting<?>> allSettings = Main.pref.getAllSettings();
+        Map<String, Setting<?>> allSettings = Preferences.main().getAllSettings();
         for (String key: allSettings.keySet()) {
             if (key.matches(pattern))
@@ -227 +227 @@
 
         try {
-            String toXML = Main.pref.toXML(true);
+            String toXML = Preferences.main().toXML(true);
             DocumentBuilder builder = XmlUtils.newSafeDOMBuilder();
             document = builder.parse(new ByteArrayInputStream(toXML.getBytes(StandardCharsets.UTF_8)));
@@ -358 +358 @@
                     for (PluginInformation pi4: toDeletePlugins) {
                         pls.remove(pi4.name);
-                        new File(Main.pref.getPluginsDirectory(), pi4.name+".jar").deleteOnExit();
+                        new File(Preferences.main().getPluginsDirectory(), pi4.name+".jar").deleteOnExit();
                     }
                     Config.getPref().putList("plugins", pls);
@@ -375 +375 @@
             dir = Config.getDirs().getCacheDirectory(false).getAbsolutePath();
         } else if ("plugins".equals(base)) {
-            dir = Main.pref.getPluginsDirectory().getAbsolutePath();
+            dir = Preferences.main().getPluginsDirectory().getAbsolutePath();
         } else {
             dir = null;

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());
             }
         }

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -36 +36 @@
 import javax.swing.table.DefaultTableCellRenderer;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.preferences.ColorInfo;
@@ -269 +269 @@
     public void addGui(final PreferenceTabbedPane gui) {
         fixColorPrefixes();
-        setColors(Main.pref.getAllNamedColors());
+        setColors(Preferences.main().getAllNamedColors());
 
         colorEdit = new JButton(tr("Choose"));

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

@@ -45 +45 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
@@ -300 +301 @@
         if (answer != 0 /* OK */)
             return;
-        Main.pref.setPluginSites(pnl.getUpdateSites());
+        Preferences.main().setPluginSites(pnl.getUpdateSites());
     }
 
@@ -376 +377 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            Collection<String> pluginSites = Main.pref.getOnlinePluginSites();
+            Collection<String> pluginSites = Preferences.main().getOnlinePluginSites();
             if (pluginSites.isEmpty()) {
                 return;
@@ -430 +431 @@
             // the async task for downloading plugin information
             final ReadRemotePluginInformationTask pluginInfoDownloadTask = new ReadRemotePluginInformationTask(
-                    Main.pref.getOnlinePluginSites());
+                    Preferences.main().getOnlinePluginSites());
 
             // to be run asynchronously after the plugin download
@@ -601 +602 @@
             super(new GridBagLayout());
             add(new JLabel(tr("Add JOSM Plugin description URL.")), GBC.eol());
-            for (String s : Main.pref.getPluginSites()) {
+            for (String s : Preferences.main().getPluginSites()) {
                 model.addElement(s);
             }