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

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/surveyor

Files:

• build.xml (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java (modified) (1 diff)
• src/at/dallermassl/josm/plugin/surveyor/util/LayerUtil.java (modified) (1 diff)

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

@@ -7 +7 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8863"/>
+    <property name="plugin.main.version" value="10279"/>
     <property name="livegpsplugin.jar" value="${plugin.dist.dir}/livegps.jar"/>
 

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java

@@ -125 +125 @@
     public GpxLayer getGpxLayer() {
         if(liveGpsLayer == null) {
-            Collection<Layer> layers = Main.map.mapView.getAllLayers();
+            Collection<Layer> layers = Main.getLayerManager().getLayers();
             for (Layer layer : layers) {
                 if(layer instanceof LiveGpsLayer) {

applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/util/LayerUtil.java

@@ -24 +24 @@
         Layer result = null;
         if(Main.map != null && Main.map.mapView != null) {
-            for(Layer layer : Main.map.mapView.getAllLayers()) {
+            for(Layer layer : Main.getLayerManager().getLayers()) {
                 if(layerName.equals(layer.getName()) && layerType.isAssignableFrom(layer.getClass())) {
                     result = layer;