Changeset 32329 in osm for applications/editors/josm/plugins/CommandLine

Timestamp:

2016-06-19T16:08:56+02:00 (8 years ago)

Author:

donvip

Message:

fix #josm12953 - Replace most uses of MapView.getActiveLayer and similar methods (patch by michael2402, modified) - gsoc-core

Location:

applications/editors/josm/plugins/CommandLine

Files:

• build.xml (modified) (1 diff)
• src/CommandLine/CommandLine.java (modified) (3 diffs)

applications/editors/josm/plugins/CommandLine/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="JOSM/CommandLine: fix exception after JOSM update"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="9170"/>
+    <property name="plugin.main.version" value="10279"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java

@@ -369 +369 @@
                 break;
             case IMAGERYURL:
-                Layer layer = Main.map.mapView.getActiveLayer();
+                Layer layer = Main.getLayerManager().getActiveLayer();
                 if (layer != null) {
                     if (!(layer instanceof ImageryLayer)) {
-                        List<ImageryLayer> imageryLayers = Main.map.mapView.getLayersOfType(ImageryLayer.class);
+                        List<ImageryLayer> imageryLayers = Main.getLayerManager().getLayersOfType(ImageryLayer.class);
                         if (imageryLayers.size() == 1) {
                             layer = imageryLayers.get(0);
@@ -389 +389 @@
                 break;
             case IMAGERYOFFSET:
-                Layer olayer = Main.map.mapView.getActiveLayer();
+                Layer olayer = Main.getLayerManager().getActiveLayer();
                 if (olayer != null) {
                     if (!(olayer instanceof ImageryLayer)) {
-                        List<ImageryLayer> imageryLayers = Main.map.mapView.getLayersOfType(ImageryLayer.class);
+                        List<ImageryLayer> imageryLayers = Main.getLayerManager().getLayersOfType(ImageryLayer.class);
                         if (imageryLayers.size() == 1) {
                             olayer = imageryLayers.get(0);
@@ -597 +597 @@
                         GpxFilter gpxFilter = new GpxFilter();
                         gpxFilter.initBboxFilter(bbox);
-                        List<GpxLayer> gpxLayers = Main.map.mapView.getLayersOfType(GpxLayer.class);
+                        List<GpxLayer> gpxLayers = Main.getLayerManager().getLayersOfType(GpxLayer.class);
                         for (GpxLayer gpxLayer : gpxLayers) {
                             gpxFilter.addGpxData(gpxLayer.data);