Changeset 1951 in josm for trunk/src/org

Timestamp:

2009-08-10T20:36:40+02:00 (15 years ago)

Author:

jttt

Message:

Replace some occurrences of RelationMember.member with getters

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CombineWayAction.java (modified) (3 diffs)
• actions/MergeNodesAction.java (modified) (3 diffs)
• actions/SplitWayAction.java (modified) (1 diff)
• command/RelationMemberConflictResolverCommand.java (modified) (2 diffs)
• command/RemoveRelationMemberCommand.java (modified) (1 diff)
• data/osm/Relation.java (modified) (1 diff)
• data/osm/visitor/MergeSourceBuildingVisitor.java (modified) (3 diffs)
• gui/dialogs/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/relation/MemberTableModel.java (modified) (1 diff)
• gui/dialogs/relation/RelationTreeModel.java (modified) (2 diffs)
• io/OsmReader.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -225 +226 @@
         // modify all relations containing the now-deleted ways
         for (Relation r : relationsUsingWays) {
-            Relation newRel = new Relation(r);
-            newRel.members.clear();
+            List<RelationMember> newMembers = new ArrayList<RelationMember>();
             HashSet<String> rolesToReAdd = new HashSet<String>();
             for (RelationMember rm : r.getMembers()) {
@@ -234 +234 @@
                     rolesToReAdd.add(rm.getRole());
                 } else {
-                    newRel.members.add(rm);
+                    newMembers.add(rm);
                 }
             }
             for (String role : rolesToReAdd) {
-                newRel.members.add(new RelationMember(role, modifyWay));
-            }
+                newMembers.add(new RelationMember(role, modifyWay));
+            }
+            Relation newRel = new Relation(r);
+            newRel.setMembers(newMembers);
             cmds.add(new ChangeCommand(r, newRel));
         }

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

@@ -12 +12 @@
 import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -275 +276 @@
         // modify all relations containing the now-deleted nodes
         for (Relation r : relationsUsingNodes) {
-            Relation newRel = new Relation(r);
-            newRel.members.clear();
+            List<RelationMember> newMembers = new ArrayList<RelationMember>();
             HashSet<String> rolesToReAdd = new HashSet<String>();
             for (RelationMember rm : r.getMembers()) {
@@ -284 +284 @@
                     rolesToReAdd.add(rm.getRole());
                 } else {
-                    newRel.members.add(rm);
+                    newMembers.add(rm);
                 }
             }
             for (String role : rolesToReAdd) {
-                newRel.members.add(new RelationMember(role, dest));
-            }
+                newMembers.add(new RelationMember(role, dest));
+            }
+            Relation newRel = new Relation(r);
+            newRel.setMembers(newMembers);
             cmds.add(new ChangeCommand(r, newRel));
         }

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

@@ -326 +326 @@
                             j++;
                             if (backwards) {
-                                c.members.add(i, em);
+                                c.addMember(i, em);
                             } else {
-                                c.members.add(j, em);
+                                c.addMember(j, em);
                             }
                         }

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

@@ -40 +40 @@
 
     /**
-     * 
+     *
      * @param my my relation
      * @param their their relation
@@ -72 +72 @@
         // nodes
         //
-        my.members.clear();
-        for (int i=0; i<mergedMembers.size();i++) {
-            RelationMember n = mergedMembers.get(i);
-            my.members.add(n);
-        }
+        my.setMembers(mergedMembers);
 
         // remember the layer
-        layer = Main.main.map.mapView.getEditLayer();
+        layer = Main.map.mapView.getEditLayer();
         return true;
     }

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

@@ -44 +44 @@
     @Override public boolean executeCommand() {
         super.executeCommand();
-        int removed_at = relation.members.indexOf(member);
-        relation.members.remove(member);
-        if ((location != -1) && (removed_at != location)) {
-            relation.members.add(removed_at, member);
+        int removeIndex = relation.getMembers().indexOf(member);
+        if ((location != -1) && (removeIndex != location)) {
             Main.debug("error removing relation member");
             return false;
+        } else {
+            relation.removeMember(removeIndex);
+            relation.modified = true;
+            return true;
         }
-        relation.modified = true;
-        return true;
     }
 
     @Override public void undoCommand() {
         super.undoCommand();
-        relation.members.add(member);
+        relation.addMember(member);
         relation.modified = this.getOrig(relation).modified;
     }

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

@@ -63 +63 @@
     public RelationMember getMember(int index) {
         return members.get(index);
+    }
+
+    /**
+     *
+     * @param member
+     * @since 1951
+     */
+    public void addMember(RelationMember member) {
+        members.add(member);
+    }
+
+    /**
+     *
+     * @param index
+     * @param member
+     * @since 1951
+     */
+    public void addMember(int index, RelationMember member) {
+        members.add(index, member);
+    }
+
+    /**
+     * Replace member at position specified by index.
+     * @param index
+     * @param member
+     * @return Member that was at the position
+     * @since 1951
+     */
+    public RelationMember setMember(int index, RelationMember member) {
+        return members.set(index, member);
+    }
+
+    /**
+     * Removes member at specified position.
+     * @param index
+     * @return Member that was at the position
+     * @since 1951
+     */
+    public RelationMember removeMember(int index) {
+        return members.remove(index);
     }
 

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

@@ -90 +90 @@
             clone = new Relation(r);
         }
-        clone.members.clear();
+
+        List<RelationMember> newMembers = new ArrayList<RelationMember>();
         for (RelationMember member: r.getMembers()) {
-            RelationMember cloneMember = new RelationMember(member.getRole(), mappedPrimitives.get(member.getMember()));
-            clone.members.add(cloneMember);
-        }
+            newMembers.add(
+                new RelationMember(member.getRole(), mappedPrimitives.get(member.getMember())));
+
+        }
+        clone.setMembers(newMembers);
+
         if (! mappedPrimitives.keySet().contains(r)) {
             mappedPrimitives.put(r, clone);
@@ -104 +108 @@
             return;
         Relation clone = new Relation(r);
-        clone.members.clear();
+        clone.setMembers(null);
         mappedPrimitives.put(r, clone);
     }
@@ -148 +152 @@
             clone = new Relation(r);
         }
-        clone.members.clear();
+        clone.setMembers(null);
         clone.incomplete = true;
         if (! isAlreadyRemembered(r)) {

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

@@ -854 +854 @@
             Relation rel = new Relation(cur);
             Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
+            int index = 0;
             for (RelationMember rm : cur.getMembers()) {
                 for (OsmPrimitive osm : sel) {
                     if (rm.getMember() == osm)
                     {
-                        rel.members.remove(rm);
+                        rel.removeMember(index);
                         break;
                     }
                 }
+                index++;
             }
             Main.main.undoRedo.add(new ChangeCommand(cur, rel));

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

@@ -229 +229 @@
         if (relation == null)
             return false;
-        if (relation.members.size() != members.size())
+        if (relation.getMembersCount() != members.size())
             return false;
-        for (int i = 0; i < relation.members.size(); i++) {
-            if (!relation.members.get(i).equals(members.get(i)))
+        for (int i = 0; i < relation.getMembersCount(); i++) {
+            if (!relation.getMember(i).equals(members.get(i)))
                 return false;
         }

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

@@ -57 +57 @@
         if (members == null) return;
         Relation root = new Relation();
-        root.members.addAll(members);
+        root.setMembers(members);
         this.root = root;
         listeners = new CopyOnWriteArrayList<TreeModelListener>();
@@ -150 +150 @@
         if (members == null) return;
         Relation r = new Relation();
-        r.members.addAll(members);
+        r.setMembers(members);
         this.root = r;
         fireRootReplacedEvent();

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

@@ -412 +412 @@
             if (en == null) throw new Error("Failed to create relation " + e.getKey().id);
 
+            List<RelationMember> relationMembers = new ArrayList<RelationMember>();
+
             for (RelationMemberData emd : e.getValue()) {
                 OsmPrimitive member;
@@ -438 +440 @@
                     throw new SAXException(tr("Unknown relation member type {0}", emd.type));
                 }
-                en.members.add(new RelationMember(emd.role, member));
-            }
+                relationMembers.add(new RelationMember(emd.role, member));
+            }
+            en.setMembers(relationMembers);
         }
         hm = null;