Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 1948)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 1951)
@@ -153,5 +153,5 @@
         Relation r1 = new Relation(1);
         Node n20 = new Node(20);
-        r1.members.add(new RelationMember("node-20",n20));
+        r1.addMember(new RelationMember("node-20",n20));
         Way w30 = new Way(30);
         Node n21;
@@ -159,7 +159,7 @@
         Node n22;
         w30.addNode(n22 = new Node(22));
-        r1.members.add(new RelationMember("way-30",w30));
+        r1.addMember(new RelationMember("way-30",w30));
         Relation r40 = new Relation(40);
-        r1.members.add(new RelationMember("relation-40", r40));
+        r1.addMember(new RelationMember("relation-40", r40));
         source.nodes.add(n20);
         source.nodes.add(n21);
@@ -199,9 +199,9 @@
         assertEquals(3, r.getMembersCount());
         RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20));
-        assertTrue(r.members.contains(m));
+        assertTrue(r.getMembers().contains(m));
         m = new RelationMember("way-30", hull.getPrimitiveById(30));
-        assertTrue(r.members.contains(m));
+        assertTrue(r.getMembers().contains(m));
         m = new RelationMember("relation-40", hull.getPrimitiveById(40));
-        assertTrue(r.members.contains(m));
+        assertTrue(r.getMembers().contains(m));
     }
 
@@ -211,5 +211,5 @@
         Relation r1 = new Relation(1);
         Node n20 = new Node(20);
-        r1.members.add(new RelationMember("node-20",n20));
+        r1.addMember(new RelationMember("node-20",n20));
         Way w30 = new Way(30);
         Node n21;
@@ -217,7 +217,7 @@
         Node n22;
         w30.addNode(n22 = new Node(22));
-        r1.members.add(new RelationMember("way-30",w30));
+        r1.addMember(new RelationMember("way-30",w30));
         Relation r40 = new Relation(40);
-        r1.members.add(new RelationMember("relation-40", r40));
+        r1.addMember(new RelationMember("relation-40", r40));
         source.nodes.add(n20);
         source.nodes.add(n21);
@@ -258,9 +258,9 @@
         assertEquals(3, r.getMembersCount());
         RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20));
-        assertTrue(r.members.contains(m));
+        assertTrue(r.getMembers().contains(m));
         m = new RelationMember("way-30", hull.getPrimitiveById(30));
-        assertTrue(r.members.contains(m));
+        assertTrue(r.getMembers().contains(m));
         m = new RelationMember("relation-40", hull.getPrimitiveById(40));
-        assertTrue(r.members.contains(m));
+        assertTrue(r.getMembers().contains(m));
     }
 
@@ -272,5 +272,5 @@
         Node n20 = new Node(new LatLon(20.0,20.0));
         n20.put("name", "n20");
-        r1.members.add(new RelationMember("node-20",n20));
+        r1.getMembers().add(new RelationMember("node-20",n20));
         Way w30 = new Way();
         w30.put("name", "w30");
@@ -281,8 +281,8 @@
         w30.addNode(n22 = new Node(new LatLon(22.0,22.0)));
         n22.put("name","n22");
-        r1.members.add(new RelationMember("way-30",w30));
+        r1.addMember(new RelationMember("way-30",w30));
         Relation r40 = new Relation();
         r40.put("name", "r40");
-        r1.members.add(new RelationMember("relation-40", r40));
+        r1.addMember(new RelationMember("relation-40", r40));
         source.nodes.add(n20);
         source.nodes.add(n21);
@@ -323,9 +323,9 @@
         assertEquals(3, r.getMembersCount());
         RelationMember m = new RelationMember("node-20", lookupByName(hull.nodes, "n20"));
-        assertTrue(r.members.contains(m));
+        assertTrue(r.getMembers().contains(m));
         m = new RelationMember("way-30", lookupByName(hull.ways, "w30"));
-        assertTrue(r.members.contains(m));
+        assertTrue(r.getMembers().contains(m));
         m = new RelationMember("relation-40", lookupByName(hull.relations, "r40"));
-        assertTrue(r.members.contains(m));
+        assertTrue(r.getMembers().contains(m));
     }
 
@@ -334,5 +334,5 @@
         DataSet source = new DataSet();
         Relation r1 = new Relation(1);
-        r1.members.add(new RelationMember("relation-1",r1));
+        r1.addMember(new RelationMember("relation-1",r1));
         source.relations.add(r1);
         source.setSelected(r1);
@@ -346,5 +346,5 @@
         assertNotNull(r);
         assertEquals(1, r.getMembersCount());
-        assertTrue(r.members.contains(new RelationMember("relation-1",r)));
+        assertTrue(r.getMembers().contains(new RelationMember("relation-1",r)));
     }
 
@@ -354,5 +354,5 @@
         Relation r1 = new Relation();
         r1.put("name", "r1");
-        r1.members.add(new RelationMember("relation-1",r1));
+        r1.addMember(new RelationMember("relation-1",r1));
         source.relations.add(r1);
         source.setSelected(r1);
@@ -366,5 +366,5 @@
         assertNotNull(r);
         assertEquals(1, r.getMembersCount());
-        assertTrue(r.members.contains(new RelationMember("relation-1",r)));
+        assertTrue(r.getMembers().contains(new RelationMember("relation-1",r)));
     }
 
@@ -374,6 +374,6 @@
         Relation r1 = new Relation(1);
         Relation r2 = new Relation(2);
-        r1.members.add(new RelationMember("relation-2",r2));
-        r2.members.add(new RelationMember("relation-1",r1));
+        r1.addMember(new RelationMember("relation-2",r2));
+        r2.addMember(new RelationMember("relation-1",r1));
         source.relations.add(r1);
         source.relations.add(r2);
@@ -390,7 +390,7 @@
         assertNotNull(r2);
         assertEquals(1, r1.getMembersCount());
-        assertTrue(r1.members.contains(new RelationMember("relation-2",r2)));
+        assertTrue(r1.getMembers().contains(new RelationMember("relation-2",r2)));
         assertEquals(1, r2.getMembersCount());
-        assertTrue(r2.members.contains(new RelationMember("relation-1",r1)));
+        assertTrue(r2.getMembers().contains(new RelationMember("relation-1",r1)));
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 1948)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 1951)
@@ -965,7 +965,7 @@
         theirRelation.id = 4;
         theirRelation.version = 1;
-        theirRelation.members.add(new RelationMember("", n3));
-        theirRelation.members.add(new RelationMember("", n4));
-        theirRelation.members.add(new RelationMember("", n5));
+        theirRelation.addMember(new RelationMember("", n3));
+        theirRelation.addMember(new RelationMember("", n4));
+        theirRelation.addMember(new RelationMember("", n5));
         their.addPrimitive(theirRelation);