Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java

Timestamp:

2017-08-24T00:15:51+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

File:

• trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -47 +49 @@
 
     protected void setMode() {
-        if (Main.isDisplayingMapView()) {
+        if (MainApplication.isDisplayingMapView()) {
             boolean selected = isSelected();
             if (!selected) {
@@ -53 +55 @@
                 sideToolbarPreviouslyVisible = Main.pref.getBoolean("sidetoolbar.visible", true);
             }
-            Main.map.setDialogsPanelVisible(selected);
-            Main.map.statusLine.setVisible(selected || Main.pref.getBoolean("statusbar.always-visible", true));
+            MapFrame map = MainApplication.getMap();
+            map.setDialogsPanelVisible(selected);
+            map.statusLine.setVisible(selected || Main.pref.getBoolean("statusbar.always-visible", true));
             Main.main.menu.setVisible(selected || Main.pref.getBoolean("menu.always-visible", true));
             // Toolbars listen to preference changes, use it here
@@ -63 +66 @@
                 Main.pref.put("sidetoolbar.visible", selected);
             }
-            Main.map.mapView.rememberLastPositionOnScreen();
+            map.mapView.rememberLastPositionOnScreen();
         }
     }