Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java	(revision 32446)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java	(revision 32447)
@@ -14,7 +14,10 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 
 /**
@@ -44,17 +47,17 @@
 
     @Override
-    public void activeLayerChange( Layer oldLayer, Layer newLayer ) {
-        // todo
+    public void layerOrderChanged(LayerOrderChangeEvent e) {
     }
 
     @Override
-    public void layerAdded( Layer newLayer ) {
-        if( newLayer instanceof NanoLogLayer )
-            ((NanoLogLayer)newLayer).addListener(this);
+    public void layerAdded(LayerAddEvent e) {
+        Layer newLayer = e.getAddedLayer();
+        if (newLayer instanceof NanoLogLayer )
+            ((NanoLogLayer) newLayer).addListener(this);
         updateMarkers();
     }
 
     @Override
-    public void layerRemoved( Layer oldLayer ) {
+    public void layerRemoving(LayerRemoveEvent e) {
         updateMarkers();
     }
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPlugin.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPlugin.java	(revision 32446)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPlugin.java	(revision 32447)
@@ -1,16 +1,18 @@
 package nanolog;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
 import java.io.IOException;
 import java.util.List;
+
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -30,5 +32,5 @@
             NanoLogPanel panel = new NanoLogPanel();
             newFrame.addToggleDialog(panel);
-            MapView.addLayerChangeListener(panel);
+            Main.getLayerManager().addLayerChangeListener(panel);
         }
     }
@@ -47,5 +49,5 @@
                     if( !entries.isEmpty() ) {
                         NanoLogLayer layer = new NanoLogLayer(entries);
-                        Main.main.addLayer(layer);
+                        Main.getLayerManager().addLayer(layer);
                         layer.setupListeners();
                     }