Changeset 17538 in osm for applications/editors/josm/plugins/graphview/src/org

Timestamp:

2009-09-08T23:55:18+02:00 (15 years ago)

Author:

guggis

Message:

Updating to JOSM r2082

File:

• applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java (modified) (4 diffs)

applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java

@@ -36 +36 @@
 
         public Iterable<RelationMember> getMembers(Relation relation) {
-                List<RelationMember> members = new ArrayList<RelationMember>(relation.members.size());
-                for (org.openstreetmap.josm.data.osm.RelationMember member : relation.members) {
-                        if (!member.member.deleted && !member.member.incomplete) {
+                List<RelationMember> members = new ArrayList<RelationMember>(relation.getMembersCount());
+                for (org.openstreetmap.josm.data.osm.RelationMember member : relation.getMembers()) {
+                        if (!member.getMember().isDeleted() && !member.getMember().incomplete) {
                                 members.add(new RelationMemberImpl(member));
                         }
@@ -149 +149 @@
 
                 protected boolean accept(P primitive) {
-                        return !primitive.deleted && !primitive.incomplete;
+                        return !primitive.isDeleted() && !primitive.incomplete;
                 }
         }
@@ -166 +166 @@
                 protected boolean accept(Relation relation) {
                         boolean complete = true;
-                        for (org.openstreetmap.josm.data.osm.RelationMember member : relation.members) {
-                                if (member.member == null || member.member.deleted || member.member.incomplete) {
+                        for (org.openstreetmap.josm.data.osm.RelationMember member : relation.getMembers()) {
+                                if (member.getMember() == null || member.getMember().isDeleted() || member.getMember().incomplete) {
                                         complete = false;
                                 }
@@ -179 +179 @@
                 private final Object member;
                 public RelationMemberImpl(org.openstreetmap.josm.data.osm.RelationMember originalMember) {
-                        this.role = originalMember.role;
-                        this.member = originalMember.member;
+                        this.role = originalMember.getRole();
+                        this.member = originalMember.getMember();
                 }
                 public String getRole() {