Refactor: Remove old contains(Any)Error functions

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java

@@ -20,7 +20,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
@@ -251,84 +250,6 @@ public abstract class AbstractBuilding extends CityObject {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (Installation bi : buildingInstallations) {
-            if (bi.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BoundarySurface bs : boundarySurfaceList) {
-            if (bs.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BuildingRoom br : buildingRooms) {
-            if (br.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
-            if (bfr.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (Storey storey : buildingStoreys) {
-            if (storey.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BuildingUnit bu : buildingUnits) {
-            if (bu.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (Installation bi : buildingInstallations) {
-            if (bi.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BoundarySurface bs : boundarySurfaceList) {
-            if (bs.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BuildingRoom br : buildingRooms) {
-            if (br.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
-            if (bfr.containsAnyError()) {
-                return true;
-            }
-        }
-        for (Storey storey : buildingStoreys) {
-            if (storey.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BuildingUnit bu : buildingUnits) {
-            if (bu.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     void setCityGmlBuilding(org.citygml4j.core.model.building.AbstractBuilding ab) {
         this.ab = ab;
     }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingSubdivision.java

@@ -2,7 +2,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
@@ -203,64 +202,6 @@ public abstract class AbstractBuildingSubdivision extends CityObject {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (Installation bi : buildingInstallations) {
-            if (bi.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BoundarySurface bs : boundarySurfaceList) {
-            if (bs.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BuildingRoom br : buildingRooms) {
-            if (br.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
-            if (bfr.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (Installation bi : buildingInstallations) {
-            if (bi.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BoundarySurface bs : boundarySurfaceList) {
-            if (bs.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BuildingRoom br : buildingRooms) {
-            if (br.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
-            if (bfr.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     void setCityGmlBuilding(org.citygml4j.core.model.building.AbstractBuildingSubdivision abs) {
         this.abs = abs;
     }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractFurniture.java

@@ -2,7 +2,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
@@ -59,35 +58,6 @@ public abstract class AbstractFurniture extends CityObject {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (BoundarySurface boundarySurface : boundarySurfaceList) {
-            if (boundarySurface.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (BoundarySurface boundarySurface : boundarySurfaceList) {
-            if (boundarySurface.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
     @Override
     public org.citygml4j.core.model.construction.AbstractFurniture getGmlObject() {
         return af;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoom.java

@@ -2,7 +2,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
@@ -71,44 +70,6 @@ public abstract class AbstractRoom extends CityObject {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (Installation roomInstallation : roomInstallations) {
-            if (roomInstallation.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BoundarySurface boundarySurface : boundarySurfaceList) {
-            if (boundarySurface.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (Installation roomInstallation : roomInstallations) {
-            if (roomInstallation.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BoundarySurface boundarySurface : boundarySurfaceList) {
-            if (boundarySurface.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void reCreateGeometries(GeometryFactory factory, ParserConfiguration config) {
         for (Geometry geom : getGeometries()) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnel.java

@@ -2,7 +2,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
@@ -233,83 +232,6 @@ public abstract class AbstractTunnel extends CityObject {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (Installation bi : tunnelInstallations) {
-            if (bi.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BoundarySurface bs : boundarySurfaceList) {
-            if (bs.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (TunnelHollow th : tunnelHollows) {
-            if (th.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (TunnelFurniture tfr : tunnelFurnitureList) {
-            if (tfr.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (TunnelConstructiveElement te : tunnelConstructiveElements) {
-            if (te.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (TunnelPart tp : tunnelParts) {
-            if (tp.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (Installation bi : tunnelInstallations) {
-            if (bi.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BoundarySurface bs : boundarySurfaceList) {
-            if (bs.containsAnyError()) {
-                return true;
-            }
-        }
-        for (TunnelHollow th : tunnelHollows) {
-            if (th.containsAnyError()) {
-                return true;
-            }
-        }
-        for (TunnelFurniture tfr : tunnelFurnitureList) {
-            if (tfr.containsAnyError()) {
-                return true;
-            }
-        }
-        for (TunnelConstructiveElement te : tunnelConstructiveElements) {
-            if (te.containsAnyError()) {
-                return true;
-            }
-        }
-        for (TunnelPart tp : tunnelParts) {
-            if (tp.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
 
     void setCityGmlBuilding(org.citygml4j.core.model.tunnel.AbstractTunnel at) {
         this.at = at;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurface.java

@@ -20,7 +20,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
@@ -162,34 +161,6 @@ public class BoundarySurface extends CityObject {
         }
     }
 
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (Opening o : openings) {
-            if (o.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (Opening o : openings) {
-            if (o.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void accept(Check c) {
         super.accept(c);

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeConstructiveElement.java

@@ -20,7 +20,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
@@ -133,34 +132,6 @@ public class BridgeConstructiveElement extends CityObject {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (BoundarySurface bs : boundarySurfaceList) {
-            if (bs.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (BoundarySurface bs : boundarySurfaceList) {
-            if (bs.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     private void reCreateBoundarySurface(GeometryFactory factory, ParserConfiguration config, BoundarySurface bs) {
         if (bs.getGeometries().isEmpty()) {
             for (AbstractSpaceBoundaryProperty bsp : gmlBridgeElement.getBoundaries()) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObject.java

@@ -237,89 +237,6 @@ public class BridgeObject extends CityObject {
 
     }
 
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (Installation bi : bridgeInstallations) {
-            if (bi.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BoundarySurface bs : boundarySurfaces) {
-            if (bs.containsAnyError()) {
-                return true;
-            }
-        }
-        if (doPartsContainAnyError()) {
-            return true;
-        }
-        for (BridgeConstructiveElement ele : elements) {
-            if (ele.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BridgeRoom br : bridgeRooms) {
-            if (br.containsAnyError()) {
-                return true;
-            }
-        }
-        for (BridgeRoomFurniture bri : bridgeFurniture) {
-            if (bri.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean doPartsContainAnyError() {
-
-        for (BridgeObject part : parts) {
-            if (part.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (Installation bi : bridgeInstallations) {
-            if (bi.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BoundarySurface bs : boundarySurfaces) {
-            if (bs.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        if (doPartsContainError(checkIdentifier)) {
-            return true;
-        }
-        for (BridgeConstructiveElement ele : elements) {
-            if (ele.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BridgeRoom br : bridgeRooms) {
-            if (br.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (BridgeRoomFurniture bri : bridgeFurniture) {
-            if (bri.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
 
     private boolean doPartsContainError(CheckId checkIdentifier) {
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Building.java

@@ -20,7 +20,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
 import de.hft.stuttgart.citydoctor2.utils.Copyable;
@@ -84,34 +83,6 @@ public class Building extends AbstractBuilding {
         }
     }
 
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (BuildingPart bp : buildingParts) {
-            if (bp.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (BuildingPart bp : buildingParts) {
-            if (bp.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public void addBuildingPart(BuildingPart buildingPart) {
         buildingParts.add(buildingPart);
     }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingUnit.java

@@ -2,7 +2,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
 import de.hft.stuttgart.citydoctor2.utils.Copyable;
@@ -58,34 +57,6 @@ public class BuildingUnit extends AbstractBuildingSubdivision {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (Storey storey : storeys) {
-            if (storey.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (Storey storey : storeys) {
-            if (storey.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void clearMetaInformation() {
         super.clearMetaInformation();

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityObject.java

@@ -20,7 +20,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
 import de.hft.stuttgart.citydoctor2.utils.Copyable;
@@ -149,20 +148,6 @@ public abstract class CityObject extends GmlElement {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (Geometry geom : geometryList) {
-            if (geom.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void clearAllContainedCheckResults() {
         super.clearCheckResults();
@@ -179,20 +164,6 @@ public abstract class CityObject extends GmlElement {
         }
     }
 
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (Geometry geom : geometryList) {
-            if (geom.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public Geometry getGeometry(GeometryType type, Lod lod) {
         for (Geometry geom : geometryList) {
             if (geom.getType() == type && geom.getLod() == lod) {

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ConcretePolygon.java

@@ -20,7 +20,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 import de.hft.stuttgart.citydoctor2.tesselation.JoglTesselator;
@@ -214,28 +213,6 @@ public class ConcretePolygon extends Polygon {
 		return exterior.isRingConnectedViaPoint(other.getExteriorRing());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.hft.stuttgart.citydoctor2.datastructure.Polygon#containsAnyError()
-	 */
-	@Override
-	public boolean containsAnyError() {
-		if (super.containsAnyError()) {
-			return true;
-		}
-		if (exterior != null && exterior.containsAnyError()) {
-			return true;
-		}
-		if (innerRings != null) {
-			for (LinearRing lr : innerRings) {
-				if (lr.containsAnyError()) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
 
 	/*
 	 * (non-Javadoc)
@@ -276,31 +253,6 @@ public class ConcretePolygon extends Polygon {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.hft.stuttgart.citydoctor2.datastructure.Polygon#containsError(de.hft.
-	 * stuttgart.citydoctor2.check.CheckId)
-	 */
-	@Override
-	public boolean containsError(CheckId checkIdentifier) {
-		boolean hasError = super.containsError(checkIdentifier);
-		if (hasError) {
-			return true;
-		}
-		if (exterior != null && exterior.containsError(checkIdentifier)) {
-			return true;
-		}
-		if (innerRings != null) {
-			for (LinearRing lr : innerRings) {
-				if (lr.containsError(checkIdentifier)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java

@@ -2,7 +2,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
@@ -137,34 +136,6 @@ public class GenericCityObject extends CityObject {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (BoundarySurface bs : boundarySurfaceList) {
-            if (bs.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (BoundarySurface bs : boundarySurfaceList) {
-            if (bs.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void clearMetaInformation() {
         super.clearMetaInformation();

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Geometry.java

@@ -20,7 +20,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.math.Triangle3d;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon;
@@ -207,19 +206,6 @@ public class Geometry extends GmlElement {
                 + a[0] * b[1] * c[2];
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (Polygon p : polygons) {
-            if (p.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
 
     @Override
     public void clearAllContainedCheckResults() {
@@ -237,20 +223,6 @@ public class Geometry extends GmlElement {
         }
     }
 
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (Polygon p : polygons) {
-            if (p.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void accept(Check c) {
         super.accept(c);

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryHolder.java

@@ -62,10 +62,6 @@ public class ImplicitGeometryHolder extends Geometry {
         prototypeGeometry.accept(c);
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        return prototypeGeometry.containsError(checkIdentifier);
-    }
 
     @Override
     public void clearAllContainedCheckResults() {
@@ -77,10 +73,6 @@ public class ImplicitGeometryHolder extends Geometry {
         prototypeGeometry.clearAllContainedCheckResults();
     }
 
-    @Override
-    public boolean containsAnyError() {
-        return prototypeGeometry.containsAnyError();
-    }
 
 
     @Override

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Installation.java

@@ -20,7 +20,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
@@ -143,34 +142,6 @@ public class Installation extends CityObject {
         }
     }
 
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (BoundarySurface bs : boundarySurfaces) {
-            if (bs.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (BoundarySurface bs : boundarySurfaces) {
-            if (bs.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public void setParent(CityObject parent) {
         this.parent = parent;
     }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObject.java

@@ -20,7 +20,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
 import de.hft.stuttgart.citydoctor2.utils.Copyable;
@@ -97,34 +96,6 @@ public class ReliefObject extends CityObject {
         }
     }
 
-    @Override
-    public boolean containsAnyError() {
-        boolean containsError = super.containsAnyError();
-        if (containsError) {
-            return true;
-        }
-        for (TinObject tin : components) {
-            if (tin.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (TinObject tin : components) {
-            if (tin.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void reCreateGeometries(GeometryFactory factory, ParserConfiguration config) {
         // no geometries

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Storey.java

@@ -2,7 +2,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
 import de.hft.stuttgart.citydoctor2.utils.Copyable;
@@ -57,34 +56,6 @@ public class Storey extends AbstractBuildingSubdivision {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (BuildingUnit buildingUnit : buildingUnits) {
-            if (buildingUnit.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (BuildingUnit buildingUnit : buildingUnits) {
-            if (buildingUnit.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void clearMetaInformation() {
         super.clearMetaInformation();

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeature.java

@@ -2,7 +2,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
 import de.hft.stuttgart.citydoctor2.utils.Copyable;
@@ -92,26 +91,6 @@ public class TopLevelTransportFeature extends TransportationSpace {
         }
     }
 
-
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (TransportSection section : sections) {
-            if (section.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        for (TransportSection section : intersections) {
-            if (section.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void clearAllContainedCheckResults() {
         super.clearAllContainedCheckResults();
@@ -134,25 +113,6 @@ public class TopLevelTransportFeature extends TransportationSpace {
         }
     }
 
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (TransportSection section : sections) {
-            if (section.containsAnyError()) {
-                return true;
-            }
-        }
-        for (TransportSection section : intersections) {
-            if (section.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void accept(Check c) {
         super.accept(c);

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceObject.java

@@ -2,7 +2,6 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 
 import de.hft.stuttgart.citydoctor2.check.Check;
 import de.hft.stuttgart.citydoctor2.check.CheckError;
-import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
@@ -73,20 +72,6 @@ public class TrafficSpaceObject extends TransportationObject {
         }
     }
 
-    @Override
-    public boolean containsError(CheckId checkIdentifier) {
-        boolean hasError = super.containsError(checkIdentifier);
-        if (hasError) {
-            return true;
-        }
-        for (TrafficAreaObject tao : trafficAreas) {
-            if (tao.containsError(checkIdentifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void clearAllContainedCheckResults() {
         super.clearAllContainedCheckResults();
@@ -103,20 +88,6 @@ public class TrafficSpaceObject extends TransportationObject {
         }
     }
 
-    @Override
-    public boolean containsAnyError() {
-        boolean hasError = super.containsAnyError();
-        if (hasError) {
-            return true;
-        }
-        for (TrafficAreaObject tao : trafficAreas) {
-            if (tao.containsAnyError()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public void accept(Check c) {
         super.accept(c);