Changeset 1925 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

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

Author:

jttt

Message:

Replaced Relation.members with Relation.getMembers()

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (2 diffs)
• CopyAction.java (modified) (1 diff)
• MergeNodesAction.java (modified) (2 diffs)
• PasteAction.java (modified) (1 diff)
• SplitWayAction.java (modified) (1 diff)
• UnGlueAction.java (modified) (2 diffs)
• search/SearchCompiler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -93 +93 @@
                 continue;
             }
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 if (rm.member instanceof Way) {
                     for(Way w : selectedWays) {
@@ -228 +228 @@
             newRel.members.clear();
             HashSet<String> rolesToReAdd = new HashSet<String>();
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 // Don't copy the member if it to one of our ways, just keep a
                 // note to re-add it later on.

trunk/src/org/openstreetmap/josm/actions/CopyAction.java

@@ -96 +96 @@
                 Relation enew = new Relation(e);
                 List<RelationMember> members = new ArrayList<RelationMember>();
-                for (RelationMember m : e.members) {
+                for (RelationMember m : e.getMembers()) {
                     if (! map.containsKey(m.member)) {
                         m.member.visit(this);

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -130 +130 @@
                 continue;
             }
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 if (rm.member instanceof Node) {
                     for (Node n : allNodes) {
@@ -278 +278 @@
             newRel.members.clear();
             HashSet<String> rolesToReAdd = new HashSet<String>();
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 // Don't copy the member if it points to one of our nodes,
                 // just keep a note to re-add it later on.

trunk/src/org/openstreetmap/josm/actions/PasteAction.java

@@ -91 +91 @@
             rnew.id = 0;
             List<RelationMember> members = new ArrayList<RelationMember>();
-            for (RelationMember m : r.members) {
+            for (RelationMember m : r.getMembers()) {
                 OsmPrimitive mo = map.get(m.member);
                 if(mo != null) /* TODO - This only prevents illegal data, but kills the relation */

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -304 +304 @@
             int i = 0;
 
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 if (rm.member instanceof Way) {
                     if (rm.member == selectedWay)

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -327 +327 @@
             newRel = null;
             rolesToReAdd = null;
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 if (rm.member instanceof Node) {
                     if (rm.member == originalNode) {
@@ -340 +340 @@
             }
             if (newRel != null) {
-                for (RelationMember rm : r.members) {
+                for (RelationMember rm : r.getMembers()) {
                     //if (rm.member != selectedNode) {
                     newRel.members.add(rm);

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -445 +445 @@
                 }
             } else if (osm instanceof Relation) {
-                for (RelationMember member : ((Relation)osm).members) {
+                for (RelationMember member : ((Relation)osm).getMembers()) {
                     if (member.member != null) {
                         isParent |= child.match(member.member);