Changeset 2970 in josm

Timestamp:

12.02.2010 23:02:35 (2 years ago)

Author:

jttt

Message:

Throw DataIntergrityException also when Way/Relation with broken member references is added to the dataset

Location:

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

Files:

• Relation.java (modified) (2 diffs)
• Way.java (modified) (2 diffs)

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

@@ -344 +344 @@
     }
 
-    private void fireMembersChanged() {
+    @Override
+    public void setDataset(DataSet dataSet) {
+        super.setDataset(dataSet);
+        checkMembers();
+    }
+
+    private void checkMembers() {
         DataSet dataSet = getDataSet();
         if (dataSet != null) {
@@ -351 +357 @@
                     throw new DataIntegrityProblemException("Relation member must be part of the same dataset as relation");
             }
-            dataSet.fireRelationMembersChanged(this);
+        }
+    }
+
+    private void fireMembersChanged() {
+        checkMembers();
+        if (getDataSet() != null) {
+            getDataSet().fireRelationMembersChanged(this);
         }
     }

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

@@ -364 +364 @@
     }
 
-    private void fireNodesChanged() {
+    private void checkNodes() {
         DataSet dataSet = getDataSet();
         if (dataSet != null) {
@@ -371 +371 @@
                     throw new DataIntegrityProblemException("Nodes in way must be in the same dataset");
             }
+        }
+    }
+
+    private void fireNodesChanged() {
+        checkNodes();
+        if (getDataSet() != null) {
             getDataSet().fireWayNodesChanged(this);
         }
+    }
+
+    @Override
+    public void setDataset(DataSet dataSet) {
+        super.setDataset(dataSet);
+        checkNodes();
     }