Changeset 1925 in josm for trunk/src

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

Files:

• actions/CombineWayAction.java (modified) (2 diffs)
• actions/CopyAction.java (modified) (1 diff)
• actions/MergeNodesAction.java (modified) (2 diffs)
• actions/PasteAction.java (modified) (1 diff)
• actions/SplitWayAction.java (modified) (1 diff)
• actions/UnGlueAction.java (modified) (2 diffs)
• actions/search/SearchCompiler.java (modified) (1 diff)
• command/DeleteCommand.java (modified) (1 diff)
• command/PurgePrimitivesCommand.java (modified) (1 diff)
• corrector/ReverseWayTagCorrector.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (2 diffs)
• data/osm/Relation.java (modified) (3 diffs)
• data/osm/visitor/AllNodesVisitor.java (modified) (2 diffs)
• data/osm/visitor/BoundingXYVisitor.java (modified) (2 diffs)
• data/osm/visitor/CollectBackReferencesVisitor.java (modified) (1 diff)
• data/osm/visitor/MapPaintVisitor.java (modified) (4 diffs)
• data/osm/visitor/MergeSourceBuildingVisitor.java (modified) (2 diffs)
• data/osm/visitor/MergeVisitor.java (modified) (1 diff)
• data/osm/visitor/SimplePaintVisitor.java (modified) (1 diff)
• gui/conflict/properties/PropertiesMergeModel.java (modified) (1 diff)
• gui/conflict/relation/RelationMemberListMergeModel.java (modified) (4 diffs)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)
• gui/dialogs/PropertiesDialog.java (modified) (2 diffs)
• gui/dialogs/RelationListDialog.java (modified) (2 diffs)
• gui/dialogs/relation/ChildRelationBrowser.java (modified) (13 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (19 diffs)
• gui/dialogs/relation/MemberTableModel.java (modified) (11 diffs)
• gui/dialogs/relation/ReferringRelationsBrowserModel.java (modified) (2 diffs)
• gui/dialogs/relation/RelationTreeModel.java (modified) (12 diffs)
• gui/dialogs/relation/ac/AutoCompletionCache.java (modified) (11 diffs)
• io/MultiFetchServerObjectReader.java (modified) (1 diff)
• io/OsmWriter.java (modified) (1 diff)

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

@@ -93 +93 @@
                 continue;
             }
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 if (rm.member instanceof Way) {
                     for(Way w : selectedWays) {
@@ -228 +228 @@
             newRel.members.clear();
             HashSet<String> rolesToReAdd = new HashSet<String>();
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 // Don't copy the member if it to one of our ways, just keep a
                 // note to re-add it later on.

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

@@ -96 +96 @@
                 Relation enew = new Relation(e);
                 List<RelationMember> members = new ArrayList<RelationMember>();
-                for (RelationMember m : e.members) {
+                for (RelationMember m : e.getMembers()) {
                     if (! map.containsKey(m.member)) {
                         m.member.visit(this);

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

@@ -130 +130 @@
                 continue;
             }
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 if (rm.member instanceof Node) {
                     for (Node n : allNodes) {
@@ -278 +278 @@
             newRel.members.clear();
             HashSet<String> rolesToReAdd = new HashSet<String>();
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 // Don't copy the member if it points to one of our nodes,
                 // just keep a note to re-add it later on.

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

@@ -91 +91 @@
             rnew.id = 0;
             List<RelationMember> members = new ArrayList<RelationMember>();
-            for (RelationMember m : r.members) {
+            for (RelationMember m : r.getMembers()) {
                 OsmPrimitive mo = map.get(m.member);
                 if(mo != null) /* TODO - This only prevents illegal data, but kills the relation */

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

@@ -304 +304 @@
             int i = 0;
 
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 if (rm.member instanceof Way) {
                     if (rm.member == selectedWay)

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

@@ -327 +327 @@
             newRel = null;
             rolesToReAdd = null;
-            for (RelationMember rm : r.members) {
+            for (RelationMember rm : r.getMembers()) {
                 if (rm.member instanceof Node) {
                     if (rm.member == originalNode) {
@@ -340 +340 @@
             }
             if (newRel != null) {
-                for (RelationMember rm : r.members) {
+                for (RelationMember rm : r.getMembers()) {
                     //if (rm.member != selectedNode) {
                     newRel.members.add(rm);

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -445 +445 @@
                 }
             } else if (osm instanceof Relation) {
-                for (RelationMember member : ((Relation)osm).members) {
+                for (RelationMember member : ((Relation)osm).getMembers()) {
                     if (member.member != null) {
                         isParent |= child.match(member.member);

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

@@ -164 +164 @@
         PrimitiveNameFormatter formatter = new PrimitiveNameFormatter();
         String role = new String();
-        for (RelationMember m : ref.members) {
+        for (RelationMember m : ref.getMembers()) {
             if (m.member == osm) {
                 role = m.role;

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

@@ -119 +119 @@
             } else if (parent instanceof Relation) {
                 Relation r = (Relation)parent;
-                for (RelationMember member : r.members) {
+                for (RelationMember member : r.getMembers()) {
                     if (member.member == child) {
                         OsmParentChildPair pair = new OsmParentChildPair(parent, member.member);

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -117 +117 @@
         for (Relation relation : Main.main.getCurrentDataSet().relations) {
             int position = 0;
-            for (RelationMember member : relation.members) {
+            for (RelationMember member : relation.getMembers()) {
                 if (!member.member.hasEqualSemanticAttributes(oldway)
                         || member.role.length() == 0) {

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;
 

trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java

@@ -570 +570 @@
 
         HashMap<Long,OsmPrimitive> candidates = new HashMap<Long, OsmPrimitive>();
-        for (RelationMember m : r.members) {
+        for (RelationMember m : r.getMembers()) {
             if (m.member.id > 0 && !candidates.values().contains(m.member)) {
                 candidates.put(m.member.id,m.member);

trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java

@@ -15 +15 @@
 /**
  * The model for merging two lists of relation members
- * 
+ *
  *
  */
@@ -63 +63 @@
     /**
      * populates the model with the relation members in relation my and their
-     * 
+     *
      * @param my my relation. Must not be null.
      * @param their their relation. Must not be null.
-     * 
+     *
      * @throws IllegalArgumentException if my is null
      * @throws IllegalArgumentException if their is null
@@ -80 +80 @@
         getTheirEntries().clear();
 
-        for (RelationMember n : my.members) {
+        for (RelationMember n : my.getMembers()) {
             getMyEntries().add(n);
         }
-        for (RelationMember n : their.members) {
+        for (RelationMember n : their.getMembers()) {
             getTheirEntries().add(n);
         }
@@ -108 +108 @@
     /**
      * Builds the command to resolve conflicts in the node list of a way
-     * 
+     *
      * @param my  my relation. Must not be null.
      * @param their  their relation. Must not be null

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -190 +190 @@
             }
             public void visit(Relation e) {
-                for (RelationMember em : e.members) {
+                for (RelationMember em : e.getMembers()) {
                     em.member.visit(this);
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -591 +591 @@
                             Relation rel = new Relation(cur);
                             Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
-                            for (RelationMember rm : cur.members) {
+                            for (RelationMember rm : cur.getMembers()) {
                                 for (OsmPrimitive osm : sel) {
                                     if (rm.member == osm)
@@ -802 +802 @@
             for (Relation r : Main.main.getCurrentDataSet().relations) {
                 if (!r.deleted && !r.incomplete) {
-                    for (RelationMember m : r.members) {
+                    for (RelationMember m : r.getMembers()) {
                         if (newSelection.contains(m.member)) {
                             Collection<RelationMember> value = roles.get(r);

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -270 +270 @@
             Collection<RelationMember> members = new HashSet<RelationMember>();
             Collection<OsmPrimitive> selection = Main.map.mapView.getEditLayer().data.getSelected();
-            for (RelationMember member: r.members) {
+            for (RelationMember member: r.getMembers()) {
                 if (selection.contains(member.member)) {
                     members.add(member);
@@ -368 +368 @@
     /**
      * Creates a new relation with a copy of the current editor state
-     * 
+     *
      */
     class DuplicateAction extends AbstractAction implements ListSelectionListener {

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

@@ -51 +51 @@
  * ChildRelationBrowser is a UI component which provides a tree-like view on the hierarchical
  * structure of relations
- * 
+ *
  *
  */
@@ -67 +67 @@
     /**
      * Replies the {@see OsmDataLayer} this editor is related to
-     * 
+     *
      * @return the osm data layer
      */
@@ -88 +88 @@
     /**
      * builds the panel with the command buttons
-     * 
+     *
      * @return the button panel
      */
@@ -114 +114 @@
     /**
      * constructor
-     * 
+     *
      * @param layer the {@see OsmDataLayer} this browser is related to. Must not be null.
      * @exception IllegalArgumentException thrown, if layer is null
@@ -128 +128 @@
     /**
      * constructor
-     * 
+     *
      * @param layer the {@see OsmDataLayer} this browser is related to. Must not be null.
      * @param root the root relation
@@ -140 +140 @@
     /**
      * populates the browser with a relation
-     * 
+     *
      * @param r the relation
      */
@@ -149 +149 @@
     /**
      * populates the browser with a list of relation members
-     * 
+     *
      * @param members the list of relation members
      */
@@ -159 +159 @@
     /**
      * replies the parent dialog this browser is embedded in
-     * 
+     *
      * @return the parent dialog; null, if there is no {@see Dialog} as parent dialog
      */
@@ -172 +172 @@
     /**
      * Action for editing the currently selected relation
-     * 
-     * 
+     *
+     *
      */
     class EditAction extends AbstractAction implements TreeSelectionListener {
@@ -278 +278 @@
     /**
      * The asynchronous task for downloading relation members.
-     * 
-     * 
+     *
+     *
      */
     class DownloadAllChildrenTask extends PleaseWaitRunnable {
@@ -338 +338 @@
          * warns the user if a relation couldn't be loaded because it was deleted on
          * the server (the server replied a HTTP code 410)
-         * 
+         *
          * @param r the relation
          */
@@ -360 +360 @@
         /**
          * Remembers the child relations to download
-         * 
+         *
          * @param parent the parent relation
          */
         protected void rememberChildRelationsToDownload(Relation parent) {
             downloadedRelationIds.add(parent.id);
-            for (RelationMember member: parent.members) {
+            for (RelationMember member: parent.getMembers()) {
                 if (member.member instanceof Relation) {
                     Relation child = (Relation)member.member;
@@ -378 +378 @@
          * Merges the primitives in <code>ds</code> to the dataset of the
          * edit layer
-         * 
+         *
          * @param ds the data set
          */

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

@@ -27 +27 @@
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
-import javax.swing.DefaultListSelectionModel;
 import javax.swing.JButton;
 import javax.swing.JComponent;
@@ -42 +40 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
-import javax.swing.JTextField;
 import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
@@ -87 +84 @@
 /**
  * This dialog is for editing relations.
- * 
+ *
  */
 public class GenericRelationEditor extends RelationEditor {
@@ -114 +111 @@
      * Creates a new relation editor for the given relation. The relation will be saved if the user
      * selects "ok" in the editor.
-     * 
+     *
      * If no relation is given, will create an editor for a new relation.
-     * 
+     *
      * @param layer the {@see OsmDataLayer} the new or edited relation belongs to
      * @param relation relation to edit, or null to create a new one.
@@ -206 +203 @@
     /**
      * builds the panel with the OK and the Cancel button
-     * 
+     *
      * @return the panel with the OK and the Cancel button
      */
@@ -221 +218 @@
     /**
      * build the panel with the buttons on the left
-     * 
+     *
      * @return
      */
@@ -260 +257 @@
     /**
      * builds the panel with the tag editor
-     * 
+     *
      * @return the panel with the tag editor
      */
@@ -325 +322 @@
     /**
      * builds the panel for the relation member editor
-     * 
+     *
      * @return the panel for the relation member editor
      */
@@ -439 +436 @@
     /**
      * builds the panel with the table displaying the currently selected primitives
-     * 
+     *
      * @return
      */
@@ -454 +451 @@
     /**
      * builds the {@see JSplitPane} which divides the editor in an upper and a lower half
-     * 
+     *
      * @return the split panel
      */
@@ -475 +472 @@
     /**
      * build the panel with the buttons on the left
-     * 
+     *
      * @return
      */
@@ -530 +527 @@
     /**
      * build the panel with the buttons for adding or removing the current selection
-     * 
+     *
      * @return
      */
@@ -659 +656 @@
      * checks whether the current relation has members referring to itself. If so,
      * warns the users and provides an option for removing these members.
-     * 
+     *
      */
     protected void cleanSelfReferences() {
@@ -1047 +1044 @@
          * Apply the updates for an existing relation which has not been changed
          * outside of the relation editor.
-         * 
+         *
          */
         protected void applyExistingConflictingRelation() {
@@ -1060 +1057 @@
          * Apply the updates for an existing relation which has been changed
          * outside of the relation editor.
-         * 
+         *
          */
         protected void applyExistingNonConflictingRelation() {
@@ -1367 +1364 @@
     /**
      * Creates a new relation with a copy of the current editor state
-     * 
+     *
      */
     class DuplicateRelationAction extends AbstractAction {
@@ -1389 +1386 @@
     /**
      * Action for editing the currently selected relation
-     * 
-     * 
+     *
+     *
      */
     class EditAction extends AbstractAction implements ListSelectionListener {
@@ -1408 +1405 @@
             Collection<RelationMember> members = new HashSet<RelationMember>();
             Collection<OsmPrimitive> selection = getLayer().data.getSelected();
-            for (RelationMember member: r.members) {
+            for (RelationMember member: r.getMembers()) {
                 if (selection.contains(member.member)) {
                     members.add(member);
@@ -1485 +1482 @@
     /**
      * The asynchronous task for downloading relation members.
-     * 
+     *
      */
     class DownloadTask extends PleaseWaitRunnable {

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

@@ -69 +69 @@
     public void populate(Relation relation) {
         members.clear();
-        if (relation != null && relation.members != null) {
+        if (relation != null) {
             // make sure we work with clones of the relation members
             // in the model.
-            members.addAll(new Relation(relation).members);
+            members.addAll(new Relation(relation).getMembers());
         }
         fireTableDataChanged();
@@ -328 +328 @@
     /**
      * Replies the number of members which refer to a particular primitive
-     * 
+     *
      * @param primitive the primitive
      * @return the number of members which refer to a particular primitive
@@ -344 +344 @@
     /**
      * updates the role of the members given by the indices in <code>idx</code>
-     * 
+     *
      * @param idx the array of indices
      * @param role the new role
@@ -362 +362 @@
     /**
      * Get the currently selected relation members
-     * 
+     *
      * @return a collection with the currently selected relation members
      */
@@ -375 +375 @@
     /**
      * Replies the set of selected referers. Never null, but may be empty.
-     * 
+     *
      * @return the set of selected referers
      */
@@ -389 +389 @@
      * Replies true, if the selected {@see OsmPrimitive}s in the layer belonging
      * to this model are in sync with the selected referers in this model.
-     * 
+     *
      * @return
      */
@@ -400 +400 @@
     /**
      * Selects the members in the collection selectedMembers
-     * 
+     *
      * @param selectedMembers the collection of selected members
      */
@@ -441 +441 @@
      * to an editable relation, i.e. a relation which is not
      * incomplete.
-     * 
+     *
      * @param index the index
      * @return true, if the index-th relation members referrs
@@ -460 +460 @@
      * Replies true if there is at least one relation member in this model
      * which refers to at least on the primitives in <code>primitives</code>.
-     * 
+     *
      * @param primitives the collection of primitives
      * @return true if there is at least one relation member in this model
@@ -485 +485 @@
      * Selects all mebers which refer to {@see OsmPrimitive}s in the collections
      * <code>primitmives</code>. Does nothing is primitives is null.
-     * 
+     *
      * @param primitives the collection of primitives
      */
@@ -507 +507 @@
      * Replies true if the layer this model belongs to is equal to the active
      * layer
-     * 
+     *
      * @return true if the layer this model belongs to is equal to the active
      * layer

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

@@ -47 +47 @@
     protected boolean isReferringRelation(Relation parent) {
         if (parent == null) return false;
-        for (RelationMember m: parent.members) {
+        for (RelationMember m: parent.getMembers()) {
             if (m.member instanceof Relation) {
                 Relation child = (Relation)m.member;
@@ -70 +70 @@
     /**
      * Populates the browser with the list of referring relations in the {@see DataSet} ds.
-     * 
+     *
      * @param ds the data set
      */

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

@@ -17 +17 @@
  * This is a {@see TreeModel} which provides the hierarchical structure of {@see Relation}s
  * to a  {@see JTree}.
- * 
+ *
  * The model is initialized with a root relation or with a list of {@see RelationMember}s, see
  * {@see #populate(Relation)} and {@see #populate(List)} respectively.
- * 
+ *
  *
  */
@@ -51 +51 @@
     /**
      * constructor
-     * 
+     *
      * @param members a list of members
      */
@@ -65 +65 @@
      * Replies the number of children of type relation for a particular
      * relation <code>parent</code>
-     * 
+     *
      * @param parent the parent relation
      * @return the number of children of type relation
@@ -71 +71 @@
     protected int getNumRelationChildren(Relation parent) {
         if (parent == null) return 0;
-        if (parent.members == null) return 0;
         int count = 0;
-        for(RelationMember member : parent.members) {
+        for(RelationMember member : parent.getMembers()) {
             if (member.member instanceof Relation) {
                 count++;
@@ -84 +83 @@
      * Replies the i-th child of type relation for a particular relation
      * <code>parent</code>.
-     * 
+     *
      * @param parent the parent relation
      * @param idx the index
@@ -93 +92 @@
         if (parent == null) return null;
         int count=0;
-        for (RelationMember member : parent.members) {
+        for (RelationMember member : parent.getMembers()) {
             if (!(member.member instanceof Relation)) {
                 continue;
@@ -107 +106 @@
      * Replies the index of a particular <code>child</code> with respect to its
      * <code>parent</code>.
-     * 
+     *
      * @param parent  the parent relation
      * @param child the child relation
@@ -113 +112 @@
      * <code>parent</code>; -1 if either parent or child are null or if <code>child</code>
      * isn't a child of <code>parent</code>.
-     * 
+     *
      */
     protected int getIndexForRelationChild(Relation parent, Relation child) {
         if (parent == null || child == null) return -1;
         int idx = 0;
-        for (RelationMember member : parent.members) {
+        for (RelationMember member : parent.getMembers()) {
             if (!(member.member instanceof Relation)) {
                 continue;
@@ -130 +129 @@
     /**
      * Populates the model with a root relation
-     * 
+     *
      * @param root the root relation
      * @see #populate(List)
-     * 
+     *
      */
     public void populate(Relation root) {
@@ -145 +144 @@
     /**
      * Populates the model with a list of relation members
-     * 
+     *
      * @param members the relation members
      */
@@ -170 +169 @@
      * Notifies tree model listeners about an update of the
      * trees nodes.
-     * 
+     *
      * @param path the tree path to the node
      */
@@ -183 +182 @@
     /**
      * Invoke to notify all listeners about an update of a particular node
-     * 
+     *
      * @param pathToNode the tree path to the node
      */

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ac/AutoCompletionCache.java

@@ -18 +18 @@
  * AutoCompletionCache temporarily holds a cache of keys with a list of
  * possible auto completion values for each key.
- * 
+ *
  * The cache can initialize itself from the current JOSM data set such that
  * <ol>
@@ -25 +25 @@
  *     this key</li>
  * </ol>
- * 
+ *
  * Building up auto completion lists should not
  * slow down tabbing from input field to input field. Looping through the complete
@@ -87 +87 @@
     /**
      * make sure, <code>key</code> is in the cache
-     * 
+     *
      * @param key  the key
      */
@@ -100 +100 @@
     /**
      * make sure, value is one of the auto completion values allowed for key
-     * 
+     *
      * @param key the key
      * @param value the value
@@ -115 +115 @@
      * make sure, the keys and values of all tags held by primitive are
      * in the auto completion cache
-     * 
+     *
      * @param primitive an OSM primitive
      */
@@ -127 +127 @@
     /**
      * Caches all member roles of the relation <code>relation</code>
-     * 
+     *
      * @param relation the relation
      */
     protected void cacheRelationMemberRoles(Relation relation){
-        for (RelationMember m: relation.members) {
+        for (RelationMember m: relation.getMembers()) {
             if (m.role == null || m.role.trim().equals("")) {
                 continue;
@@ -144 +144 @@
      * initializes the cache from the primitives in the dataset of
      * {@see #layer}
-     * 
+     *
      */
     public void initFromJOSMDataset() {
@@ -165 +165 @@
     /**
      * replies the keys held by the cache
-     * 
+     *
      * @return the list of keys held by the cache
      */
@@ -175 +175 @@
      * replies the auto completion values allowed for a specific key. Replies
      * an empty list if key is null or if key is not in {@link #getKeys()}.
-     * 
+     *
      * @param key
      * @return the list of auto completion values
@@ -187 +187 @@
     /**
      * Replies the list of member roles
-     * 
+     *
      * @return the list of member roles
      */
@@ -197 +197 @@
      * Populates the an {@see AutoCompletionList} with the currently cached
      * member roles.
-     * 
+     *
      * @param list the list to populate
      */

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -203 +203 @@
         if (relation.id == 0) return this;
         remember(relation.id, OsmPrimitiveType.RELATION);
-        for (RelationMember member : relation.members) {
+        for (RelationMember member : relation.getMembers()) {
             appendGeneric(member.member);
         }

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -131 +131 @@
         } else {
             out.println(">");
-            for (RelationMember em : e.members) {
+            for (RelationMember em : e.getMembers()) {
                 out.print("    <member type='");
                 out.print(OsmPrimitiveType.from(em.member).getAPIName());