Changeset 3032 in josm for trunk

Timestamp:

2010-02-21T13:21:46+01:00 (16 years ago)

Author:

jttt

Message:

Throw DataIntegrityProblemException when deleted primitive is referenced (has to be enabled using debug.checkDeleteReferenced property, by default it's off)

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

@@ -7 +7 @@
 import java.util.Set;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.tools.CopyList;
@@ -382 +383 @@
                     throw new DataIntegrityProblemException(String.format("Relation member must be part of the same dataset as relation(%s, %s)", getPrimitiveId(), rm.getMember().getPrimitiveId()));
             }
+            if (Main.pref.getBoolean("debug.checkDeleteReferenced")) {
+                for (RelationMember rm: members) {
+                    if (rm.getMember().isDeleted())
+                        throw new DataIntegrityProblemException("Deleted member referenced: " + toString());
+                }
+            }
         }
     }

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

@@ -9 +9 @@
 import java.util.List;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.tools.CopyList;
@@ -371 +372 @@
                     throw new DataIntegrityProblemException("Nodes in way must be in the same dataset");
             }
+            if (Main.pref.getBoolean("debug.checkDeleteReferenced")) {
+                for (Node n: nodes) {
+                    if (n.isDeleted())
+                        throw new DataIntegrityProblemException("Deleted node referenced: " + toString());
+                }
+            }
         }
     }