Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java	(revision 1898)
+++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java	(revision 1910)
@@ -17,5 +17,5 @@
         Way w1 = new Way();
         Node n1;
-        w1.nodes.add(n1 = new Node(1));
+        w1.addNode(n1 = new Node(1));
         for (int i=0; i < 20; i++) {
             n1.put("key" + i, "value" + i);
@@ -26,11 +26,11 @@
         }
         n1.put("note", note);
-        w1.nodes.add(new Node(2));
-        w1.nodes.add(new Node(3));
+        w1.addNode(new Node(2));
+        w1.addNode(new Node(3));
 
         Way w2 = new Way();
-        w2.nodes.add(new Node(4));
-        w2.nodes.add(new Node(5));
-        w2.nodes.add(new Node(6));
+        w2.addNode(new Node(4));
+        w2.addNode(new Node(5));
+        w2.addNode(new Node(6));
 
         nodeListMerger.populate(w1, w2);
@@ -41,10 +41,10 @@
         Way w1 = new Way();
         for (int i = 0; i < 100; i++) {
-            w1.nodes.add(new Node(i));
+            w1.addNode(new Node(i));
         }
 
         Way w2 = new Way();
         for (int i = 1; i < 200; i+=2) {
-            w2.nodes.add(new Node(i));
+            w2.addNode(new Node(i));
         }
         nodeListMerger.populate(w1, w2);
Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 1898)
+++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java	(revision 1910)
@@ -10,32 +10,32 @@
 
     private ConflictResolutionDialog dialog;
-    
+
     protected void build() {
         setSize(100,100);
         dialog = new ConflictResolutionDialog(this);
         dialog.setSize(600,600);
-        
-        
+
+
     }
     protected void populate() {
         Way w1 = new Way(1);
-          w1.nodes.add(new Node(10));
-          w1.nodes.add(new Node(11));
-        
+          w1.addNode(new Node(10));
+          w1.addNode(new Node(11));
+
         Way w2 = new Way(1);
-          w2.nodes.add(new Node(10));
-          w2.nodes.add(new Node(11));
-    
+          w2.addNode(new Node(10));
+          w2.addNode(new Node(11));
+
        dialog.getConflictResolver().populate(w1, w2);
     }
-    
+
     public void showDialog() {
         dialog.setVisible(true);
     }
-    
+
     public ConflictResolutionDialogTest() {
         build();
     }
-    
+
     static public void main(String args[]) {
         ConflictResolutionDialogTest test = new ConflictResolutionDialogTest();
Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 1898)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 1910)
@@ -76,5 +76,5 @@
                 int idx = (start + j) % numNodes;
                 Node n = nodes.get(idx);
-                w.nodes.add(n);
+                w.addNode(n);
             }
             w.put("name", "way-"+i);
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 1898)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 1910)
@@ -74,5 +74,5 @@
             w.incomplete = false;
             for (int j = 0; j < 10;j++) {
-                w.nodes.add(lookupNode(ds, i+j));
+                w.addNode(lookupNode(ds, i+j));
             }
             w.put("name", "way-"+i);