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

Timestamp:

28.12.2011 20:40:46 (5 months ago)

Author:

Don-vip

Message:

fix #7194 - Reworking of osmChange downloads (Fail to update a way loaded from osmChange that have been deleted after)

Location:

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

Files:

• HistoryRelation.java (modified) (6 diffs)
• RelationMember.java (deleted)

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -20 +21 @@
 public class HistoryRelation extends HistoryOsmPrimitive{
 
-    private ArrayList<RelationMember> members = new ArrayList<RelationMember>();
+    private ArrayList<RelationMemberData> members = new ArrayList<RelationMemberData>();
 
     /**
@@ -54 +55 @@
      */
     public HistoryRelation(long id, long version, boolean visible, User user, long changesetId,
-            Date timestamp, ArrayList<RelationMember> members) {
+            Date timestamp, ArrayList<RelationMemberData> members) {
         this(id, version, visible, user, changesetId, timestamp);
         if (members != null) {
@@ -70 +71 @@
      * @return an immutable list of members of this relation
      */
-    public List<RelationMember> getMembers() {
+    public List<RelationMemberData> getMembers() {
         return Collections.unmodifiableList(members);
     }
@@ -90 +91 @@
      * @throws IndexOutOfBoundsException thrown, if idx is out of bounds
      */
-    public RelationMember getRelationMember(int idx) throws IndexOutOfBoundsException  {
+    public RelationMemberData getRelationMember(int idx) throws IndexOutOfBoundsException  {
         if (idx < 0 || idx >= members.size())
             throw new IndexOutOfBoundsException(MessageFormat.format("Parameter {0} not in range 0..{1}. Got ''{2}''.", "idx", members.size(),idx));
@@ -111 +112 @@
      * @exception IllegalArgumentException thrown, if member is null
      */
-    public void addMember(RelationMember member) throws IllegalArgumentException {
+    public void addMember(RelationMemberData member) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(member, "member");
         members.add(member);