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

Timestamp:

2016-06-19T16:08:56+02:00 (9 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/waypoint_search

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/waypointSearch/Engine.java (modified) (2 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="bugfix of search when layer is added"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10279"/>
 
     <property name="plugin.author" value="Åsmund Realfsen - realfsen at gmx.net"/>

applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/Engine.java

@@ -18 +18 @@
         if (gpxLayersExist()) {
             //Loop over marker (waypoint) layers.. it could be more than one
-            for (Iterator<MarkerLayer> it = Main.map.mapView.getLayersOfType(MarkerLayer.class).iterator(); it.hasNext();) {
+            for (Iterator<MarkerLayer> it = Main.getLayerManager().getLayersOfType(MarkerLayer.class).iterator(); it.hasNext();) {
                 //loop over each marker (waypoint)
                 for (Iterator<Marker> markerIterator = it.next().data.iterator(); markerIterator.hasNext();) {
@@ -32 +32 @@
     
     static boolean gpxLayersExist() {
-        return Main.map != null && Main.map.mapView.hasLayers() && !Main.map.mapView.getLayersOfType(MarkerLayer.class).isEmpty();
+        return !Main.getLayerManager().getLayersOfType(MarkerLayer.class).isEmpty();
     }
 }