Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 2291)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 2292)
@@ -382,5 +382,5 @@
         n.setCoor(new LatLon(0,0));
         n.put("key1", "value1");
-        n.user = myUser;
+        n.setUser(myUser);
         n.setTimestamp(cal.getTime());
 
@@ -395,5 +395,5 @@
         Date timestamp = cal.getTime();
         n1.setTimestamp(timestamp);
-        n1.user = theirUser;
+        n1.setUser(theirUser);
         their.addPrimitive(n1);
 
@@ -406,5 +406,5 @@
         assertEquals("value1",n2.get("key1"));
         assertEquals(true, n1.getTimestamp().equals(n2.getTimestamp()));
-        assertEquals(theirUser,n2.user);
+        assertEquals(theirUser,n2.getUser());
     }
 
@@ -740,5 +740,5 @@
         theirWay.addNode(n3);
         theirWay.addNode(n4);
-        theirWay.user = User.createOsmUser(1111, "their");
+        theirWay.setUser(User.createOsmUser(1111, "their"));
         theirWay.setTimestamp(new Date());
         their.addPrimitive(theirWay);
@@ -748,7 +748,7 @@
 
         assertEquals(0,visitor.getConflicts().size());
-        assertEquals("their", myWay.user.getName());
-        assertEquals(1111, myWay.user.getId());
-        assertEquals(1111, myWay.user.getId());
+        assertEquals("their", myWay.getUser().getName());
+        assertEquals(1111, myWay.getUser().getId());
+        assertEquals(1111, myWay.getUser().getId());
         assertEquals(theirWay.getTimestamp(), myWay.getTimestamp());
     }
@@ -789,5 +789,5 @@
         theirWay.addNode(n3);
         theirWay.addNode(n4);
-        theirWay.user = User.createOsmUser(1111, "their");
+        theirWay.setUser(User.createOsmUser(1111, "their"));
         theirWay.setTimestamp(new Date());
         their.addPrimitive(theirWay);
@@ -797,7 +797,7 @@
 
         assertEquals(0,visitor.getConflicts().size());
-        assertEquals("their", myWay.user.getName());
-        assertEquals(1111, myWay.user.getId());
-        assertEquals(1111, myWay.user.getId());
+        assertEquals("their", myWay.getUser().getName());
+        assertEquals(1111, myWay.getUser().getId());
+        assertEquals(1111, myWay.getUser().getId());
         assertEquals(theirWay.getTimestamp(), myWay.getTimestamp());
     }
@@ -844,5 +844,5 @@
         theirWay.addNode(n4);
         theirWay.addNode(n5);
-        theirWay.user = User.createOsmUser(1111, "their");
+        theirWay.setUser(User.createOsmUser(1111, "their"));
         theirWay.setTimestamp(new Date());
         their.addPrimitive(theirWay);