Changeset 17542 in osm for applications/editors/josm/plugins/routes

Timestamp:

2009-09-09T00:07:47+02:00 (15 years ago)

Author:

guggis

Message:

Updating to JOSM r2082

Location:

applications/editors/josm/plugins/routes

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/routes/RouteLayer.java (modified) (1 diff)

applications/editors/josm/plugins/routes/build.xml

@@ -35 +35 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be defined in routes.xml file in plugin directory"/>
-                <attribute name="Plugin-Mainversion" value="2012"/>
+                <attribute name="Plugin-Mainversion" value="2082"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java

@@ -76 +76 @@
                         Relation r = (Relation)rel;
                         RelationMember foundMember = null;
-                        for (RelationMember member:r.members) {
-                                if (member.member == way) {
+                        for (RelationMember member:r.getMembers()) {
+                                if (member.getMember() == way) {
                                         foundMember = member;
                                         break;
@@ -87 +87 @@
                         } else {
                                 Relation newRelation = new Relation(r);
-                                newRelation.members.add(new RelationMember("", way));
+                                newRelation.getMembers().add(new RelationMember("", way));
                     Main.main.undoRedo.add(new ChangeCommand(r, newRelation));
                         }

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java

@@ -85 +85 @@
 
         private void addRelation(Relation relation, RouteDefinition route) {
-                for (RelationMember member:relation.members) {
-                        if (member.member instanceof Way) {
-                                Way way = (Way)member.member;
+                for (RelationMember member:relation.getMembers()) {
+                        if (member.getMember() instanceof Way) {
+                                Way way = (Way)member.getMember();
                                 pathBuilder.addWay(way, route);
                         }