Changeset 2963 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-02-10T21:51:28+01:00 (16 years ago)

Author:

jttt

Message:

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

Location:

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

Files:

• OsmPrimitive.java (modified) (1 diff)
• Relation.java (modified) (1 diff)
• SimplePrimitiveId.java (modified) (1 diff)
• Way.java (modified) (1 diff)

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

@@ -240 +240 @@
         this(id, allowNegativeId);
         this.version = (id > 0 ? version : 0);
+        setIncomplete(id > 0 && version == 0);
     }
 

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

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

@@ -51 +51 @@
         return true;
     }
+
+    @Override
+    public String toString() {
+        return type + " " + id;
+    }
 }

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

@@ -365 +365 @@
 
     private void fireNodesChanged() {
-        if (getDataSet() != null) {
+        DataSet dataSet = getDataSet();
+        if (dataSet != null) {
+            for (Node n: nodes) {
+                if (n.getDataSet() != dataSet)
+                    throw new DataIntegrityProblemException("Nodes in way must be in the same dataset");
+            }
             getDataSet().fireWayNodesChanged(this);
         }