Changeset 32329 in osm for applications/editors/josm/plugins/NanoLog/src

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/NanoLog/src/nanolog

Files:

• GPXChooser.java (modified) (1 diff)
• NanoLogLayer.java (modified) (1 diff)
• NanoLogPanel.java (modified) (1 diff)

applications/editors/josm/plugins/NanoLog/src/nanolog/GPXChooser.java

@@ -19 +19 @@
     public static GpxLayer topLayer() {
         // return first found local layer
-        for( Layer layer : Main.map.mapView.getAllLayers() ) {
+        for( Layer layer : Main.getLayerManager().getLayers() ) {
             if( layer instanceof GpxLayer && ((GpxLayer)layer).isLocalFile() )
                 return (GpxLayer)layer;

applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java

@@ -298 +298 @@
         public void mousePressed( MouseEvent e ) {
             int nearest = nearestEntry(e);
-            if( nearest > 0 && Main.map.mapView.getActiveLayer() == NanoLogLayer.this ) {
+            if( nearest > 0 && Main.getLayerManager().getActiveLayer() == NanoLogLayer.this ) {
                 dragging = nearest;
                 doDrag(e);

applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java

@@ -37 +37 @@
     public void updateMarkers() {
         List<NanoLogEntry> entries = new ArrayList<>();
-        for( NanoLogLayer l : Main.map.mapView.getLayersOfType(NanoLogLayer.class) ) {
+        for( NanoLogLayer l : Main.getLayerManager().getLayersOfType(NanoLogLayer.class) ) {
             entries.addAll(l.getEntries());
         }