Changeset 1926 in josm for trunk/src/org

Timestamp:

2009-08-08T09:22:24+02:00 (15 years ago)

Author:

jttt

Message:

Replaced Relation.members with Relation.getMember() or Relation.getMembersCount()

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PasteAction.java (modified) (1 diff)
• command/ChangeRelationMemberRoleCommand.java (modified) (2 diffs)
• data/osm/Relation.java (modified) (1 diff)
• data/osm/visitor/MergeVisitor.java (modified) (1 diff)
• gui/dialogs/relation/MemberTableModel.java (modified) (2 diffs)

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

@@ -100 +100 @@
                 }
             }
-            rnew.members.clear();
-            rnew.members.addAll(members);
+            rnew.setMembers(members);
             map.put(r, rnew);
         }

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

@@ -43 +43 @@
 
     @Override public boolean executeCommand() {
-        if (position < 0 || position >= relation.members.size()) {
+        if (position < 0 || position >= relation.getMembersCount()) {
             Main.debug("error changing the role");
             return false;
         }
 
-        oldRole = relation.members.get(position).role;
-        relation.members.get(position).role = newRole;
+        oldRole = relation.getMember(position).role;
+        relation.getMember(position).role = newRole;
 
         oldModified = relation.modified;
@@ -57 +57 @@
 
     @Override public void undoCommand() {
-        relation.members.get(position).role = oldRole;
+        relation.getMember(position).role = oldRole;
         relation.modified = oldModified;
     }

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -37 +37 @@
     /**
      *
-     * @param members
+     * @param members Can be null, in that case all members are removed
      * @since 1925
      */
     public void setMembers(List<RelationMember> members) {
         this.members.clear();
-        this.members.addAll(members);
+        if (members != null) {
+            this.members.addAll(members);
+        }
+    }
+
+    /**
+     *
+     * @since 1926
+     */
+    public int getMembersCount() {
+        return members.size();
+    }
+
+    /**
+     *
+     * @param index
+     * @return
+     * @since 1926
+     */
+    public RelationMember getMember(int index) {
+        return members.get(index);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -206 +206 @@
         }
         if (replacedSomething) {
-            r.members.clear();
-            r.members.addAll(newMembers);
+            r.setMembers(newMembers);
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -18 +18 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -224 +223 @@
 
     public void applyToRelation(Relation relation) {
-        relation.members.clear();
-        relation.members.addAll(members);
+        relation.setMembers(members);
     }