Changeset 12637 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2017-08-24T23:29:01+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.toolbar. Replacement: gui.MainApplication.getToolbar()

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• PreferenceTabbedPane.java (modified) (1 diff)
• ToolbarPreferences.java (modified) (5 diffs)

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

@@ -548 +548 @@
         SETTINGS_FACTORIES.add(new BackupPreference.Factory());
         SETTINGS_FACTORIES.add(new PluginPreference.Factory());
-        SETTINGS_FACTORIES.add(Main.toolbar);
+        SETTINGS_FACTORIES.add(MainApplication.getToolbar());
         SETTINGS_FACTORIES.add(new AudioPreference.Factory());
         SETTINGS_FACTORIES.add(new ShortcutPreference.Factory());

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

@@ -68 +68 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -502 +503 @@
                 t.remove(res);
                 Main.pref.putCollection("toolbar", t);
-                Main.toolbar.refreshToolbarControl();
+                MainApplication.getToolbar().refreshToolbarControl();
             }
         });
@@ -523 +524 @@
                 p.setVisible(true);
                 // refresh toolbar to try using changed shortcuts without restart
-                Main.toolbar.refreshToolbarControl();
+                MainApplication.getToolbar().refreshToolbarControl();
             }
         });
@@ -987 +988 @@
             }
             Main.pref.putCollection("toolbar", t);
-            Main.toolbar.refreshToolbarControl();
+            MainApplication.getToolbar().refreshToolbarControl();
             return false;
         }
@@ -1214 +1215 @@
         }
         Main.pref.putCollection("toolbar", t);
-        Main.toolbar.refreshToolbarControl();
+        MainApplication.getToolbar().refreshToolbarControl();
     }