Changeset 1925 in josm for trunk/test/functional/org/openstreetmap/josm/io

Timestamp:

2009-08-08T08:52:03+02:00 (15 years ago)

Author:

jttt

Message:

Replaced Relation.members with Relation.getMembers()

File:

• trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (modified) (3 diffs)

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -381 +381 @@
         //
         Set<Long> expectedWayIds = new HashSet<Long>();
-        for (RelationMember m : lookupRelation(ds, 6).members) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
-            }
-        }
-        for (RelationMember m : lookupRelation(ds, 7).members) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
-            }
-        }
-        for (RelationMember m : lookupRelation(ds, 8).members) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
-            }
-        }
-        for (RelationMember m : lookupRelation(ds, 9).members) {
+        for (RelationMember m : lookupRelation(ds, 6).getMembers()) {
+            if (m.member instanceof Way) {
+                expectedWayIds.add(m.member.id);
+            }
+        }
+        for (RelationMember m : lookupRelation(ds, 7).getMembers()) {
+            if (m.member instanceof Way) {
+                expectedWayIds.add(m.member.id);
+            }
+        }
+        for (RelationMember m : lookupRelation(ds, 8).getMembers()) {
+            if (m.member instanceof Way) {
+                expectedWayIds.add(m.member.id);
+            }
+        }
+        for (RelationMember m : lookupRelation(ds, 9).getMembers()) {
             if (m.member instanceof Way) {
                 expectedWayIds.add(m.member.id);
@@ -425 +425 @@
         HashSet<Long> ret = new HashSet<Long>();
         if (r == null) return ret;
-        for (RelationMember m: r.members) {
+        for (RelationMember m: r.getMembers()) {
             if (m.member instanceof Node) {
                 ret.add(m.member.id);
@@ -477 +477 @@
         //
         Set<Long> expectedWayIds = new HashSet<Long>();
-        for (RelationMember m : lookupRelation(ds, 6).members) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
-            }
-        }
-        for (RelationMember m : lookupRelation(ds, 7).members) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
-            }
-        }
-        for (RelationMember m : lookupRelation(ds, 8).members) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
-            }
-        }
-        for (RelationMember m : lookupRelation(ds, 9).members) {
+        for (RelationMember m : lookupRelation(ds, 6).getMembers()) {
+            if (m.member instanceof Way) {
+                expectedWayIds.add(m.member.id);
+            }
+        }
+        for (RelationMember m : lookupRelation(ds, 7).getMembers()) {
+            if (m.member instanceof Way) {
+                expectedWayIds.add(m.member.id);
+            }
+        }
+        for (RelationMember m : lookupRelation(ds, 8).getMembers()) {
+            if (m.member instanceof Way) {
+                expectedWayIds.add(m.member.id);
+            }
+        }
+        for (RelationMember m : lookupRelation(ds, 9).getMembers()) {
             if (m.member instanceof Way) {
                 expectedWayIds.add(m.member.id);