Changeset 1951 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

Timestamp:

2009-08-10T20:36:40+02:00 (17 years ago)

Author:

jttt

Message:

Replace some occurrences of RelationMember.member with getters

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (3 diffs)

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

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -225 +226 @@
         // modify all relations containing the now-deleted ways
         for (Relation r : relationsUsingWays) {
-            Relation newRel = new Relation(r);
-            newRel.members.clear();
+            List<RelationMember> newMembers = new ArrayList<RelationMember>();
             HashSet<String> rolesToReAdd = new HashSet<String>();
             for (RelationMember rm : r.getMembers()) {
@@ -234 +234 @@
                     rolesToReAdd.add(rm.getRole());
                 } else {
-                    newRel.members.add(rm);
+                    newMembers.add(rm);
                 }
             }
             for (String role : rolesToReAdd) {
-                newRel.members.add(new RelationMember(role, modifyWay));
-            }
+                newMembers.add(new RelationMember(role, modifyWay));
+            }
+            Relation newRel = new Relation(r);
+            newRel.setMembers(newMembers);
             cmds.add(new ChangeCommand(r, newRel));
         }