Changeset 1926 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

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

Author:

jttt

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• Relation.java (modified) (1 diff)
• visitor/MergeVisitor.java (modified) (1 diff)

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);
         }
     }