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

Timestamp:

2009-08-08T08:52:03+02:00 (15 years ago)

Author:

jttt

Message:

Replaced Relation.members with Relation.getMembers()

Location:

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

Files:

• DataSet.java (modified) (2 diffs)
• Relation.java (modified) (3 diffs)
• visitor/AllNodesVisitor.java (modified) (2 diffs)
• visitor/BoundingXYVisitor.java (modified) (2 diffs)
• visitor/CollectBackReferencesVisitor.java (modified) (1 diff)
• visitor/MapPaintVisitor.java (modified) (4 diffs)
• visitor/MergeSourceBuildingVisitor.java (modified) (2 diffs)
• visitor/MergeVisitor.java (modified) (1 diff)
• visitor/SimplePaintVisitor.java (modified) (1 diff)

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

@@ -401 +401 @@
     public void unlinkPrimitiveFromRelations(OsmPrimitive primitive) {
         for (Relation relation : relations) {
-            Iterator<RelationMember> it = relation.members.iterator();
+            Iterator<RelationMember> it = relation.getMembers().iterator();
             while(it.hasNext()) {
                 RelationMember member = it.next();
@@ -442 +442 @@
                 continue;
             }
-            for (RelationMember member: parent.members) {
+            for (RelationMember member: parent.getMembers()) {
                 if (member.refersTo(child)) {
                     parents.add(parent);

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.CopyList;
 
 /**
@@ -24 +25 @@
      */
     public final List<RelationMember> members = new ArrayList<RelationMember>();
+
+    /**
+     * @return Members of the relation. Changes made in returned list are not mapped
+     * back to the primitive, use setMembers() to modify the members
+     * @since 1925
+     */
+    public List<RelationMember> getMembers() {
+        return new CopyList<RelationMember>(members.toArray(new RelationMember[members.size()]));
+    }
+
+    /**
+     *
+     * @param members
+     * @since 1925
+     */
+    public void setMembers(List<RelationMember> members) {
+        this.members.clear();
+        this.members.addAll(members);
+    }
 
     final static String[] defnames = {"name", "ref", "restriction", "note"};
@@ -59 +79 @@
         // we must not add the members themselves, but instead
         // add clones of the members
-        for (RelationMember em : ((Relation)osm).members) {
+        for (RelationMember em : ((Relation)osm).getMembers()) {
             members.add(new RelationMember(em));
         }

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

@@ -5 +5 @@
 import java.util.HashSet;
 
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 
@@ -43 +43 @@
      */
     public void visit(Relation e) {
-        for (RelationMember m : e.members)
+        for (RelationMember m : e.getMembers())
             if (m.member instanceof Node) visit((Node)m.member);
     }

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

@@ -5 +5 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -33 +33 @@
     public void visit(Relation e) {
         // only use direct members
-        for (RelationMember m : e.members) {
+        for (RelationMember m : e.getMembers()) {
             if (!(m.member instanceof Relation)) {
                 m.member.visit(this);

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

@@ -73 +73 @@
         for (Relation r : ds.relations) {
             if (r.incomplete || r.deleted) continue;
-            for (RelationMember m : r.members) {
+            for (RelationMember m : r.getMembers()) {
                 if (m.member == p) {
                     if (!data.contains(r)) {

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

@@ -485 +485 @@
         if(selectedCall)
         {
-            for (RelationMember m : r.members)
+            for (RelationMember m : r.getMembers())
             {
                 if (m.member != null && !m.member.incomplete && !m.member.deleted
@@ -507 +507 @@
         if(r.isSelected()) /* draw ways*/
         {
-            for (RelationMember m : r.members)
+            for (RelationMember m : r.getMembers())
             {
                 if (m.member != null && !m.member.incomplete && !m.member.deleted
@@ -532 +532 @@
 
         /* find the "from", "via" and "to" elements */
-        for (RelationMember m : r.members)
+        for (RelationMember m : r.getMembers())
         {
             //if(restrictionDebug)
@@ -782 +782 @@
         r.clearErrors();
 
-        for (RelationMember m : r.members)
+        for (RelationMember m : r.getMembers())
         {
             if(m.member == null)

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

@@ -91 +91 @@
         }
         clone.members.clear();
-        for (RelationMember member: r.members) {
+        for (RelationMember member: r.getMembers()) {
             RelationMember cloneMember = new RelationMember(member);
             cloneMember.member = mappedPrimitives.get(member.member);
@@ -189 +189 @@
         //
         rememberRelationPartial(r);
-        for (RelationMember member: r.members) {
+        for (RelationMember member: r.getMembers()) {
             if (isAlreadyRemembered(member.member)) {
                 // referred primitive already remembered

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

@@ -192 +192 @@
         boolean replacedSomething = false;
         LinkedList<RelationMember> newMembers = new LinkedList<RelationMember>();
-        for (RelationMember myMember : r.members) {
+        for (RelationMember myMember : r.getMembers()) {
             OsmPrimitive mergedMember = merged.get(myMember.member);
             if (mergedMember == null) {

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

@@ -348 +348 @@
         g.setColor(col);
 
-        for (RelationMember m : r.members) {
+        for (RelationMember m : r.getMembers()) {
             if (m.member.incomplete || m.member.deleted) continue;