Index: trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java	(revision 2292)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java	(revision 2381)
@@ -20,5 +20,5 @@
         r.incomplete = false;
         DataSet ds = new DataSet();
-        ds.relations.add(r);
+        ds.addPrimitive(r);
 
         APIDataSet apiDataSet = new APIDataSet();
@@ -48,6 +48,6 @@
 
         DataSet ds = new DataSet();
-        ds.relations.add(r1);
-        ds.relations.add(r2);
+        ds.addPrimitive(r1);
+        ds.addPrimitive(r2);
 
         APIDataSet apiDataSet = new APIDataSet();
@@ -88,8 +88,8 @@
 
         DataSet ds = new DataSet();
-        ds.relations.add(r1);
-        ds.relations.add(r2);
-        ds.relations.add(r3);
-        ds.relations.add(r4);
+        ds.addPrimitive(r1);
+        ds.addPrimitive(r2);
+        ds.addPrimitive(r3);
+        ds.addPrimitive(r4);
 
         APIDataSet apiDataSet = new APIDataSet();
@@ -130,7 +130,7 @@
 
         DataSet ds = new DataSet();
-        ds.relations.add(r1);
-        ds.relations.add(r2);
-        ds.relations.add(r3);
+        ds.addPrimitive(r1);
+        ds.addPrimitive(r2);
+        ds.addPrimitive(r3);
 
         APIDataSet apiDataSet = new APIDataSet();
@@ -167,7 +167,7 @@
 
         DataSet ds = new DataSet();
-        ds.relations.add(r1);
-        ds.relations.add(r2);
-        ds.relations.add(r3);
+        ds.addPrimitive(r1);
+        ds.addPrimitive(r2);
+        ds.addPrimitive(r3);
 
         APIDataSet apiDataSet = new APIDataSet();
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 2292)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 2381)
@@ -40,8 +40,8 @@
         Node n4 = new Node(new LatLon(20.0,20.0));
         n4.put("name","n4");
-        source.nodes.add(n1);
-        source.nodes.add(n2);
-        source.nodes.add(n3);
-        source.nodes.add(n4);
+        source.addPrimitive(n1);
+        source.addPrimitive(n2);
+        source.addPrimitive(n3);
+        source.addPrimitive(n4);
         source.setSelected(n1,n2);
 
@@ -49,5 +49,5 @@
         DataSet hull = builder.build();
         assertNotNull(hull);
-        assertEquals(2, hull.nodes.size());
+        assertEquals(2, hull.getNodes().size());
 
         OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE);
@@ -58,8 +58,8 @@
         assertNull(p);
 
-        p = lookupByName(hull.nodes, "n2");
-        assertNotNull(p);
-
-        p = lookupByName(hull.nodes, "n4");
+        p = lookupByName(hull.getNodes(), "n2");
+        assertNotNull(p);
+
+        p = lookupByName(hull.getNodes(), "n4");
         assertNull(p);
     }
@@ -75,7 +75,7 @@
         w1.addNode(n1);
         w1.addNode(n2);
-        source.nodes.add(n1);
-        source.nodes.add(n2);
-        source.ways.add(w1);
+        source.addPrimitive(n1);
+        source.addPrimitive(n2);
+        source.addPrimitive(w1);
         source.setSelected(w1);
 
@@ -83,6 +83,6 @@
         DataSet hull = builder.build();
         assertNotNull(hull);
-        assertEquals(1, hull.ways.size());
-        assertEquals(2, hull.nodes.size());
+        assertEquals(1, hull.getWays().size());
+        assertEquals(2, hull.getNodes().size());
 
         OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE);
@@ -108,7 +108,7 @@
         w1.addNode(n1);
         w1.addNode(n2);
-        source.nodes.add(n1);
-        source.nodes.add(n2);
-        source.ways.add(w1);
+        source.addPrimitive(n1);
+        source.addPrimitive(n2);
+        source.addPrimitive(w1);
         source.setSelected(w1,n1,n2);
 
@@ -116,6 +116,6 @@
         DataSet hull = builder.build();
         assertNotNull(hull);
