Changeset 1926 in josm

Timestamp:

Aug 8, 2009 9:22:24 AM (4 years ago)

Author:

jttt

Message:

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

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/PasteAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/Relation.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (modified) (8 diffs)
• test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (1 diff)

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

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm.visitor;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Collection;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -13 +17 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-
-import static org.junit.Assert.*;
 
 public class MergeSourceBuildingVisitorTest {
@@ -195 +197 @@
         r = (Relation)hull.getPrimitiveById(1);
         assertNotNull(r);
-        assertEquals(3, r.members.size());
+        assertEquals(3, r.getMembersCount());
         RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20));
         assertTrue(r.members.contains(m));
@@ -254 +256 @@
         r = (Relation)hull.getPrimitiveById(1);
         assertNotNull(r);
-        assertEquals(3, r.members.size());
+        assertEquals(3, r.getMembersCount());
         RelationMember m = new RelationMember("node-20", hull.getPrimitiveById(20));
         assertTrue(r.members.contains(m));
@@ -319 +321 @@
         r = (Relation)lookupByName(hull.relations, "r1");
         assertNotNull(r);
-        assertEquals(3, r.members.size());
+        assertEquals(3, r.getMembersCount());
         RelationMember m = new RelationMember("node-20", lookupByName(hull.nodes, "n20"));
         assertTrue(r.members.contains(m));
@@ -343 +345 @@
         Relation r = (Relation)hull.getPrimitiveById(1);
         assertNotNull(r);
-        assertEquals(1, r.members.size());
+        assertEquals(1, r.getMembersCount());
         assertTrue(r.members.contains(new RelationMember("relation-1",r)));
     }
@@ -363 +365 @@
         Relation r = (Relation)lookupByName(hull.relations, "r1");
         assertNotNull(r);
-        assertEquals(1, r.members.size());
+        assertEquals(1, r.getMembersCount());
         assertTrue(r.members.contains(new RelationMember("relation-1",r)));
     }
@@ -387 +389 @@
         r2 = (Relation)hull.getPrimitiveById(2);
         assertNotNull(r2);
-        assertEquals(1, r1.members.size());
+        assertEquals(1, r1.getMembersCount());
         assertTrue(r1.members.contains(new RelationMember("relation-2",r2)));
-        assertEquals(1, r2.members.size());
+        assertEquals(1, r2.getMembersCount());
         assertTrue(r2.members.contains(new RelationMember("relation-1",r1)));
     }

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

@@ -972 +972 @@
 
         Relation r = (Relation)my.getPrimitiveById(4);
-        assertEquals(2, r.members.size());
+        assertEquals(2, r.getMembersCount());
 
         Node n = (Node)my.getPrimitiveById(1);