Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 2388)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 2396)
@@ -45,5 +45,5 @@
     protected static DataSet buildTestDataSet() {
         DataSet ds = new DataSet();
-        ds.version = "0.6";
+        ds.setVersion("0.6");
 
         int numNodes = 1000;
@@ -215,5 +215,5 @@
         }
         logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
-        OsmWriter w = new OsmWriter(pw, false, testDataSet.version);
+        OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
         w.header();
         w.writeDataSources(testDataSet);
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 2388)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 2396)
@@ -109,5 +109,5 @@
     protected static DataSet buildTestDataSet() {
         DataSet ds = new DataSet();
-        ds.version = "0.6";
+        ds.setVersion("0.6");
 
         populateTestDataSetWithNodes(ds);
@@ -221,5 +221,5 @@
         }
         logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
-        OsmWriter w = new OsmWriter(pw, false, testDataSet.version);
+        OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
         w.header();
         w.writeDataSources(testDataSet);
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 2388)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 2396)
@@ -79,5 +79,5 @@
     public void nodeSimple_IdenticalNoConflict() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -87,5 +87,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,1);
@@ -114,5 +114,5 @@
     public void nodeSimple_locallyUnmodifiedNoConflict() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -122,5 +122,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,2);
@@ -153,5 +153,5 @@
     public void nodeSimple_TagConflict() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -162,5 +162,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,2);
@@ -189,5 +189,5 @@
     public void nodeSimple_DeleteConflict() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(1);
         n.setCoor(new LatLon(0,0));
@@ -198,5 +198,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,1);
@@ -223,5 +223,5 @@
     public void nodeSimple_VisibleConflict() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -231,5 +231,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,2);
@@ -256,5 +256,5 @@
     public void nodeSimple_DeleteConflict_2() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -263,5 +263,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(1,1);
@@ -286,5 +286,5 @@
     public void nodeSimple_DeleteConflict_3() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(1,1));
         n.setDeleted(true);
@@ -292,5 +292,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(1,1));
         their.addPrimitive(n1);
@@ -312,5 +312,5 @@
     public void nodeSimple_DeleteConflict_4() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(1,1));
         n.setDeleted(true);
@@ -318,5 +318,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(1,1));
         n1.setDeleted(true);
@@ -338,5 +338,5 @@
     public void nodeSimple_InvisibleNodeInTheirDataset() {
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node(new LatLon(0,0));
         n.setOsmId(1,1);
@@ -345,5 +345,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node(new LatLon(0,0));
         n1.setOsmId(2,1);
@@ -377,5 +377,5 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node();
         n.setCoor(new LatLon(0,0));
@@ -387,5 +387,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node();
         n1.setCoor(new LatLon(0,0));
@@ -418,5 +418,5 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
         Node n = new Node();
         n.setCoor(new LatLon(0,0));
@@ -426,5 +426,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
         Node n1 = new Node();
         n1.setCoor(new LatLon(0,0));
@@ -458,5 +458,5 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node();
@@ -480,5 +480,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -525,5 +525,5 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -542,5 +542,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -593,5 +593,5 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -613,5 +613,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -664,5 +664,5 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -681,5 +681,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Way theirWay = new Way();
@@ -710,5 +710,5 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -726,5 +726,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -763,5 +763,5 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -777,5 +777,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -815,5 +815,5 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -823,5 +823,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -871,5 +871,5 @@
 
         DataSet my = new DataSet();
-        my.version = "0.6";
+        my.setVersion("0.6");
 
         Node n1 = new Node(new LatLon(0,0));
@@ -879,5 +879,5 @@
 
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n3 = new Node(new LatLon(0,0));
@@ -922,5 +922,5 @@
     public void newIncompleteWay() {
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n1 = new Node(1);
@@ -936,5 +936,5 @@
 
         DataSet my = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         MergeVisitor visitor = new MergeVisitor(my,their);
@@ -969,5 +969,5 @@
     public void incompleteWayOntoCompleteWay() {
         DataSet their = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         // an incomplete node
@@ -986,5 +986,5 @@
 
         DataSet my = new DataSet();
-        their.version = "0.6";
+        their.setVersion("0.6");
 
         Node n4 = new Node(new LatLon(0,0));