Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 1928)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 1938)
@@ -377,21 +377,21 @@
         Set<Long> expectedWayIds = new HashSet<Long>();
         for (RelationMember m : lookupRelation(ds, 6).getMembers()) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
+            if (m.isWay()) {
+                expectedWayIds.add(m.getMember().id);
             }
         }
         for (RelationMember m : lookupRelation(ds, 7).getMembers()) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
+            if (m.isWay()) {
+                expectedWayIds.add(m.getMember().id);
             }
         }
         for (RelationMember m : lookupRelation(ds, 8).getMembers()) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
+            if (m.isWay()) {
+                expectedWayIds.add(m.getMember().id);
             }
         }
         for (RelationMember m : lookupRelation(ds, 9).getMembers()) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
+            if (m.isWay()) {
+                expectedWayIds.add(m.getMember().id);
             }
         }
@@ -421,10 +421,10 @@
         if (r == null) return ret;
         for (RelationMember m: r.getMembers()) {
-            if (m.member instanceof Node) {
-                ret.add(m.member.id);
-            } else if (m.member instanceof Way) {
-                ret.addAll(getNodeIdsInWay((Way)m.member));
-            } else if (m.member instanceof Relation) {
-                ret.addAll(getNodeIdsInRelation((Relation)m.member));
+            if (m.isNode()) {
+                ret.add(m.getMember().id);
+            } else if (m.isWay()) {
+                ret.addAll(getNodeIdsInWay(m.getWay()));
+            } else if (m.isRelation()) {
+                ret.addAll(getNodeIdsInRelation(m.getRelation()));
             }
         }
@@ -473,21 +473,21 @@
         Set<Long> expectedWayIds = new HashSet<Long>();
         for (RelationMember m : lookupRelation(ds, 6).getMembers()) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
+            if (m.isWay()) {
+                expectedWayIds.add(m.getMember().id);
             }
         }
         for (RelationMember m : lookupRelation(ds, 7).getMembers()) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
+            if (m.isWay()) {
+                expectedWayIds.add(m.getMember().id);
             }
         }
         for (RelationMember m : lookupRelation(ds, 8).getMembers()) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
+            if (m.isWay()) {
+                expectedWayIds.add(m.getMember().id);
             }
         }
         for (RelationMember m : lookupRelation(ds, 9).getMembers()) {
-            if (m.member instanceof Way) {
-                expectedWayIds.add(m.member.id);
+            if (m.isWay()) {
+                expectedWayIds.add(m.getMember().id);
             }
         }