Index: applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java
===================================================================
--- applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 32349)
+++ applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 32465)
@@ -42,7 +42,9 @@
 import org.openstreetmap.josm.gui.IconToggleButton;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 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;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -65,5 +67,5 @@
  * @version 0.3
  */
-public class RoutingPlugin extends Plugin implements LayerChangeListener,DataSetListenerAdapter.Listener {
+public class RoutingPlugin extends Plugin implements LayerChangeListener, DataSetListenerAdapter.Listener {
     /**
      * Logger
@@ -152,5 +154,5 @@
         menu = new RoutingMenu();
         // Register this class as LayerChangeListener
-        MapView.addLayerChangeListener(this);
+        Main.getLayerManager().addLayerChangeListener(this);
         DatasetEventManager.getInstance().addDatasetListener(datasetAdapter, FireMode.IN_EDT_CONSOLIDATED);
         logger.debug("Finished loading plugin");
@@ -228,5 +230,12 @@
     }
 
-    public void layerAdded(Layer newLayer) {
+    @Override
+    public void layerOrderChanged(LayerOrderChangeEvent e) {
+        // Do nothing
+    }
+
+    @Override
+    public void layerAdded(LayerAddEvent evt) {
+        Layer newLayer = evt.getAddedLayer();
         // Add button(s) to the tool bar when the routing layer is added
         if (newLayer instanceof RoutingLayer) {
@@ -238,5 +247,7 @@
     }
 
-    public void layerRemoved(Layer oldLayer) {
+    @Override
+    public void layerRemoving(LayerRemoveEvent evt) {
+        Layer oldLayer = evt.getRemovedLayer();
         if ((oldLayer instanceof RoutingLayer) & (layers.size()==1)) {
             // Remove button(s) from the tool bar when the last routing layer is removed
@@ -269,4 +280,5 @@
     }
 
+    @Override
     public void processDatasetEvent(AbstractDatasetChangedEvent event){