Changeset 2405 in josm for trunk/src/org/openstreetmap/josm/data/osm/Relation.java

Timestamp:

2009-11-07T20:28:14+01:00 (14 years ago)

Author:

jttt

Message:

Save reference to dataset in OsmPrimitive

File:

• trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) (3 diffs)

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

@@ -136 +136 @@
         super(id, false);
     }
-
-    public Relation(RelationData data, DataSet dataSet) {
-        super(data);
-        load(data, dataSet);
-    }
-
 
     @Override public void cloneFrom(OsmPrimitive osm) {
@@ -153 +147 @@
     }
 
-    @Override public void load(PrimitiveData data, DataSet dataSet) {
-        super.load(data, dataSet);
+    @Override public void load(PrimitiveData data) {
+        super.load(data);
 
         RelationData relationData = (RelationData) data;
@@ -160 +154 @@
         List<RelationMember> newMembers = new ArrayList<RelationMember>();
         for (RelationMemberData member : relationData.getMembers()) {
-            OsmPrimitive primitive = dataSet.getPrimitiveById(member);
+            OsmPrimitive primitive = getDataSet().getPrimitiveById(member);
             if (primitive == null)
                 throw new AssertionError("Data consistency problem - relation with missing member detected");