Add checking of CityFurniture and GenericObjects

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Check.java

@@ -26,23 +26,7 @@ import java.util.Map;
 import java.util.Set;
 
 import de.hft.stuttgart.citydoctor2.check.error.DependenciesNotMetError;
-import de.hft.stuttgart.citydoctor2.datastructure.AbstractBuilding;
-import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
-import de.hft.stuttgart.citydoctor2.datastructure.BridgeObject;
-import de.hft.stuttgart.citydoctor2.datastructure.Building;
-import de.hft.stuttgart.citydoctor2.datastructure.Installation;
-import de.hft.stuttgart.citydoctor2.datastructure.BuildingPart;
-import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
-import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
-import de.hft.stuttgart.citydoctor2.datastructure.LandObject;
-import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
-import de.hft.stuttgart.citydoctor2.datastructure.Opening;
-import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
-import de.hft.stuttgart.citydoctor2.datastructure.ReliefObject;
-import de.hft.stuttgart.citydoctor2.datastructure.TinObject;
-import de.hft.stuttgart.citydoctor2.datastructure.TransportationObject;
-import de.hft.stuttgart.citydoctor2.datastructure.Vegetation;
-import de.hft.stuttgart.citydoctor2.datastructure.WaterObject;
+import de.hft.stuttgart.citydoctor2.datastructure.*;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 
 /**
@@ -313,6 +297,14 @@ public abstract class Check {
 		
 	}
 
+	public void check(CityFurniture cf){
+
+	}
+
+	public void check(GenericCityObject gco) {
+
+	}
+
 	/**
 	 * The initialization method of this check. It will be called before any check
 	 * method will be executed. Override this if you want to have configurable

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

@@ -125,7 +125,7 @@ public class CityDoctorModel {
 
 	public Stream<CityObject> createFeatureStream() {
 		return Stream.of(buildings.stream(), vegetation.stream(), bridges.stream(), land.stream(), roads.stream(),
-				water.stream()).flatMap(co -> co);
+				water.stream(), cityfurniture.stream(),genericObjects.stream()).flatMap(co -> co);
 	}
 
 	public void saveAs(String file, boolean saveQualityAde) throws CityDoctorWriteException {
@@ -316,7 +316,8 @@ public class CityDoctorModel {
 	}
 
 	public int getNumberOfFeatures() {
-		return buildings.size() + vegetation.size() + bridges.size() + land.size() + roads.size() + water.size();
+		return buildings.size() + vegetation.size() + bridges.size() + land.size() + roads.size() + water.size() + cityfurniture.size()
+				+ genericObjects.size();
 	}
 
 	public ParserConfiguration getParserConfig() {

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/CheckContainer.java

@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import de.hft.stuttgart.citydoctor2.datastructure.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -34,21 +35,6 @@ import de.hft.stuttgart.citydoctor2.check.Requirement;
 import de.hft.stuttgart.citydoctor2.check.RequirementType;
 import de.hft.stuttgart.citydoctor2.check.ResultStatus;
 import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError;
-import de.hft.stuttgart.citydoctor2.datastructure.AbstractBuilding;
-import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
-import de.hft.stuttgart.citydoctor2.datastructure.BridgeObject;
-import de.hft.stuttgart.citydoctor2.datastructure.Building;
-import de.hft.stuttgart.citydoctor2.datastructure.Installation;
-import de.hft.stuttgart.citydoctor2.datastructure.BuildingPart;
-import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
-import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
-import de.hft.stuttgart.citydoctor2.datastructure.LandObject;
-import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
-import de.hft.stuttgart.citydoctor2.datastructure.Opening;
-import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
-import de.hft.stuttgart.citydoctor2.datastructure.TransportationObject;
-import de.hft.stuttgart.citydoctor2.datastructure.Vegetation;
-import de.hft.stuttgart.citydoctor2.datastructure.WaterObject;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.Localization;
 
@@ -244,6 +230,24 @@ public class CheckContainer extends Check {
 		}
 	}
 
+	@Override
+	public void check(CityFurniture cf){
+		try {
+			check.check(cf);
+		} catch (Exception e) {
+			handleException(e, cf);
+		}
+	}
+
+	@Override
+	public void check(GenericCityObject gco) {
+		try {
+			check.check(gco);
+		} catch (Exception e) {
+			handleException(e, gco);
+		}
+	}
+
 	@Override
 	public RequirementType getType() {
 		return check.getType();