diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java index 856abfa77e9600ee7dcf797f26f44122180b3377..f797caae1dee18dc7f7b1361faf6d0b21166892b 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java @@ -99,6 +99,9 @@ public abstract class AbstractBuilding extends CityObject { for (BuildingRoom br : buildingRooms) { br.unsetGmlGeometries(); } + for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) { + bfr.unsetGmlGeometries(); + } } @Override @@ -121,6 +124,9 @@ public abstract class AbstractBuilding extends CityObject { for (BuildingRoom br : buildingRooms) { br.reCreateGeometries(factory, config); } + for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) { + bfr.reCreateGeometries(factory, config); + } } private void reCreateBoundarySurface(GeometryFactory factory, ParserConfiguration config, BoundarySurface bs) { @@ -193,6 +199,9 @@ public abstract class AbstractBuilding extends CityObject { for (BuildingRoom br : buildingRooms) { br.accept(c); } + for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) { + bfr.accept(c); + } } @Override @@ -207,6 +216,9 @@ public abstract class AbstractBuilding extends CityObject { for (BuildingRoom br : buildingRooms) { br.collectContainedErrors(errors); } + for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) { + bfr.collectContainedErrors(errors); + } } @Override @@ -221,6 +233,9 @@ public abstract class AbstractBuilding extends CityObject { for (BuildingRoom br : buildingRooms) { br.clearAllContainedCheckResults(); } + for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) { + bfr.clearAllContainedCheckResults(); + } } @Override @@ -244,6 +259,11 @@ public abstract class AbstractBuilding extends CityObject { return true; } } + for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) { + if (bfr.containsError(checkIdentifier)) { + return true; + } + } return false; } @@ -268,6 +288,11 @@ public abstract class AbstractBuilding extends CityObject { return true; } } + for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) { + if (bfr.containsAnyError()) { + return true; + } + } return false; } @@ -325,6 +350,9 @@ public abstract class AbstractBuilding extends CityObject { for (BuildingRoom br : buildingRooms) { br.prepareForChecking(); } + for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) { + bfr.prepareForChecking(); + } } @Override @@ -339,6 +367,9 @@ public abstract class AbstractBuilding extends CityObject { for (BuildingRoom br : buildingRooms) { br.clearMetaInformation(); } + for (BuildingRoomFurniture bfr : buildingRoomFurnitureList) { + bfr.clearMetaInformation(); + } } @Override @@ -347,6 +378,7 @@ public abstract class AbstractBuilding extends CityObject { handler.addInstance(boundarySurfaceList); handler.addInstance(buildingInstallations); handler.addInstance(buildingRooms); + handler.addInstance(buildingRoomFurnitureList); } @Override @@ -362,6 +394,9 @@ public abstract class AbstractBuilding extends CityObject { for (BuildingRoom originalBr : originalAb.buildingRooms) { buildingRooms.add(handler.getCopyInstance(originalBr)); } + for (BuildingRoomFurniture originalBFR : originalAb.buildingRoomFurnitureList) { + buildingRoomFurnitureList.add(handler.getCopyInstance(originalBFR)); + } ab = originalAb.ab; }