Changeset 1951 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

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

Author:

jttt

Message:

Replace some occurrences of RelationMember.member with getters

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• PropertiesDialog.java (modified) (1 diff)
• relation/MemberTableModel.java (modified) (1 diff)
• relation/RelationTreeModel.java (modified) (2 diffs)

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