Index: applications/editors/josm/plugins/cadastre-fr/build.xml
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 34097)
+++ applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 34098)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Changed constructor for Plugin"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12900"/>
+    <property name="plugin.main.version" value="13559"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/pci/EdigeoPciReader.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/pci/EdigeoPciReader.java	(revision 34097)
+++ applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/pci/EdigeoPciReader.java	(revision 34098)
@@ -23,5 +23,5 @@
 import org.apache.commons.text.WordUtils;
 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.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
Index: applications/editors/josm/plugins/canvec_helper/build.xml
===================================================================
--- applications/editors/josm/plugins/canvec_helper/build.xml	(revision 34097)
+++ applications/editors/josm/plugins/canvec_helper/build.xml	(revision 34098)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="JOSM/Canvec_helper: fixed a crash caused by osm directory being renamed to OSM"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13007"/>
+    <property name="plugin.main.version" value="13559"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java
===================================================================
--- applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java	(revision 34097)
+++ applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanVecTile.java	(revision 34098)
@@ -18,5 +18,5 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
Index: applications/editors/josm/plugins/o5m/build.xml
===================================================================
--- applications/editors/josm/plugins/o5m/build.xml	(revision 34097)
+++ applications/editors/josm/plugins/o5m/build.xml	(revision 34098)
@@ -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="12671"/>
+    <property name="plugin.main.version" value="13559"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java
===================================================================
--- applications/editors/josm/plugins/o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java	(revision 34097)
+++ applications/editors/josm/plugins/o5m/src/org/openstreetmap/josm/plugins/o5m/io/O5mReader.java	(revision 34098)
@@ -25,5 +25,5 @@
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
Index: applications/editors/josm/plugins/pbf/build.xml
===================================================================
--- applications/editors/josm/plugins/pbf/build.xml	(revision 34097)
+++ applications/editors/josm/plugins/pbf/build.xml	(revision 34098)
@@ -3,5 +3,5 @@
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12671"/>
+    <property name="plugin.main.version" value="13559"/>
 
     <property name="plugin.author" value="Don-vip"/>
Index: applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java
===================================================================
--- applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java	(revision 34097)
+++ applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java	(revision 34098)
@@ -17,5 +17,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/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java
===================================================================
--- applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java	(revision 34097)
+++ applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java	(revision 34098)
@@ -507,5 +507,5 @@
      */
     public void writeLayer(OsmDataLayer layer) {
-        writeData(layer.data);
+        writeData(layer.getDataSet());
     }
 
Index: applications/editors/josm/plugins/poly/build.xml
===================================================================
--- applications/editors/josm/plugins/poly/build.xml	(revision 34097)
+++ applications/editors/josm/plugins/poly/build.xml	(revision 34098)
@@ -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="12671"/>
+    <property name="plugin.main.version" value="13559"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/poly/src/poly/PolyExporter.java
===================================================================
--- applications/editors/josm/plugins/poly/src/poly/PolyExporter.java	(revision 34097)
+++ applications/editors/josm/plugins/poly/src/poly/PolyExporter.java	(revision 34098)
@@ -39,5 +39,5 @@
         if (layer instanceof OsmDataLayer) {
             try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF8"))) {
-                DataSet ds = ((OsmDataLayer) layer).data;
+                DataSet ds = ((OsmDataLayer) layer).getDataSet();
                 Map<Way, Boolean> ways = new TreeMap<>();
                 String polygonName = file.getName();
Index: applications/editors/josm/plugins/poly/src/poly/PolyImporter.java
===================================================================
--- applications/editors/josm/plugins/poly/src/poly/PolyImporter.java	(revision 34097)
+++ applications/editors/josm/plugins/poly/src/poly/PolyImporter.java	(revision 34098)
@@ -20,5 +20,5 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.gui.io.importexport.OsmImporter;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
Index: applications/editors/josm/plugins/seachart/build.xml
===================================================================
--- applications/editors/josm/plugins/seachart/build.xml	(revision 34097)
+++ applications/editors/josm/plugins/seachart/build.xml	(revision 34098)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[Seachart] Publish new release"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13243"/>
+    <property name="plugin.main.version" value="13558"/>
 
     <property name="plugin.author" value="Malcolm Herring"/>
Index: applications/editors/josm/plugins/seachart/src/seachart/SeachartAction.java
===================================================================
--- applications/editors/josm/plugins/seachart/src/seachart/SeachartAction.java	(revision 34097)
+++ applications/editors/josm/plugins/seachart/src/seachart/SeachartAction.java	(revision 34098)
@@ -7,5 +7,4 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -27,4 +26,5 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -145,12 +145,12 @@
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        OsmDataLayer oldLayer = e.getPreviousEditLayer();
+        OsmDataLayer oldLayer = e.getPreviousDataLayer();
         if (oldLayer != null) {
-            oldLayer.data.removeDataSetListener(dataSetListener);
+            oldLayer.getDataSet().removeDataSetListener(dataSetListener);
         }
         OsmDataLayer newLayer = MainApplication.getLayerManager().getEditLayer();
         if (newLayer != null) {
-            newLayer.data.addDataSetListener(dataSetListener);
-            data = newLayer.data;
+            newLayer.getDataSet().addDataSetListener(dataSetListener);
+            data = newLayer.getDataSet();
             makeChart();
         } else {
Index: applications/editors/josm/plugins/seachartedit/build.xml
===================================================================
--- applications/editors/josm/plugins/seachartedit/build.xml	(revision 34097)
+++ applications/editors/josm/plugins/seachartedit/build.xml	(revision 34098)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="New release"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12643"/>
+    <property name="plugin.main.version" value="13559"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java
===================================================================
--- applications/editors/josm/plugins/seachartedit/src/panels/PanelS57.java	(revision 34097)
+++ 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 34097)
+++ 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 {