Changeset 19216 in osm for applications/editors/josm/plugins/graphview/test

Timestamp:

2009-12-27T17:44:48+01:00 (16 years ago)

Author:

tordanik

Message:

added type parameter for relation members to GraphView's DataSource

Location:

applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core

Files:

• FullGraphCreationTest.java (modified) (1 diff)
• TestDataSource.java (modified) (5 diffs)

applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/FullGraphCreationTest.java

@@ -165 +165 @@
                 properties.add(new RoadWidth());
 
-                return new GenericTransitionStructure<TestNode, TestWay, TestRelation>(
-                                TestNode.class, TestWay.class, TestRelation.class,
+                return new GenericTransitionStructure<TestNode, TestWay, TestRelation, TestRelationMember>(
                                 ACCESS_PARAMS, TEST_RULESET, dataSource, properties);
         }

applications/editors/josm/plugins/graphview/test/org/openstreetmap/josm/plugins/graphview/core/TestDataSource.java

@@ -12 +12 @@
 import org.openstreetmap.josm.plugins.graphview.core.data.TagGroup;
 
-public class TestDataSource implements DataSource<TestDataSource.TestNode, TestDataSource.TestWay, TestDataSource.TestRelation> {
+public class TestDataSource implements DataSource<TestDataSource.TestNode, TestDataSource.TestWay, TestDataSource.TestRelation, TestDataSource.TestRelationMember> {
 
         public static class TestPrimitive {
@@ -43 +43 @@
 
         public static class TestRelation extends TestPrimitive {
-                public final Collection<RelationMember> members = new LinkedList<RelationMember>();
+                public final Collection<TestRelationMember> members = new LinkedList<TestRelationMember>();
                 @Override
                 public String toString() {
@@ -50 +50 @@
         }
 
-        public static class TestRelationMember implements RelationMember {
+        public static class TestRelationMember {
                 public final String role;
                 public final TestPrimitive member;
@@ -82 +82 @@
         }
 
-        public Iterable<RelationMember> getMembers(TestRelation relation) {
+        public Iterable<TestRelationMember> getMembers(TestRelation relation) {
                 return relation.members;
         }
@@ -113 +113 @@
                 return new MapBasedTagGroup(relation.tags);
         }
+        
+        public Object getMember(TestRelationMember member) {
+                return member.getMember();
+        }
+        
+        public String getRole(TestRelationMember member) {
+                return member.getRole();
+        }
+        
+        public boolean isNMember(TestRelationMember member) {
+                return member.getMember() instanceof TestNode;
+        }
+        
+        public boolean isWMember(TestRelationMember member) {
+                return member.getMember() instanceof TestWay;
+        }
+        
+        public boolean isRMember(TestRelationMember member) {
+                return member.getMember() instanceof TestRelation;
+        }
 
         public void addObserver(DataSourceObserver observer) {