Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.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/SessionLoadAction.java (modified) (3 diffs)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -133 +134 @@
         private void addLayers() {
             if (layers != null && !layers.isEmpty()) {
-                boolean noMap = Main.map == null;
+                boolean noMap = MainApplication.getMap() == null;
                 for (Layer l : layers) {
                     if (canceled)
@@ -143 +144 @@
                 }
                 if (noMap && viewport != null) {
-                    Main.map.mapView.scheduleZoomTo(viewport.getEastNorthViewport(Main.getProjection()));
+                    MainApplication.getMap().mapView.scheduleZoomTo(viewport.getEastNorthViewport(Main.getProjection()));
                 }
             }