Merge branch 'citygml3'

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/InnerRingsNestedType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RequirementProperty.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,30 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.properties;
 
-import javax.xml.bind.annotation.XmlRootElement;
 
-@XmlRootElement(name = "GE_P_INNER_RINGS_NESTED")
-public class InnerRingsNestedType extends PolygonErrorType {
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.base.AbstractInlineProperty;
 
-	private String linearRingId1;
-	private String linearRingId2;
+import de.hft.stuttgart.quality.model.types.Requirement;
 
-	public void setLinearRingId1(String linearRingId1) {
-		this.linearRingId1 = linearRingId1;
-	}
+public class RequirementProperty extends AbstractInlineProperty<Requirement> implements ADEObject {
 
-	public void setLinearRingId2(String linearRingId2) {
-		this.linearRingId2 = linearRingId2;
-	}
+    private static final long serialVersionUID = 1084132873819307011L;
 
-	public String getLinearRingId1() {
-		return linearRingId1;
-	}
+    public RequirementProperty() {
+        super();
+    }
 
-	public String getLinearRingId2() {
-		return linearRingId2;
-	}
+    public RequirementProperty(Requirement r) {
+        super(r);
+    }
+
+    @Override
+    public Class<Requirement> getTargetType() {
+        return Requirement.class;
+    }
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/EdgeType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/StatisticsProperty.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,32 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.properties;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.base.AbstractInlineProperty;
 
-import net.opengis.gml.DirectPositionType;
+import de.hft.stuttgart.quality.model.types.Statistics;
 
-@XmlAccessorType(XmlAccessType.FIELD)
-public class EdgeType {
+public class StatisticsProperty extends AbstractInlineProperty<Statistics> implements ADEObject {
 
-	private DirectPositionType from;
-	private DirectPositionType to;
+    private static final long serialVersionUID = 4264016075264322157L;
 
-	public void setFrom(DirectPositionType from) {
-		this.from = from;
-	}
+    public StatisticsProperty() {
+        super();
+    }
 
-	public void setTo(DirectPositionType to) {
-		this.to = to;
-	}
+    public StatisticsProperty(Statistics s) {
+        super(s);
+    }
 
-	public DirectPositionType getFrom() {
-		return from;
-	}
+    @Override
+    public Class<Statistics> getTargetType() {
+        return Statistics.class;
+    }
 
-	public DirectPositionType getTo() {
-		return to;
-	}
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationPlanProperty.java

+/*-
+ * Copyright 2022 Hochschule für Technik Stuttgart
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.hft.stuttgart.quality.model.properties;
+
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.base.AbstractInlineProperty;
+
+import de.hft.stuttgart.quality.model.types.ValidationPlan;
+
+public class ValidationPlanProperty extends AbstractInlineProperty<ValidationPlan> implements ADEObject {
+
+	private static final long serialVersionUID = 4542660904311227314L;
+
+	public ValidationPlanProperty() {
+		super();
+	}
+
+	public ValidationPlanProperty(ValidationPlan vp) {
+		super(vp);
+	}
+
+	@Override
+	public Class<ValidationPlan> getTargetType() {
+		return ValidationPlan.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/OrientationRingsSame.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationProperty.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,31 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.properties;
 
-import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.base.AbstractInlineOrByReferenceProperty;
 
-public class OrientationRingsSame extends PolygonError {
+import de.hft.stuttgart.quality.model.types.Validation;
 
-	private static final long serialVersionUID = -6983324580253488854L;
-	
-	private String linearRingId;
+public class ValidationProperty extends AbstractInlineOrByReferenceProperty<Validation> implements ADEObject {
 
-	public void setLinearRingId(String linearRingId) {
-		this.linearRingId = linearRingId;
+	private static final long serialVersionUID = 3423466580266018906L;
+
+	public ValidationProperty() {
+		super();
 	}
 
-	public String getLinearRingId() {
-		return linearRingId;
+	public ValidationProperty(Validation object) {
+		super(object);
 	}
 
-	@Override
-	public String toString() {
-		return "OrientationRingsSame [polygonId=" + getPolygonId() + ", linearRingId=" + linearRingId + "]";
+	public ValidationProperty(String href) {
+		super(href);
 	}
 
 	@Override
-	public Object copy(CopyBuilder copyBuilder) {
-		return copyTo(new OrientationRingsSame(), copyBuilder);
+	public Class<Validation> getTargetType() {
+		return Validation.class;
 	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationResultProperty.java

+/*-
+ * Copyright 2022 Hochschule für Technik Stuttgart
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.hft.stuttgart.quality.model.properties;
+
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.base.AbstractInlineOrByReferenceProperty;
+
+import de.hft.stuttgart.quality.model.types.ValidationResult;
+
+public class ValidationResultProperty extends AbstractInlineOrByReferenceProperty<ValidationResult>
+		implements ADEObject {
+
+	private static final long serialVersionUID = 480940868730913996L;
+
+	public ValidationResultProperty() {
+		super();
+	}
+
+	public ValidationResultProperty(ValidationResult object) {
+		super(object);
+	}
+
+	public ValidationResultProperty(String href) {
+		super(href);
+	}
+
+	@Override
+	public Class<ValidationResult> getTargetType() {
+		return ValidationResult.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/TooFewPolygons.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,21 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-import org.citygml4j.builder.copy.CopyBuilder;
 
-public class TooFewPolygons extends SolidError {
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.GMLObject;
 
-	private static final long serialVersionUID = -51591095439740599L;
+import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor;
 
-	@Override
-	public String toString() {
-		return "TooFewPolygons [geometryId=" + getGeometryId() + "]";
-	}
+public abstract class AbstractError extends GMLObject implements ADEObject {
 
-	@Override
-	public Object copy(CopyBuilder copyBuilder) {
-		return copyTo(new TooFewPolygons(), copyBuilder);
-	}
+    private static final long serialVersionUID = 4456303926951620441L;
+    
+    public void accept(ValidationErrorVisitor visitor) {
+    	visitor.visit(this);
+    }
+    
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractGeometryError.java

+/*-
+ * Copyright 2022 Hochschule für Technik Stuttgart
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.hft.stuttgart.quality.model.types;
+
+import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor;
+
+public abstract class AbstractGeometryError extends AbstractError {
+
+	private static final long serialVersionUID = 5584980708521134866L;
+
+	@Override
+	public void accept(ValidationErrorVisitor visitor) {
+		super.accept(visitor);
+		visitor.visit(this);
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/PolygonError.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractPolygonError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-public abstract class PolygonError extends ValidationError {
+import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor;
+
+public abstract class AbstractPolygonError extends AbstractGeometryError {
+
+	private static final long serialVersionUID = 8765755615504522764L;
 
-	private static final long serialVersionUID = 4694297467768369526L;
-	
 	private String polygonId;
 
+	public String getPolygonId() {
+		return polygonId;
+	}
+
 	public void setPolygonId(String polygonId) {
 		this.polygonId = polygonId;
 	}
 
-	public String getPolygonId() {
-		return polygonId;
+	@Override
+	public void accept(ValidationErrorVisitor visitor) {
+		super.accept(visitor);
+		visitor.visit(this);
 	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/OrientationRingsSameType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractRingError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,21 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor;
 
-@XmlRootElement(name = "GE_P_ORIENTATION_RINGS_SAME")
-public class OrientationRingsSameType extends PolygonErrorType {
+public abstract class AbstractRingError extends AbstractGeometryError {
+
+	private static final long serialVersionUID = 6406932524599157467L;
 
 	private String linearRingId;
 
+	public String getLinearRingId() {
+		return linearRingId;
+	}
+
 	public void setLinearRingId(String linearRingId) {
 		this.linearRingId = linearRingId;
 	}
 
-	public String getLinearRingId() {
-		return linearRingId;
+	@Override
+	public void accept(ValidationErrorVisitor visitor) {
+		super.accept(visitor);
+		visitor.visit(this);
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSemanticError.java

+/*-
+ * Copyright 2022 Hochschule für Technik Stuttgart
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.hft.stuttgart.quality.model.types;
+
+import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor;
+
+public abstract class AbstractSemanticError extends AbstractError {
+
+	private static final long serialVersionUID = 3754322190455789991L;
+
+	@Override
+	public void accept(ValidationErrorVisitor visitor) {
+		super.accept(visitor);
+		visitor.visit(this);
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/SolidError.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSolidError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,18 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
+
+import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor;
+
+public abstract class AbstractSolidError extends AbstractGeometryError {
+
+	private static final long serialVersionUID = 8616094562996823088L;
 
-public abstract class SolidError extends ValidationError {
-	private static final long serialVersionUID = 6430138970493794998L;
-	
 	private String geometryId;
 
+	public String getGeometryId() {
+		return geometryId;
+	}
+
 	public void setGeometryId(String geometryId) {
 		this.geometryId = geometryId;
 	}
 
-	public String getGeometryId() {
-		return geometryId;
+	@Override
+	public void accept(ValidationErrorVisitor visitor) {
+		super.accept(visitor);
+		visitor.visit(this);
 	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AllPolygonsOrientedWrongError.java

+/*-
+ * Copyright 2022 Hochschule für Technik Stuttgart
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.hft.stuttgart.quality.model.types;
+
+import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor;
+
+public class AllPolygonsOrientedWrongError extends AbstractSolidError {
+
+	private static final long serialVersionUID = 4295306777217062184L;
+
+	@Override
+	public void accept(ValidationErrorVisitor visitor) {
+		super.accept(visitor);
+		visitor.visit(this);
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/NonManifoldVertexType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,23 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.GMLObject;
 
-import net.opengis.gml.DirectPositionType;
+import de.hft.stuttgart.quality.model.enums.TopLevelFeatureType;
 
-@XmlRootElement(name = "GE_S_NON_MANIFOLD_VERTEX")
-public class NonManifoldVertexType extends SolidErrorType {
+public class Checking extends GMLObject implements ADEObject {
 
-	private DirectPositionType vertex;
+	private static final long serialVersionUID = 8248598807454312291L;
 
-	public void setVertex(DirectPositionType vertex) {
-		this.vertex = vertex;
+	private TopLevelFeatureType featureType;
+
+	public TopLevelFeatureType getFeatureType() {
+		return featureType;
 	}
 
-	public DirectPositionType getVertex() {
-		return vertex;
+	public void setFeatureType(TopLevelFeatureType featureType) {
+		this.featureType = featureType;
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/CityObjectProperties.java

+package de.hft.stuttgart.quality.model.types;
+
+import org.citygml4j.core.model.core.ADEOfAbstractCityObject;
+
+import de.hft.stuttgart.quality.model.properties.ValidationResultProperty;
+
+public class CityObjectProperties extends ADEOfAbstractCityObject {
+
+	private static final long serialVersionUID = 1273072314736964714L;
+
+	private ValidationResultProperty validationResult;
+
+	public ValidationResultProperty getValidationResult() {
+		return validationResult;
+	}
+
+	public void setValidationResult(ValidationResultProperty validationResult) {
+		this.validationResult = asChild(validationResult);
+	}
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/ConsecutivePointsSame.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ConsecutivePointsSameError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,43 +13,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-import org.citygml4j.builder.copy.CopyBuilder;
-import org.citygml4j.model.gml.geometry.primitives.DirectPosition;
+import org.xmlobjects.gml.model.geometry.DirectPosition;
+
+import de.hft.stuttgart.quality.model.walker.ValidationErrorVisitor;
+
+public class ConsecutivePointsSameError extends AbstractRingError {
+
+	private static final long serialVersionUID = 960107689338308020L;
 
-public class ConsecutivePointsSame extends RingError {
-	
-	private static final long serialVersionUID = -838421312521561747L;
-	
 	private DirectPosition vertex1;
 	private DirectPosition vertex2;
-	
-	public void setVertex1(DirectPosition vertex1) {
-		this.vertex1 = vertex1;
-	}
-	
-	public void setVertex2(DirectPosition vertex2) {
-		this.vertex2 = vertex2;
-	}
 
 	public DirectPosition getVertex1() {
 		return vertex1;
 	}
-	
+
+	public void setVertex1(DirectPosition vertex1) {
+		this.vertex1 = asChild(vertex1);
+	}
+
 	public DirectPosition getVertex2() {
 		return vertex2;
 	}
 
+	public void setVertex2(DirectPosition vertex2) {
+		this.vertex2 = asChild(vertex2);
+	}
+
 	@Override
-	public String toString() {
-		return "ConsecutivePointsSame [linearRingId=" + getLinearRingId() + ", vertex1=" + vertex1 + ", vertex2=" + vertex2
-				+ "]";
+	public void accept(ValidationErrorVisitor visitor) {
+		super.accept(visitor);
+		visitor.visit(this);
 	}
 
 	@Override
-	public Object copy(CopyBuilder copyBuilder) {
-		return copyTo(new ConsecutivePointsSame(), copyBuilder);
+	public String toString() {
+		return "ConsecutivePointsSameError [vertex1=" + vertex1 + ", vertex2=" + vertex2 + "]";
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/Edge.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,33 +13,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-import java.io.Serializable;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.GMLObject;
+import org.xmlobjects.gml.model.geometry.DirectPosition;
 
-import org.citygml4j.model.gml.geometry.primitives.DirectPosition;
+public class Edge extends GMLObject implements ADEObject {
+
+	private static final long serialVersionUID = 8021062845313752146L;
 
-public class Edge implements Serializable {
-	
-	private static final long serialVersionUID = -5076265818764666094L;
-	
 	private DirectPosition from;
 	private DirectPosition to;
-	
-	public void setFrom(DirectPosition from) {
-		this.from = from;
-	}
-	
-	public void setTo(DirectPosition to) {
-		this.to = to;
-	}
-	
+
 	public DirectPosition getFrom() {
 		return from;
 	}
-	
+
+	public void setFrom(DirectPosition from) {
+		this.from = asChild(from);
+	}
+
 	public DirectPosition getTo() {
 		return to;
 	}
 
+	public void setTo(DirectPosition to) {
+		this.to = asChild(to);
+	}
+
+	@Override
+	public String toString() {
+		return "Edge [from=" + from + ", to=" + to + "]";
+	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/NonManifoldEdge.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,32 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.citygml4j.builder.copy.CopyBuilder;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.GMLObject;
+import org.xmlobjects.model.ChildList;
 
-public class NonManifoldEdge extends SolidError {
+import de.hft.stuttgart.quality.model.properties.EdgeProperty;
 
-	private static final long serialVersionUID = -4312748985706248178L;
+public class EdgeList extends GMLObject implements ADEObject {
 
-	private List<Edge> edges;
+	private static final long serialVersionUID = 5900643456940461301L;
 
-	public boolean isSetEdges() {
-		return edges != null && !edges.isEmpty();
-	}
+	private List<EdgeProperty> edges;
 
-	public List<Edge> getEdges() {
+	public List<EdgeProperty> getEdges() {
 		if (edges == null) {
-			edges = new ArrayList<>();
+			edges = new ChildList<>(this);
 		}
 		return edges;
 	}
 
-	@Override
-	public Object copy(CopyBuilder copyBuilder) {
-		return copyTo(new NonPlanarNormalsDeviation(), copyBuilder);
+	public void setEdges(List<EdgeProperty> edges) {
+		this.edges = asChild(edges);
 	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ErrorStatistics.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,45 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import java.io.Serializable;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.GMLObject;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlValue;
+import de.hft.stuttgart.quality.model.enums.ErrorId;
 
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ErrorStatistics implements Serializable {
-	
-	private static final long serialVersionUID = -1007447539987946146L;
+public class Error extends GMLObject implements ADEObject {
 
-	@XmlAttribute
+	private static final long serialVersionUID = 2447962257841143458L;
+
+	private int occurrences;
 	private ErrorId name;
-	
-	@XmlValue
-	private int amount;
-	
-	public void setName(ErrorId name) {
-		this.name = name;
+
+	public int getOccurrences() {
+		return occurrences;
+	}
+
+	public void setOccurrences(int occurrences) {
+		this.occurrences = occurrences;
 	}
-	
+
 	public ErrorId getName() {
 		return name;
 	}
-	
-	public void setAmount(int amount) {
-		this.amount = amount;
-	}
-	
-	public int getAmount() {
-		return amount;
+
+	public void setName(ErrorId name) {
+		this.name = name;
 	}
 
 	@Override
 	public String toString() {
-		return "ErrorStatistics [name=" + name + ", amount=" + amount + "]";
+		return "Error [occurences=" + occurrences + ", name=" + name + "]";
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/FeatureStatistics.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,52 +13,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import java.io.Serializable;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.GMLObject;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlValue;
+public class FeatureStatistics extends GMLObject implements ADEObject {
 
-@XmlAccessorType(XmlAccessType.FIELD)
-public class FeatureStatistics implements Serializable {
+	private static final long serialVersionUID = 5835765260535725839L;
 
-	private static final long serialVersionUID = 5794335930507488398L;
-
-	@XmlAttribute
 	private int numChecked;
-	
-	@XmlValue
 	private int numErrors;
-	
+
 	public FeatureStatistics() {
+		// constructor for serialization
 	}
-	
+
 	public FeatureStatistics(int numChecked, int numErrors) {
 		this.numChecked = numChecked;
 		this.numErrors = numErrors;
 	}
 
-	public void setNumChecked(int numChecked) {
-		this.numChecked = numChecked;
-	}
-	
-	public void setNumErrors(int numErrors) {
-		this.numErrors = numErrors;
-	}
-	
 	public int getNumChecked() {
 		return numChecked;
 	}
-	
+
+	public void setNumChecked(int numChecked) {
+		this.numChecked = numChecked;
+	}
+
 	public int getNumErrors() {
 		return numErrors;
 	}
 
-	@Override
-	public String toString() {
-		return "FeatureStatistics [numChecked=" + numChecked + ", numErrors=" + numErrors + "]";
+	public void setNumErrors(int numErrors) {
+		this.numErrors = numErrors;
 	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/NonManifoldEdgeType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,31 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.GMLObject;
+import org.xmlobjects.model.ChildList;
 
-@XmlRootElement(name = "GE_S_NON_MANIFOLD_EDGE")
-public class NonManifoldEdgeType extends SolidErrorType {
+import de.hft.stuttgart.quality.model.properties.CheckingProperty;
 
-	@XmlElementWrapper
-	@XmlElement(name = "edge")
-	private List<EdgeType> edges;
+public class Filter extends GMLObject implements ADEObject {
 
-	public boolean isSetEdges() {
-		return edges != null && !edges.isEmpty();
-	}
+	private static final long serialVersionUID = 2766323821940477659L;
+
+	private List<CheckingProperty> checking;
 
-	public List<EdgeType> getEdges() {
-		if (edges == null) {
-			edges = new ArrayList<>();
+	public List<CheckingProperty> getChecking() {
+		if (checking == null) {
+			checking = new ChildList<>(this);
 		}
-		return edges;
+		return checking;
+	}
+
+	public void setChecking(List<CheckingProperty> checking) {
+		this.checking = asChild(checking);
 	}
 
 }