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

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -71 +71 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -488 +489 @@
         private void setActionAndAdapt(ActionDefinition action) {
             this.act = action;
-            doNotHide.setSelected(Main.pref.getBoolean("toolbar.always-visible", true));
+            doNotHide.setSelected(Config.getPref().getBoolean("toolbar.always-visible", true));
             remove.setVisible(act != null);
             shortcutEdit.setVisible(act != null);
@@ -502 +503 @@
                 // remove the button from toolbar preferences
                 t.remove(res);
-                Main.pref.putList("toolbar", t);
+                Config.getPref().putList("toolbar", t);
                 MainApplication.getToolbar().refreshToolbarControl();
             }
@@ -532 +533 @@
             public void actionPerformed(ActionEvent e) {
                 boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState();
-                Main.pref.putBoolean("toolbar.always-visible", sel);
-                Main.pref.putBoolean("menu.always-visible", sel);
+                Config.getPref().putBoolean("toolbar.always-visible", sel);
+                Config.getPref().putBoolean("menu.always-visible", sel);
             }
         });
@@ -987 +988 @@
                 t = Collections.singletonList(EMPTY_TOOLBAR_MARKER);
             }
-            Main.pref.putList("toolbar", t);
+            Config.getPref().putList("toolbar", t);
             MainApplication.getToolbar().refreshToolbarControl();
             return false;
@@ -1002 +1003 @@
             control.setComponentPopupMenu(popupMenu);
         });
-        Main.pref.addPreferenceChangeListener(e -> {
+        Config.getPref().addPreferenceChangeListener(e -> {
             if ("toolbar.visible".equals(e.getKey())) {
                 refreshToolbarControl();
@@ -1074 +1075 @@
     public static Collection<String> getToolString() {
 
-        Collection<String> toolStr = Main.pref.getList("toolbar", Arrays.asList(deftoolbar));
+        Collection<String> toolStr = Config.getPref().getList("toolbar", Arrays.asList(deftoolbar));
         if (toolStr == null || toolStr.isEmpty()) {
             toolStr = Arrays.asList(deftoolbar);
@@ -1188 +1189 @@
         }
 
-        boolean visible = Main.pref.getBoolean("toolbar.visible", true);
+        boolean visible = Config.getPref().getBoolean("toolbar.visible", true);
 
         control.setFocusTraversalKeysEnabled(!unregisterTab);
@@ -1214 +1215 @@
             }
         }
-        Main.pref.putList("toolbar", t);
+        Config.getPref().putList("toolbar", t);
         MainApplication.getToolbar().refreshToolbarControl();
     }