Index: /applications/editors/josm/plugins/osmarender/src/OsmarenderPlugin.java
===================================================================
--- /applications/editors/josm/plugins/osmarender/src/OsmarenderPlugin.java	(revision 14405)
+++ /applications/editors/josm/plugins/osmarender/src/OsmarenderPlugin.java	(revision 14406)
@@ -74,5 +74,9 @@
             try {
                 // write to plugin dir
-                OsmWriter.output(new FileOutputStream(getPluginDir()+File.separator+"data.osm"), new OsmWriter.All(fromDataSet, true));
+                OsmWriter w = new OsmWriter(new PrintWriter(new FileOutputStream(getPluginDir()+File.separator+"data.osm")), false, fromDataSet.version);
+                w.header();
+                w.writeDataSources(fromDataSet);
+                w.writeContent(fromDataSet);
+                w.footer();
 
                 // get the exec line
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java	(revision 14405)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java	(revision 14406)
@@ -10,4 +10,5 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.TimerTask;
 
@@ -54,5 +55,9 @@
             System.out.println("AutoSaving osm data to file " + file.getAbsolutePath());
             synchronized(LiveGpsLock.class) {
-                XmlWriter.output(new FileOutputStream(tmpFile), new OsmWriter.All(dataset, false));
+                OsmWriter w = new OsmWriter(new PrintWriter(new FileOutputStream(tmpFile)), false, dataset.version);
+                w.header();
+                w.writeDataSources(dataset);
+                w.writeContent(dataset);
+                w.footer();
             }
             tmpFile.renameTo(file);
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java	(revision 14405)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java	(revision 14406)
@@ -13,5 +13,5 @@
 import org.openstreetmap.josm.data.osm.*;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -130,5 +130,5 @@
      * Visitor that highlights all cells the selected primitives go through
      */
-    class HighlightCellVisitor implements Visitor
+    class HighlightCellVisitor extends AbstractVisitor
     {
         /** The MapView */
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java	(revision 14405)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java	(revision 14406)
@@ -13,5 +13,5 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -25,5 +25,5 @@
  * @author frsantos
  */
-public class Test implements Visitor
+public class Test extends AbstractVisitor
 {
     /** Name of the test */
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java	(revision 14405)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java	(revision 14406)
@@ -15,5 +15,5 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.gui.MapView;
 
@@ -252,5 +252,5 @@
      * @author frsantos
      */
-    class PaintVisitor implements ValidatorVisitor, Visitor {
+    class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
         /** The graphics */
         private final Graphics g;
Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java
===================================================================
--- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java	(revision 14405)
+++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java	(revision 14406)
@@ -6,5 +6,5 @@
 
 import org.openstreetmap.josm.data.osm.*;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 
 /**
@@ -15,5 +15,5 @@
  * @author frsantos
  */
-public class AgregatePrimitivesVisitor implements Visitor
+public class AgregatePrimitivesVisitor extends AbstractVisitor
 {
     /** Aggregated data */