Changeset 1951 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

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

Author:

jttt

Message:

Replace some occurrences of RelationMember.member with getters

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• RelationMemberConflictResolverCommand.java (modified) (2 diffs)
• RemoveRelationMemberCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java

@@ -40 +40 @@
 
     /**
-     * 
+     *
      * @param my my relation
      * @param their their relation
@@ -72 +72 @@
         // nodes
         //
-        my.members.clear();
-        for (int i=0; i<mergedMembers.size();i++) {
-            RelationMember n = mergedMembers.get(i);
-            my.members.add(n);
-        }
+        my.setMembers(mergedMembers);
 
         // remember the layer
-        layer = Main.main.map.mapView.getEditLayer();
+        layer = Main.map.mapView.getEditLayer();
         return true;
     }

trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java

@@ -44 +44 @@
     @Override public boolean executeCommand() {
         super.executeCommand();
-        int removed_at = relation.members.indexOf(member);
-        relation.members.remove(member);
-        if ((location != -1) && (removed_at != location)) {
-            relation.members.add(removed_at, member);
+        int removeIndex = relation.getMembers().indexOf(member);
+        if ((location != -1) && (removeIndex != location)) {
             Main.debug("error removing relation member");
             return false;
+        } else {
+            relation.removeMember(removeIndex);
+            relation.modified = true;
+            return true;
         }
-        relation.modified = true;
-        return true;
     }
 
     @Override public void undoCommand() {
         super.undoCommand();
-        relation.members.add(member);
+        relation.addMember(member);
         relation.modified = this.getOrig(relation).modified;
     }