Index: /applications/editors/josm/plugins/gpsblam/build.xml
===================================================================
--- /applications/editors/josm/plugins/gpsblam/build.xml	(revision 32486)
+++ /applications/editors/josm/plugins/gpsblam/build.xml	(revision 32487)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10279"/>
+    <property name="plugin.main.version" value="10353"/>
 
     <!--
Index: /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMode.java
===================================================================
--- /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMode.java	(revision 32486)
+++ /applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMode.java	(revision 32487)
@@ -25,7 +25,8 @@
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 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;
 
 class GPSBlamMode extends MapMode implements LayerChangeListener, MouseWheelListener, AWTEventListener {
@@ -55,5 +56,5 @@
         }
 
-        MapView.addLayerChangeListener(this);
+        getLayerManager().addLayerChangeListener(this);
     }
 
@@ -117,5 +118,5 @@
             if(currentBlamLayer == null) {
                 currentBlamLayer = new GPSBlamLayer(tr("GPSBlam"));
-                Main.main.addLayer(currentBlamLayer);
+                getLayerManager().addLayer(currentBlamLayer);
             }
             currentBlamLayer.addBlamMarker(new GPSBlamMarker(inputData));
@@ -200,16 +201,16 @@
 
     @Override
-    public void activeLayerChange(Layer arg0, Layer arg1) {
+    public void layerOrderChanged(LayerOrderChangeEvent e) {
         // Do nothing
     }
 
     @Override
-    public void layerAdded(Layer arg0) {
+    public void layerAdded(LayerAddEvent e) {
         // Do nothing
     }
 
     @Override
-    public void layerRemoved(Layer oldLayer) {
-        if (oldLayer instanceof GPSBlamLayer) {
+    public void layerRemoving(LayerRemoveEvent e) {
+        if (e.getRemovedLayer() instanceof GPSBlamLayer) {
             currentBlamLayer = null;
             if(Main.map.mapMode instanceof GPSBlamMode)
@@ -221,5 +222,5 @@
     public void destroy() {
         super.destroy();
-        MapView.removeLayerChangeListener(this);
+        getLayerManager().removeLayerChangeListener(this);
     }
 }