-        assertEquals(1, hull.ways.size());
-        assertEquals(2, hull.nodes.size());
+        assertEquals(1, hull.getWays().size());
+        assertEquals(2, hull.getNodes().size());
 
         OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE);
@@ -137,5 +137,5 @@
         Way w1 = new Way(3);
         w1.incomplete = true;
-        source.ways.add(w1);
+        source.addPrimitive(w1);
         source.setSelected(w1);
 
@@ -143,5 +143,5 @@
         DataSet hull = builder.build();
         assertNotNull(hull);
-        assertEquals(1, hull.ways.size());
+        assertEquals(1, hull.getWays().size());
 
         OsmPrimitive p = hull.getPrimitiveById(3, OsmPrimitiveType.WAY);
@@ -167,10 +167,10 @@
         Relation r40 = new Relation(40);
         r1.addMember(new RelationMember("relation-40", r40));
-        source.nodes.add(n20);
-        source.nodes.add(n21);
-        source.nodes.add(n22);
-        source.ways.add(w30);
-        source.relations.add(r1);
-        source.relations.add(r40);
+        source.addPrimitive(n20);
+        source.addPrimitive(n21);
+        source.addPrimitive(n22);
+        source.addPrimitive(w30);
+        source.addPrimitive(r1);
+        source.addPrimitive(r40);
         source.setSelected(r1,n20,w30,r40);
 
@@ -178,7 +178,7 @@
         DataSet hull = builder.build();
         assertNotNull(hull);
-        assertEquals(1, hull.ways.size());
-        assertEquals(3, hull.nodes.size());
-        assertEquals(2, hull.relations.size());
+        assertEquals(1, hull.getWays().size());
+        assertEquals(3, hull.getNodes().size());
+        assertEquals(2, hull.getRelations().size());
 
         OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.RELATION);
@@ -226,10 +226,10 @@
         Relation r40 = new Relation(40);
         r1.addMember(new RelationMember("relation-40", r40));
-        source.nodes.add(n20);
-        source.nodes.add(n21);
-        source.nodes.add(n22);
-        source.ways.add(w30);
-        source.relations.add(r1);
-        source.relations.add(r40);
+        source.addPrimitive(n20);
+        source.addPrimitive(n21);
+        source.addPrimitive(n22);
+        source.addPrimitive(w30);
+        source.addPrimitive(r1);
+        source.addPrimitive(r40);
         source.setSelected(r1);
 
@@ -237,7 +237,7 @@
         DataSet hull = builder.build();
         assertNotNull(hull);
-        assertEquals(1, hull.ways.size());
-        assertEquals(1, hull.nodes.size());
-        assertEquals(2, hull.relations.size());
+        assertEquals(1, hull.getWays().size());
+        assertEquals(1, hull.getNodes().size());
+        assertEquals(2, hull.getRelations().size());
 
         OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.RELATION);
@@ -293,10 +293,10 @@
         r1.addMember(new RelationMember("relation-40", r40));
 
-        source.nodes.add(n20);
-        source.nodes.add(n21);
-        source.nodes.add(n22);
-        source.ways.add(w30);
-        source.relations.add(r1);
-        source.relations.add(r40);
+        source.addPrimitive(n20);
+        source.addPrimitive(n21);
+        source.addPrimitive(n22);
+        source.addPrimitive(w30);
+        source.addPrimitive(r1);
+        source.addPrimitive(r40);
         source.setSelected(r1);
 
@@ -304,31 +304,31 @@
         DataSet hull = builder.build();
         assertNotNull(hull);
-        assertEquals(1, hull.ways.size());
-        assertEquals(3, hull.nodes.size());
-        assertEquals(2, hull.relations.size());
-
-        OsmPrimitive p = lookupByName(hull.relations, "r1");
+        assertEquals(1, hull.getWays().size());
+        assertEquals(3, hull.getNodes().size());
+        assertEquals(2, hull.getRelations().size());
+
+        OsmPrimitive p = lookupByName(hull.getRelations(), "r1");
         assertNotNull(p);
         assertEquals(p.getClass(), Relation.class);
 
