Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 2199)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 2381)
@@ -35,5 +35,4 @@
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
-import org.xml.sax.SAXException;
 
 public class MultiFetchServerObjectReaderTest {
@@ -124,7 +123,7 @@
         logger.info("creating data set on the server ...");
         ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
-        primitives.addAll(testDataSet.nodes);
-        primitives.addAll(testDataSet.ways);
-        primitives.addAll(testDataSet.relations);
+        primitives.addAll(testDataSet.getNodes());
+        primitives.addAll(testDataSet.getWays());
+        primitives.addAll(testDataSet.getRelations());
 
         OsmServerWriter writer = new OsmServerWriter();
@@ -247,5 +246,5 @@
         }
         DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE);
-        assertEquals(10, out.nodes.size());
+        assertEquals(10, out.getNodes().size());
         Iterator<Node> it = out.nodes.iterator();
         while(it.hasNext()) {
@@ -261,13 +260,11 @@
     public void testMultiGet10Ways() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Way> ways= new ArrayList<Way>(ds.ways);
+        ArrayList<Way> ways= new ArrayList<Way>(ds.getWays());
         for (int i =0; i< 10; i++) {
             reader.append(ways.get(i));
         }
         DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE);
-        assertEquals(10, out.ways.size());
-        Iterator<Way> it = out.ways.iterator();
-        while(it.hasNext()) {
-            Way w1 = it.next();
+        assertEquals(10, out.getWays().size());
+        for (Way w1: out.getWays()) {
             Way w2 = (Way)ds.getPrimitiveById(w1.getId(), OsmPrimitiveType.WAY);
             assertNotNull(w2);
@@ -281,13 +278,11 @@
     public void testMultiGet10Relations() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Relation> relations= new ArrayList<Relation>(ds.relations);
+        ArrayList<Relation> relations= new ArrayList<Relation>(ds.getRelations());
         for (int i =0; i< 10; i++) {
             reader.append(relations.get(i));
         }
         DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE);
-        assertEquals(10, out.relations.size());
-        Iterator<Relation> it = out.relations.iterator();
-        while(it.hasNext()) {
-            Relation r1 = it.next();
+        assertEquals(10, out.getRelations().size());
+        for (Relation r1: out.getRelations()) {
             Relation r2 = (Relation)ds.getPrimitiveById(r1.getId(), OsmPrimitiveType.RELATION);
             assertNotNull(r2);
@@ -301,10 +296,10 @@
     public void testMultiGet800Nodes() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Node> nodes = new ArrayList<Node>(ds.nodes);
+        ArrayList<Node> nodes = new ArrayList<Node>(ds.getNodes());
         for (int i =0; i< 812; i++) {
             reader.append(nodes.get(i));
         }
         DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE);
-        assertEquals(812, out.nodes.size());
+        assertEquals(812, out.getNodes().size());
         Iterator<Node> it = out.nodes.iterator();
         while(it.hasNext()) {
@@ -320,5 +315,5 @@
     public void multiGetWithNonExistingNode() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Node> nodes = new ArrayList<Node>(ds.nodes);
+        ArrayList<Node> nodes = new ArrayList<Node>(ds.getNodes());
         for (int i =0; i< 10; i++) {
             reader.append(nodes.get(i));
@@ -327,8 +322,6 @@
         reader.append(n); // doesn't exist
         DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE);
-        assertEquals(10, out.nodes.size());
-        Iterator<Node> it = out.nodes.iterator();
-        while(it.hasNext()) {
-            Node n1 = it.next();
+        assertEquals(10, out.getNodes().size());
+        for (Node n1:out.getNodes()) {
             Node n2 = (Node)ds.getPrimitiveById(n1.getId(), OsmPrimitiveType.NODE);
             assertNotNull(n2);
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 2199)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 2381)
@@ -34,5 +34,4 @@
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
-import org.xml.sax.SAXException;
 
 public class OsmServerBackreferenceReaderTest {
@@ -40,5 +39,5 @@
 
     protected static Node lookupNode(DataSet ds, int i) {
-        for (Node n: ds.nodes) {
+        for (Node n : ds.getNodes()) {
             if (("node-" + i).equals(n.get("name"))) return n;
         }
@@ -48,5 +47,5 @@
 
     protected static Way lookupWay(DataSet ds, int i) {
-        for (Way w: ds.ways) {
+        for (Way w : ds.getWays()) {
             if (("way-" + i).equals(w.get("name"))) return w;
         }
@@ -55,5 +54,5 @@
 
     protected static Relation lookupRelation(DataSet ds, int i) {
-        for (Relation r: ds.relations) {
+        for (Relation r : ds.getRelations()) {
             if (("relation-" + i).equals(r.get("name"))) return r;
         }
@@ -103,5 +102,5 @@
                 }
             }
-            ds.relations.add(r);
+            ds.addPrimitive(r);
         }
     }
@@ -127,7 +126,7 @@
         logger.info("creating data set on the server ...");
         ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
-        primitives.addAll(ds.nodes);
-        primitives.addAll(ds.ways);
-        primitives.addAll(ds.relations);
+        primitives.addAll(ds.getNodes());
+        primitives.addAll(ds.getWays());
+        primitives.addAll(ds.getRelations());
         OsmServerWriter writer = new OsmServerWriter();
         Changeset cs  = new Changeset();
@@ -253,8 +252,8 @@
         reader.setReadFull(false);
         DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
-        assertEquals(10, referers.nodes.size());
-        assertEquals(1, referers.ways.size());
-        assertEquals(0, referers.relations.size());
-        for (Way way: referers.ways) {
+        assertEquals(10, referers.getNodes().size());
+        assertEquals(1, referers.getWays().size());
+        assertEquals(0, referers.getRelations().size());
+        for (Way way : referers.getWays()) {
             assertEquals(w.getId(), way.getId());
             assertEquals(false, way.incomplete);
@@ -272,8 +271,8 @@
         reader.setReadFull(true);
         DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
-        assertEquals(10, referers.nodes.size());
-        assertEquals(1, referers.ways.size());
-        assertEquals(0, referers.relations.size());
-        for (Way way: referers.ways) {
+        assertEquals(10, referers.getNodes().size());
+        assertEquals(1, referers.getWays().size());
+        assertEquals(0, referers.getRelations().size());
+        for (Way way : referers.getWays()) {
             assertEquals(w.getId(), way.getId());
             assertEquals(false, way.incomplete);
@@ -292,10 +291,10 @@
         reader.setReadFull(false);
         DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
-        assertEquals(0, referers.nodes.size()); // no nodes loaded
-        assertEquals(6, referers.ways.size());  // 6 ways referred by two relations
-        for (Way w1: referers.ways) {
+        assertEquals(0, referers.getNodes().size()); // no nodes loaded
+        assertEquals(6, referers.getWays().size());  // 6 ways referred by two relations
+        for (Way w1 : referers.getWays()) {
             assertEquals(true, w1.incomplete);
         }
-        assertEquals(2, referers.relations.size());  // two relations referring to w
+        assertEquals(2, referers.getRelations().size());  // two relations referring to w
 
         Relation r = lookupRelation(referers, 0);
@@ -316,18 +315,18 @@
         reader.setReadFull(true);
         DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
-        assertEquals(6, referers.ways.size());  // 6 ways referred by two relations
-        for (Way w1: referers.ways) {
+        assertEquals(6, referers.getWays().size());  // 6 ways referred by two relations
+        for (Way w1 : referers.getWays()) {
             assertEquals(false, w1.incomplete);
         }
-        assertEquals(2, referers.relations.size());  // two relations referring to
+        assertEquals(2, referers.getRelations().size());  // two relations referring to
         Set<Long> expectedNodeIds = new HashSet<Long>();
-        for (Way way: referers.ways) {
-            Way orig = (Way)ds.getPrimitiveById(way.getId(), OsmPrimitiveType.WAY);
-            for(Node n: orig.getNodes()) {
+        for (Way way : referers.getWays()) {
+            Way orig = (Way) ds.getPrimitiveById(way.getId(), OsmPrimitiveType.WAY);
+            for (Node n : orig.getNodes()) {
                 expectedNodeIds.add(n.getId());
             }
         }
-        assertEquals(expectedNodeIds.size(), referers.nodes.size());
-        for (Node n : referers.nodes) {
+        assertEquals(expectedNodeIds.size(), referers.getNodes().size());
+        for (Node n : referers.getNodes()) {
             assertEquals(true, expectedNodeIds.contains(n.getId()));
         }
@@ -342,5 +341,5 @@
     @Test
     public void testBackrefrenceForRelation() throws OsmTransferException {
-        Relation r = lookupRelation(ds,1);
+        Relation r = lookupRelation(ds, 1);
         assertNotNull(r);
         // way with name "relation-1" is referred to by four relations:
@@ -370,6 +369,6 @@
         referringRelationsIds.add(r.getId());
 
-        for (Relation r1: referers.relations) {
-            if (! referringRelationsIds.contains(r1.getId())) {
+        for (Relation r1 : referers.getRelations()) {
+            if (!referringRelationsIds.contains(r1.getId())) {
                 assertEquals(true, r1.incomplete);
             }
@@ -401,6 +400,6 @@
         }
 
-        assertEquals(expectedWayIds.size(), referers.ways.size());
-        for (Way w1 : referers.ways) {
+        assertEquals(expectedWayIds.size(), referers.getWays().size());
+        for (Way w1 : referers.getWays()) {
             assertEquals(true, expectedWayIds.contains(w1.getId()));
             assertEquals(true, w1.incomplete);
@@ -409,5 +408,5 @@
         // make sure we didn't read any nodes
         //
-        assertEquals(0, referers.nodes.size());
+        assertEquals(0, referers.getNodes().size());
     }
 
@@ -438,5 +437,5 @@
     @Test
     public void testBackrefrenceForRelation_Full() throws OsmTransferException {
-        Relation r = lookupRelation(ds,1);
+        Relation r = lookupRelation(ds, 1);
         assertNotNull(r);
         // way with name "relation-1" is referred to by four relations:
@@ -468,5 +467,5 @@
         // all relations are fully loaded
         //
-        for (Relation r1: referers.relations) {
+        for (Relation r1 : referers.getRelations()) {
             assertEquals(false, r1.incomplete);
         }
@@ -497,5 +496,5 @@
         }
         for (long id : expectedWayIds) {
-            Way w = (Way)referers.getPrimitiveById(id, OsmPrimitiveType.WAY);
+            Way w = (Way) referers.getPrimitiveById(id, OsmPrimitiveType.WAY);
             assertNotNull(w);
             assertEquals(false, w.incomplete);
@@ -503,11 +502,11 @@
 
         Set<Long> expectedNodeIds = new HashSet<Long>();
-        for(int i=6; i< 10;i++) {
+        for (int i = 6; i < 10; i++) {
             Relation r1 = lookupRelation(ds, i);
             expectedNodeIds.addAll(getNodeIdsInRelation(r1));
         }
 
-        assertEquals(expectedNodeIds.size(), referers.nodes.size());
-        for(Node n : referers.nodes) {
+        assertEquals(expectedNodeIds.size(), referers.getNodes().size());
+        for (Node n : referers.getNodes()) {
             assertEquals(true, expectedNodeIds.contains(n.getId()));
         }