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

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.io.UpdatePrimitivesTask;
@@ -228 +230 @@
 
         protected OsmDataLayer getEditLayer() {
-            if (!Main.isDisplayingMapView()) return null;
+            if (!MainApplication.isDisplayingMapView()) return null;
             return Main.getLayerManager().getEditLayer();
         }
@@ -280 +282 @@
                 Collection<OsmPrimitive> primitivesToUpdate = searchPrimitivesToUpdate(bounds, layer.data);
                 layer.mergeFrom(dataSet);
-                if (Main.map != null && zoomAfterDownload && bounds != null) {
-                    Main.map.mapView.zoomTo(new ViewportData(computeBbox(bounds)));
+                MapFrame map = MainApplication.getMap();
+                if (map != null && zoomAfterDownload && bounds != null) {
+                    map.mapView.zoomTo(new ViewportData(computeBbox(bounds)));
                 }
                 if (!primitivesToUpdate.isEmpty()) {