Changeset 1951 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation

Timestamp:

2009-08-10T20:36:40+02:00 (15 years ago)

Author:

jttt

Message:

Replace some occurrences of RelationMember.member with getters

File:

• trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java (modified) (2 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.nodes.NodeListMerger;
-import org.openstreetmap.josm.gui.conflict.nodes.NodeListMergerTest;
 
 public class RelationMemberMergerTest extends JFrame {
-    
+
     private RelationMemberMerger merger;
-    
+
     protected void populate() {
         Relation r1 = new Relation();
-        r1.members.add(new RelationMember("role1", new Node(1)));
-        r1.members.add(new RelationMember("role2", new Way(2)));
-        r1.members.add(new RelationMember("role3", new Relation(3)));
+        r1.addMember(new RelationMember("role1", new Node(1)));
+        r1.addMember(new RelationMember("role2", new Way(2)));
+        r1.addMember(new RelationMember("role3", new Relation(3)));
 
-        
+
         Relation r2 = new Relation();
-        r2.members.add(new RelationMember("role1", new Node(1)));
-        r2.members.add(new RelationMember("role2", new Way(2)));
-        r2.members.add(new RelationMember("role3", new Relation(3)));
-        
+        r2.addMember(new RelationMember("role1", new Node(1)));
+        r2.addMember(new RelationMember("role2", new Way(2)));
+        r2.addMember(new RelationMember("role3", new Relation(3)));
+
         merger.populate(r1, r2);
 
     }
-    
+
     protected void build() {
         merger = new RelationMemberMerger();
@@ -38 +36 @@
         getContentPane().add(merger, BorderLayout.CENTER);
     }
-    
+
     public RelationMemberMergerTest() {
         build();
         populate();
     }
-    
+
     static public void main(String args[]) {
         RelationMemberMergerTest test = new RelationMemberMergerTest();