Changeset 10318 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

Timestamp:

2016-06-02T23:04:53+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12906 - Change Actions to use LayerManager (patch by michael2402)

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) (2 diffs)

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

@@ -155 +155 @@
 
         private GpxLayer findGpxMergeLayer() {
-            if (!Main.isDisplayingMapView())
-                return null;
             boolean merge = Main.pref.getBoolean("download.gps.mergeWithLocal", false);
-            Layer active = Main.map.mapView.getActiveLayer();
+            Layer active = Main.getLayerManager().getActiveLayer();
             if (active instanceof GpxLayer && (merge || ((GpxLayer) active).data.fromServer))
                 return (GpxLayer) active;
-            for (GpxLayer l : Main.map.mapView.getLayersOfType(GpxLayer.class)) {
+            for (GpxLayer l : Main.getLayerManager().getLayersOfType(GpxLayer.class)) {
                 if (merge || l.data.fromServer)
                     return l;
@@ -169 +167 @@
 
         private MarkerLayer findMarkerMergeLayer(GpxLayer fromLayer) {
-            if (!Main.isDisplayingMapView())
-                return null;
-            for (MarkerLayer l : Main.map.mapView.getLayersOfType(MarkerLayer.class)) {
+            for (MarkerLayer l : Main.getLayerManager().getLayersOfType(MarkerLayer.class)) {
                 if (fromLayer != null && l.fromLayer == fromLayer)
                     return l;