-        Way w = (Way)lookupByName(hull.ways, "w30");
+        Way w = (Way)lookupByName(hull.getWays(), "w30");
         assertNotNull(w);
         assertEquals(2, w.getNodesCount());
 
-        Node n = (Node)lookupByName(hull.nodes, "n21");
+        Node n = (Node)lookupByName(hull.getNodes(), "n21");
         assertNotNull(n);
         assertTrue(w.containsNode(n));
 
-        n = (Node)lookupByName(hull.nodes, "n22");
+        n = (Node)lookupByName(hull.getNodes(), "n22");
         assertNotNull(n);
         assertTrue(w.containsNode(n));
 
-        Relation r = (Relation)lookupByName(hull.relations, "r40");
-        assertNotNull(r);
-
-        r = (Relation)lookupByName(hull.relations, "r1");
+        Relation r = (Relation)lookupByName(hull.getRelations(), "r40");
+        assertNotNull(r);
+
+        r = (Relation)lookupByName(hull.getRelations(), "r1");
         assertNotNull(r);
         assertEquals(3, r.getMembersCount());
-        RelationMember m = new RelationMember("node-20", lookupByName(hull.nodes, "n20"));
+        RelationMember m = new RelationMember("node-20", lookupByName(hull.getNodes(), "n20"));
         assertTrue(r.getMembers().contains(m));
         m = new RelationMember("way-30", lookupByName(hull.ways, "w30"));
@@ -343,5 +343,5 @@
         Relation r1 = new Relation(1);
         r1.addMember(new RelationMember("relation-1",r1));
-        source.relations.add(r1);
+        source.addPrimitive(r1);
         source.setSelected(r1);
 
@@ -349,5 +349,5 @@
         DataSet hull = builder.build();
         assertNotNull(hull);
-        assertEquals(1, hull.relations.size());
+        assertEquals(1, hull.getRelations().size());
 
         Relation r = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION);
@@ -363,5 +363,5 @@
         r1.put("name", "r1");
         r1.addMember(new RelationMember("relation-1",r1));
-        source.relations.add(r1);
+        source.addPrimitive(r1);
         source.setSelected(r1);
 
@@ -369,7 +369,7 @@
         DataSet hull = builder.build();
         assertNotNull(hull);
-        assertEquals(1, hull.relations.size());
-
-        Relation r = (Relation)lookupByName(hull.relations, "r1");
+        assertEquals(1, hull.getRelations().size());
+
+        Relation r = (Relation)lookupByName(hull.getRelations(), "r1");
         assertNotNull(r);
         assertEquals(1, r.getMembersCount());
@@ -384,6 +384,6 @@
         r1.addMember(new RelationMember("relation-2",r2));
         r2.addMember(new RelationMember("relation-1",r1));
-        source.relations.add(r1);
-        source.relations.add(r2);
+        source.addPrimitive(r1);
+        source.addPrimitive(r2);
         source.setSelected(r1,r2);
 
@@ -391,5 +391,5 @@
         DataSet hull = builder.build();
         assertNotNull(hull);
-        assertEquals(2, hull.relations.size());
+        assertEquals(2, hull.getRelations().size());
 
         r1 = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION);
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 2292)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 2381)
@@ -8,5 +8,4 @@
 
 import java.io.File;
-import java.net.URLEncoder;
 import java.text.MessageFormat;
 import java.util.Arrays;
@@ -358,5 +357,5 @@
         Node n2 = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE);
         assertEquals(0,visitor.getConflicts().size());
-        assertEquals(2,my.nodes.size());
+        assertEquals(2, my.getNodes().size());
         assertEquals(n,n2);
     }
@@ -402,5 +401,5 @@
         visitor.merge();
 
-        Node n2 = my.nodes.iterator().next();
+        Node n2 = my.getNodes().iterator().next();
         assertEquals(0,visitor.getConflicts().size());
         assertEquals("value1",n2.get("key1"));
@@ -440,5 +439,5 @@
         visitor.merge();
 
-        Node n2 = my.nodes.iterator().next();
+        Node n2 = my.getNodes().iterator().next();
         assertEquals(0,visitor.getConflicts().size());
         assertEquals("value1",n2.get("key1"));