Commit efa04ffb authored by Riegel's avatar Riegel
Browse files

Refactor: Rework clearMetaInformation with Visitor

parent 79a65e32
Pipeline #11063 failed with stage
in 46 seconds
...@@ -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.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;
import de.hft.stuttgart.citydoctor2.utils.visitors.PrepareForCheckingVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.PrepareForCheckingVisitor;
...@@ -102,7 +103,9 @@ public abstract class Checkable implements Serializable { ...@@ -102,7 +103,9 @@ public abstract class Checkable implements Serializable {
* This should be called after checking has been done. This should remove any * This should be called after checking has been done. This should remove any
* created meta information like edges to free up additional memory space * created meta information like edges to free up additional memory space
*/ */
public abstract void clearMetaInformation(); public void clearMetaInformation() {
this.accept(new ClearMetaInformationVisitor());
}
/** /**
* This method checks if the object or any object contained within this * This method checks if the object or any object contained within this
...@@ -231,7 +234,7 @@ public abstract class Checkable implements Serializable { ...@@ -231,7 +234,7 @@ public abstract class Checkable implements Serializable {
* @return false if the checkable or all checkables contained in this one don't * @return false if the checkable or all checkables contained in this one don't
* have any error. * have any error.
*/ */
public boolean containsAnyError() { public final boolean containsAnyError() {
try { try {
ContainsAnyErrorVisitor.checkObject(this); ContainsAnyErrorVisitor.checkObject(this);
} catch (CheckErrorFound c) { } catch (CheckErrorFound c) {
......
...@@ -285,28 +285,6 @@ public abstract class AbstractBuilding extends CityObject { ...@@ -285,28 +285,6 @@ public abstract class AbstractBuilding extends CityObject {
return buildingUnits; return buildingUnits;
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (Installation bi : buildingInstallations) {
bi.clearMetaInformation();
}
for (BoundarySurface bs : boundarySurfaceList) {
bs.clearMetaInformation();
}
for (BuildingRoom br : buildingRooms) {
br.clearMetaInformation();
}
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.clearMetaInformation();
}
for (Storey storey : buildingStoreys) {
storey.clearMetaInformation();
}
for (BuildingUnit bu : buildingUnits) {
bu.clearMetaInformation();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
......
...@@ -228,23 +228,6 @@ public abstract class AbstractBuildingSubdivision extends CityObject { ...@@ -228,23 +228,6 @@ public abstract class AbstractBuildingSubdivision extends CityObject {
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (Installation bi : buildingInstallations) {
bi.clearMetaInformation();
}
for (BoundarySurface bs : boundarySurfaceList) {
bs.clearMetaInformation();
}
for (BuildingRoom br : buildingRooms) {
br.clearMetaInformation();
}
for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) {
bfr.clearMetaInformation();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
super.collectInstances(handler); super.collectInstances(handler);
......
...@@ -145,15 +145,6 @@ public abstract class AbstractFurniture extends CityObject { ...@@ -145,15 +145,6 @@ public abstract class AbstractFurniture extends CityObject {
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (BoundarySurface boundarySurface : boundarySurfaceList) {
boundarySurface.clearMetaInformation();
}
}
@Override @Override
public FeatureType getFeatureType() { public FeatureType getFeatureType() {
return FeatureType.FURNITURE; return FeatureType.FURNITURE;
......
...@@ -125,18 +125,6 @@ public abstract class AbstractRoom extends CityObject { ...@@ -125,18 +125,6 @@ public abstract class AbstractRoom extends CityObject {
cgmlRoom.setLod3Solid(null); cgmlRoom.setLod3Solid(null);
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (Installation roomInstallation : roomInstallations) {
roomInstallation.clearMetaInformation();
}
for (BoundarySurface boundarySurface : boundarySurfaceList) {
boundarySurface.clearMetaInformation();
}
}
@Override @Override
public AbstractCityObject getGmlObject() { public AbstractCityObject getGmlObject() {
return cgmlRoom; return cgmlRoom;
......
...@@ -267,30 +267,6 @@ public abstract class AbstractTunnel extends CityObject { ...@@ -267,30 +267,6 @@ public abstract class AbstractTunnel extends CityObject {
return tunnelConstructiveElements; return tunnelConstructiveElements;
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (Installation bi : tunnelInstallations) {
bi.clearMetaInformation();
}
for (BoundarySurface bs : boundarySurfaceList) {
bs.clearMetaInformation();
}
for (TunnelHollow th : tunnelHollows) {
th.clearMetaInformation();
}
for (TunnelFurniture tfr : tunnelFurnitureList) {
tfr.clearMetaInformation();
}
for (TunnelConstructiveElement te : tunnelConstructiveElements) {
te.clearMetaInformation();
}
for (TunnelPart tp : tunnelParts) {
tp.clearMetaInformation();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
super.collectInstances(handler); super.collectInstances(handler);
......
...@@ -219,15 +219,6 @@ public class BoundarySurface extends CityObject { ...@@ -219,15 +219,6 @@ public class BoundarySurface extends CityObject {
opening.setPartOfSurface(this); opening.setPartOfSurface(this);
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (Opening o : openings) {
o.clearMetaInformation();
}
}
@Override @Override
public Copyable createCopyInstance() { public Copyable createCopyInstance() {
return new BoundarySurface(gmlObject); return new BoundarySurface(gmlObject);
......
...@@ -237,15 +237,6 @@ public class BridgeConstructiveElement extends CityObject { ...@@ -237,15 +237,6 @@ public class BridgeConstructiveElement extends CityObject {
return boundarySurfaceList; return boundarySurfaceList;
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (BoundarySurface bs : boundarySurfaceList) {
bs.clearMetaInformation();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
super.collectInstances(handler); super.collectInstances(handler);
......
...@@ -298,34 +298,6 @@ public class BridgeObject extends CityObject { ...@@ -298,34 +298,6 @@ public class BridgeObject extends CityObject {
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (BoundarySurface bs : boundarySurfaces) {
bs.clearMetaInformation();
}
for (Installation bi : bridgeInstallations) {
bi.clearMetaInformation();
}
for (BridgeObject part : parts) {
part.clearMetaInformation();
}
for (BridgeConstructiveElement ele : elements) {
ele.clearMetaInformation();
}
for (BridgeRoom br : bridgeRooms) {
br.clearMetaInformation();
}
for (BridgeRoomFurniture bri : bridgeFurniture) {
bri.clearMetaInformation();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
super.collectInstances(handler); super.collectInstances(handler);
......
...@@ -101,14 +101,6 @@ public class Building extends AbstractBuilding { ...@@ -101,14 +101,6 @@ public class Building extends AbstractBuilding {
setCityGmlBuilding(gmlB); setCityGmlBuilding(gmlB);
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (BuildingPart part : buildingParts) {
part.clearMetaInformation();
}
}
@Override @Override
public void fillValues(Copyable original, CopyHandler handler) { public void fillValues(Copyable original, CopyHandler handler) {
super.fillValues(original, handler); super.fillValues(original, handler);
......
...@@ -49,14 +49,6 @@ public class BuildingUnit extends AbstractBuildingSubdivision { ...@@ -49,14 +49,6 @@ public class BuildingUnit extends AbstractBuildingSubdivision {
} }
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (Storey storey : storeys) {
storey.clearMetaInformation();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
super.collectInstances(handler); super.collectInstances(handler);
......
...@@ -165,13 +165,6 @@ public abstract class CityObject extends GmlElement { ...@@ -165,13 +165,6 @@ public abstract class CityObject extends GmlElement {
return null; return null;
} }
@Override
public void clearMetaInformation() {
for (Geometry geom : geometryList) {
geom.clearMetaInformation();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
for (Geometry geom : geometryList) { for (Geometry geom : geometryList) {
......
...@@ -414,10 +414,6 @@ public class ConcretePolygon extends Polygon { ...@@ -414,10 +414,6 @@ public class ConcretePolygon extends Polygon {
parent.updateEdgesAndVertices(); parent.updateEdgesAndVertices();
} }
@Override
public void clearMetaInformation() {
parent.clearMetaInformation();
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
......
...@@ -128,14 +128,6 @@ public class GenericCityObject extends CityObject { ...@@ -128,14 +128,6 @@ public class GenericCityObject extends CityObject {
} }
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (BoundarySurface bs : boundarySurfaceList) {
bs.clearMetaInformation();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
super.collectInstances(handler); super.collectInstances(handler);
......
...@@ -343,8 +343,7 @@ public class Geometry extends GmlElement { ...@@ -343,8 +343,7 @@ public class Geometry extends GmlElement {
} }
@Override public void clearMetaData() {
public void clearMetaInformation() {
if (vertices != null) { if (vertices != null) {
for (Vertex v : vertices) { for (Vertex v : vertices) {
v.clearAdjacentRings(); v.clearAdjacentRings();
......
...@@ -218,15 +218,6 @@ public class Installation extends CityObject { ...@@ -218,15 +218,6 @@ public class Installation extends CityObject {
return boundarySurfaces; return boundarySurfaces;
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (BoundarySurface bs : boundarySurfaces) {
bs.clearMetaInformation();
}
}
@Override @Override
public void fillValues(Copyable original, CopyHandler handler) { public void fillValues(Copyable original, CopyHandler handler) {
super.fillValues(original, handler); super.fillValues(original, handler);
......
...@@ -317,11 +317,6 @@ public class LinearRing extends GmlElement { ...@@ -317,11 +317,6 @@ public class LinearRing extends GmlElement {
parent.prepareLowMemoryUsageMode(); parent.prepareLowMemoryUsageMode();
} }
@Override
public void clearMetaInformation() {
parent.getParent().clearMetaInformation();
}
@Override @Override
public void fillValues(Copyable original, CopyHandler handler) { public void fillValues(Copyable original, CopyHandler handler) {
super.fillValues(original, handler); super.fillValues(original, handler);
......
...@@ -117,11 +117,6 @@ public class LinkedPolygon extends Polygon { ...@@ -117,11 +117,6 @@ public class LinkedPolygon extends Polygon {
poly.addCheckResult(cr); poly.addCheckResult(cr);
} }
@Override
public boolean containsAnyError() {
return poly.containsAnyError();
}
@Override @Override
public boolean containsError(CheckId checkIdentifier) { public boolean containsError(CheckId checkIdentifier) {
return poly.containsError(checkIdentifier); return poly.containsError(checkIdentifier);
...@@ -257,11 +252,6 @@ public class LinkedPolygon extends Polygon { ...@@ -257,11 +252,6 @@ public class LinkedPolygon extends Polygon {
poly.prepareLowMemoryUsageMode(); poly.prepareLowMemoryUsageMode();
} }
@Override
public void clearMetaInformation() {
poly.clearMetaInformation();
}
@Override @Override
public boolean isLinkedTo() { public boolean isLinkedTo() {
return false; return false;
......
...@@ -74,13 +74,6 @@ public class ReliefObject extends CityObject { ...@@ -74,13 +74,6 @@ public class ReliefObject extends CityObject {
return new ReliefObject(feature); return new ReliefObject(feature);
} }
@Override
public void clearMetaInformation() {
for (TinObject component : components) {
component.clearMetaInformation();
}
}
@Override @Override
public void clearAllContainedCheckResults() { public void clearAllContainedCheckResults() {
for (TinObject component : components) { for (TinObject component : components) {
......
...@@ -48,14 +48,6 @@ public class Storey extends AbstractBuildingSubdivision { ...@@ -48,14 +48,6 @@ public class Storey extends AbstractBuildingSubdivision {
} }
} }
@Override
public void clearMetaInformation() {
super.clearMetaInformation();
for (BuildingUnit buildingUnit : buildingUnits) {
buildingUnit.clearMetaInformation();
}
}
@Override @Override
public void collectInstances(CopyHandler handler) { public void collectInstances(CopyHandler handler) {
super.collectInstances(handler); super.collectInstances(handler);
......
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