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

Timestamp:

10.02.2010 21:51:28 (2 years ago)

Author:

jttt

Message:

Throw DatasetIntegrityException when somebody is trying to add node/member from different dataset

File:

• trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) (1 diff)

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

@@ -345 +345 @@
 
     private void fireMembersChanged() {
-        if (getDataSet() != null) {
-            getDataSet().fireRelationMembersChanged(this);
+        DataSet dataSet = getDataSet();
+        if (dataSet != null) {
+            for (RelationMember rm: members) {
+                if (rm.getMember().getDataSet() != dataSet)
+                    throw new DataIntegrityProblemException("Relation member must be part of the same dataset as relation");
+            }
+            dataSet.fireRelationMembersChanged(this);
         }
     }