Commit f4a005d3 authored by Riegel's avatar Riegel
Browse files

Refactor: Add ClearCheckResultsVisitor

parent 23ca3296
...@@ -26,6 +26,7 @@ import java.util.Map; ...@@ -26,6 +26,7 @@ import java.util.Map;
import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound; import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound;
import de.hft.stuttgart.citydoctor2.utils.visitors.CheckableErrorCollector; import de.hft.stuttgart.citydoctor2.utils.visitors.CheckableErrorCollector;
import de.hft.stuttgart.citydoctor2.utils.visitors.ClearCheckResultsVisitor;
import de.hft.stuttgart.citydoctor2.utils.visitors.ClearMetaInformationVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.ClearMetaInformationVisitor;
import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsAnyErrorVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsAnyErrorVisitor;
import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsErrorVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsErrorVisitor;
...@@ -227,7 +228,9 @@ public abstract class Checkable implements Serializable { ...@@ -227,7 +228,9 @@ public abstract class Checkable implements Serializable {
/** /**
* Removes all errors from this instance and all contained checkables. * Removes all errors from this instance and all contained checkables.
*/ */
public abstract void clearAllContainedCheckResults(); public final void clearAllContainedCheckResults() {
this.accept(new ClearCheckResultsVisitor());
}
/** /**
* *
......
...@@ -187,29 +187,6 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -187,29 +187,6 @@ public abstract class AbstractBuilding extends CityObject {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (Installation bi : buildingInstallations) {
bi.clearAllContainedCheckResults();
}
for (BoundarySurface bs : boundarySurfaceList) {
bs.clearAllContainedCheckResults();
}
for (BuildingRoom br : buildingRooms) {
br.clearAllContainedCheckResults();
}
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.clearAllContainedCheckResults();
}
for (Storey storey : buildingStoreys) {
storey.clearAllContainedCheckResults();
}
for (BuildingUnit bu : buildingUnits) {
bu.clearAllContainedCheckResults();
}
}
void setCityGmlBuilding(org.citygml4j.core.model.building.AbstractBuilding ab) { void setCityGmlBuilding(org.citygml4j.core.model.building.AbstractBuilding ab) {
this.ab = ab; this.ab = ab;
} }
......
...@@ -157,24 +157,6 @@ public abstract class AbstractBuildingSubdivision extends CityObject { ...@@ -157,24 +157,6 @@ public abstract class AbstractBuildingSubdivision extends CityObject {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (Installation bi : buildingInstallations) {
bi.clearAllContainedCheckResults();
}
for (BoundarySurface bs : boundarySurfaceList) {
bs.clearAllContainedCheckResults();
}
for (BuildingRoom br : buildingRooms) {
br.clearAllContainedCheckResults();
}
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.clearAllContainedCheckResults();
}
}
void setCityGmlBuilding(org.citygml4j.core.model.building.AbstractBuildingSubdivision abs) { void setCityGmlBuilding(org.citygml4j.core.model.building.AbstractBuildingSubdivision abs) {
this.abs = abs; this.abs = abs;
} }
......
...@@ -42,14 +42,6 @@ public abstract class AbstractFurniture extends CityObject { ...@@ -42,14 +42,6 @@ public abstract class AbstractFurniture extends CityObject {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (BoundarySurface boundarySurface : boundarySurfaceList) {
boundarySurface.clearAllContainedCheckResults();
}
}
@Override @Override
public org.citygml4j.core.model.construction.AbstractFurniture getGmlObject() { public org.citygml4j.core.model.construction.AbstractFurniture getGmlObject() {
return af; return af;
......
...@@ -48,17 +48,6 @@ public abstract class AbstractRoom extends CityObject { ...@@ -48,17 +48,6 @@ public abstract class AbstractRoom extends CityObject {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (Installation roomInstallation : roomInstallations) {
roomInstallation.clearAllContainedCheckResults();
}
for (BoundarySurface boundarySurface : boundarySurfaceList) {
boundarySurface.clearAllContainedCheckResults();
}
}
@Override @Override
public void rebuildGeometries(GeometryFactory factory, ParserConfiguration config) { public void rebuildGeometries(GeometryFactory factory, ParserConfiguration config) {
for (Geometry geom : getGeometries()) { for (Geometry geom : getGeometries()) {
......
...@@ -169,29 +169,6 @@ public abstract class AbstractTunnel extends CityObject { ...@@ -169,29 +169,6 @@ public abstract class AbstractTunnel extends CityObject {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (Installation bi : tunnelInstallations) {
bi.clearAllContainedCheckResults();
}
for (BoundarySurface bs : boundarySurfaceList) {
bs.clearAllContainedCheckResults();
}
for (TunnelHollow th : tunnelHollows) {
th.clearAllContainedCheckResults();
}
for (TunnelFurniture tfr : tunnelFurnitureList) {
tfr.clearAllContainedCheckResults();
}
for (TunnelConstructiveElement te : tunnelConstructiveElements) {
te.clearAllContainedCheckResults();
}
for (TunnelPart tp : tunnelParts) {
tp.clearAllContainedCheckResults();
}
}
void setCityGmlBuilding(org.citygml4j.core.model.tunnel.AbstractTunnel at) { void setCityGmlBuilding(org.citygml4j.core.model.tunnel.AbstractTunnel at) {
this.at = at; this.at = at;
......
...@@ -143,14 +143,6 @@ public class BoundarySurface extends CityObject { ...@@ -143,14 +143,6 @@ public class BoundarySurface extends CityObject {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (Opening o : openings) {
o.clearAllContainedCheckResults();
}
}
@Override @Override
public void accept(Check c) { public void accept(Check c) {
super.accept(c); super.accept(c);
......
...@@ -113,14 +113,6 @@ public class BridgeConstructiveElement extends CityObject { ...@@ -113,14 +113,6 @@ public class BridgeConstructiveElement extends CityObject {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (BoundarySurface bs : boundarySurfaceList) {
bs.clearAllContainedCheckResults();
}
}
private void reCreateBoundarySurface(GeometryFactory factory, ParserConfiguration config, BoundarySurface bs) { private void reCreateBoundarySurface(GeometryFactory factory, ParserConfiguration config, BoundarySurface bs) {
if (bs.getGeometries().isEmpty()) { if (bs.getGeometries().isEmpty()) {
for (AbstractSpaceBoundaryProperty bsp : gmlBridgeElement.getBoundaries()) { for (AbstractSpaceBoundaryProperty bsp : gmlBridgeElement.getBoundaries()) {
......
...@@ -191,29 +191,6 @@ public class BridgeObject extends CityObject { ...@@ -191,29 +191,6 @@ public class BridgeObject extends CityObject {
furniture.setParent(this); furniture.setParent(this);
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (BoundarySurface bs : boundarySurfaces) {
bs.clearAllContainedCheckResults();
}
for (Installation bi : bridgeInstallations) {
bi.clearAllContainedCheckResults();
}
for (BridgeObject part : parts) {
part.clearAllContainedCheckResults();
}
for (BridgeConstructiveElement ele : elements) {
ele.clearAllContainedCheckResults();
}
for (BridgeRoom br : bridgeRooms) {
br.clearAllContainedCheckResults();
}
for (BridgeRoomFurniture bri : bridgeFurniture) {
bri.clearAllContainedCheckResults();
}
}
@Override @Override
public void accept(Check c) { public void accept(Check c) {
super.accept(c); super.accept(c);
......
...@@ -60,14 +60,6 @@ public class Building extends AbstractBuilding { ...@@ -60,14 +60,6 @@ public class Building extends AbstractBuilding {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (BuildingPart bp : buildingParts) {
bp.clearAllContainedCheckResults();
}
}
public void addBuildingPart(BuildingPart buildingPart) { public void addBuildingPart(BuildingPart buildingPart) {
buildingParts.add(buildingPart); buildingParts.add(buildingPart);
} }
......
...@@ -41,13 +41,6 @@ public class BuildingUnit extends AbstractBuildingSubdivision { ...@@ -41,13 +41,6 @@ public class BuildingUnit extends AbstractBuildingSubdivision {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (Storey storey : storeys) {
storey.clearAllContainedCheckResults();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
......
...@@ -154,14 +154,6 @@ public abstract class CityObject extends GmlElement { ...@@ -154,14 +154,6 @@ public abstract class CityObject extends GmlElement {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearCheckResults();
for (Geometry geom : geometryList) {
geom.clearAllContainedCheckResults();
}
}
public Geometry getGeometry(GeometryType type, Lod lod) { public Geometry getGeometry(GeometryType type, Lod lod) {
for (Geometry geom : geometryList) { for (Geometry geom : geometryList) {
if (geom.getType() == type && geom.getLod() == lod) { if (geom.getType() == type && geom.getLod() == lod) {
......
...@@ -214,25 +214,6 @@ public class ConcretePolygon extends Polygon { ...@@ -214,25 +214,6 @@ public class ConcretePolygon extends Polygon {
return exterior.isRingConnectedViaPoint(other.getExteriorRing()); return exterior.isRingConnectedViaPoint(other.getExteriorRing());
} }
/*
* (non-Javadoc)
*
* @see de.hft.stuttgart.citydoctor2.datastructure.Polygon#
* clearAllContainedCheckResults()
*/
@Override
public void clearAllContainedCheckResults() {
super.clearCheckResults();
if (exterior != null) {
exterior.clearAllContainedCheckResults();
}
if (innerRings != null) {
for (LinearRing lr : innerRings) {
lr.clearAllContainedCheckResults();
}
}
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
......
...@@ -118,14 +118,6 @@ public class GenericCityObject extends CityObject { ...@@ -118,14 +118,6 @@ public class GenericCityObject extends CityObject {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (BoundarySurface bs : boundarySurfaceList) {
bs.clearAllContainedCheckResults();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
super.collectInstances(handler); super.collectInstances(handler);
......
...@@ -207,14 +207,6 @@ public class Geometry extends GmlElement { ...@@ -207,14 +207,6 @@ public class Geometry extends GmlElement {
} }
@Override
public void clearAllContainedCheckResults() {
super.clearCheckResults();
for (Polygon p : polygons) {
p.clearAllContainedCheckResults();
}
}
@Override @Override
public void accept(Check c) { public void accept(Check c) {
super.accept(c); super.accept(c);
......
...@@ -62,12 +62,6 @@ public class ImplicitGeometryHolder extends Geometry { ...@@ -62,12 +62,6 @@ public class ImplicitGeometryHolder extends Geometry {
prototypeGeometry.accept(c); prototypeGeometry.accept(c);
} }
@Override
public void clearAllContainedCheckResults() {
prototypeGeometry.clearAllContainedCheckResults();
}
@Override @Override
public boolean isValidated() { public boolean isValidated() {
return prototypeGeometry.isValidated(); return prototypeGeometry.isValidated();
......
...@@ -142,14 +142,6 @@ public class Installation extends CityObject { ...@@ -142,14 +142,6 @@ public class Installation extends CityObject {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearAllContainedCheckResults();
for (BoundarySurface bs : boundarySurfaces) {
bs.clearAllContainedCheckResults();
}
}
public void setParent(CityObject parent) { public void setParent(CityObject parent) {
this.parent = parent; this.parent = parent;
} }
......
...@@ -235,11 +235,6 @@ public class LinearRing extends GmlElement { ...@@ -235,11 +235,6 @@ public class LinearRing extends GmlElement {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearCheckResults();
}
public void setParent(Polygon polygon) { public void setParent(Polygon polygon) {
parent = polygon; parent = polygon;
} }
......
...@@ -237,11 +237,6 @@ public class LinkedPolygon extends Polygon { ...@@ -237,11 +237,6 @@ public class LinkedPolygon extends Polygon {
poly.anonymize(); poly.anonymize();
} }
@Override
public void clearAllContainedCheckResults() {
poly.clearAllContainedCheckResults();
}
@Override @Override
public ConcretePolygon getOriginal() { public ConcretePolygon getOriginal() {
return poly; return poly;
......
...@@ -122,11 +122,6 @@ public class Opening extends CityObject { ...@@ -122,11 +122,6 @@ public class Opening extends CityObject {
} }
} }
@Override
public void clearAllContainedCheckResults() {
super.clearCheckResults();
}
public void unsetGmlGeometries() { public void unsetGmlGeometries() {
ao.setLod0MultiSurface(null); ao.setLod0MultiSurface(null);
ao.setLod1MultiSurface(null); ao.setLod1MultiSurface(null);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment