Index: applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java
===================================================================
--- applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java	(revision 33920)
+++ applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java	(revision 34098)
@@ -27,5 +27,5 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
Index: applications/editors/josm/plugins/seachartedit/src/scedit/SCeditAction.java
===================================================================
--- applications/editors/josm/plugins/seachartedit/src/scedit/SCeditAction.java	(revision 33920)
+++ applications/editors/josm/plugins/seachartedit/src/scedit/SCeditAction.java	(revision 34098)
@@ -168,11 +168,11 @@
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        if (e.getPreviousEditLayer() != null) {
-            e.getPreviousEditLayer().data.removeDataSetListener(dataSetListener);
+        if (e.getPreviousDataLayer() != null) {
+            e.getPreviousDataLayer().getDataSet().removeDataSetListener(dataSetListener);
         }
         OsmDataLayer newLayer = getLayerManager().getEditLayer();
         if (newLayer != null) {
-            newLayer.data.addDataSetListener(dataSetListener);
-            data = newLayer.data;
+            newLayer.getDataSet().addDataSetListener(dataSetListener);
+            data = newLayer.getDataSet();
             makeMap();
         } else {