Index: /trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java	(revision 12799)
+++ /trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java	(revision 12800)
@@ -131,5 +131,5 @@
             layer.data.getReadLock().lock();
             try {
-                w.writeLayer(layer);
+                w.write(layer.data);
             } finally {
                 layer.data.getReadLock().unlock();
Index: /trunk/src/org/openstreetmap/josm/io/OsmWriter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmWriter.java	(revision 12799)
+++ /trunk/src/org/openstreetmap/josm/io/OsmWriter.java	(revision 12800)
@@ -130,8 +130,23 @@
     }
 
+    /**
+     * Writes the full OSM file for the given layer (header, data sources, osm data).
+     * @param layer OSM data layer
+     * @deprecated To be removed end of 2017. Use {@link #write(DataSet)} instead
+     */
+    @Deprecated
     public void writeLayer(OsmDataLayer layer) {
-        header(layer.data.getUploadPolicy());
-        writeDataSources(layer.data);
-        writeContent(layer.data);
+        write(layer.data);
+    }
+
+    /**
+     * Writes the full OSM file for the given data set (header, data sources, osm data).
+     * @param data OSM data set
+     * @since 12800
+     */
+    public void write(DataSet data) {
+        header(data.getUploadPolicy());
+        writeDataSources(data);
+        writeContent(data);
         footer();
     }
Index: /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java	(revision 12799)
+++ /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java	(revision 12800)
@@ -32,5 +32,5 @@
         layer.data.getReadLock().lock();
         try {
-            w.writeLayer(layer);
+            w.write(layer.data);
             w.flush();
         } finally {
Index: /trunk/test/unit/org/openstreetmap/josm/gui/util/MultiLineFlowLayoutTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/util/MultiLineFlowLayoutTest.java	(revision 12799)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/util/MultiLineFlowLayoutTest.java	(revision 12800)
@@ -13,5 +13,4 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.gui.util.MultiLineFlowLayout;
 import org.openstreetmap.josm.testutils.JOSMTestRules;