Merge branch 'citygml3'

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/SolidErrorType.java

-/*-
- * Copyright 2020 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.jaxb;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-@XmlSeeAlso({ SolidNotClosedType.class, AllPolygonsWrongOrientationType.class, PolygonWrongOrientationType.class,
-		NonManifoldVertexType.class, NonManifoldEdgeType.class, TooFewPolygonsType.class,
-		MultipleConnectedComponentsType.class, SolidSelfIntersectionType.class })
-@XmlRootElement(name = "SolidError")
-public class SolidErrorType extends ValidationErrorType {
-
-	private String geometryId;
-
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-
-	public String getGeometryId() {
-		return geometryId;
-	}
-
-}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/Statistics.java

-/*-
- * Copyright 2020 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.jaxb;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class Statistics implements Serializable {
-
-	private static final long serialVersionUID = 2250094686994310986L;
-
-	private FeatureStatistics numErrorBuildings;
-	private FeatureStatistics numErrorVegetation;
-	private FeatureStatistics numErrorLandObjects;
-	private FeatureStatistics numErrorBridgeObjects;
-	private FeatureStatistics numErrorWaterObjects;
-	private FeatureStatistics numErrorTransportation;
-
-	@XmlElementWrapper(name = "errorStatistics")
-	@XmlElement(name = "error")
-	private List<ErrorStatistics> errorStatistics;
-
-	public List<ErrorStatistics> getErrorStatistics() {
-		if (errorStatistics == null) {
-			errorStatistics = new ArrayList<>();
-		}
-		return errorStatistics;
-	}
-
-	public FeatureStatistics getNumErrorBridgeObjects() {
-		return numErrorBridgeObjects;
-	}
-
-	public FeatureStatistics getNumErrorBuildings() {
-		return numErrorBuildings;
-	}
-
-	public FeatureStatistics getNumErrorLandObjects() {
-		return numErrorLandObjects;
-	}
-
-	public FeatureStatistics getNumErrorTransportation() {
-		return numErrorTransportation;
-	}
-
-	public FeatureStatistics getNumErrorVegetation() {
-		return numErrorVegetation;
-	}
-
-	public FeatureStatistics getNumErrorWaterObjects() {
-		return numErrorWaterObjects;
-	}
-
-	public void setNumErrorBridgeObjects(FeatureStatistics numErrorBridgeObjects) {
-		this.numErrorBridgeObjects = numErrorBridgeObjects;
-	}
-
-	public void setNumErrorBuildings(FeatureStatistics numErrorBuildings) {
-		this.numErrorBuildings = numErrorBuildings;
-	}
-
-	public void setNumErrorLandObjects(FeatureStatistics numErrorLandObjects) {
-		this.numErrorLandObjects = numErrorLandObjects;
-	}
-
-	public void setNumErrorTransportation(FeatureStatistics numErrorTransportation) {
-		this.numErrorTransportation = numErrorTransportation;
-	}
-
-	public void setNumErrorVegetation(FeatureStatistics numErrorVegetation) {
-		this.numErrorVegetation = numErrorVegetation;
-	}
-
-	public void setNumErrorWaterObjects(FeatureStatistics numErrorWaterObjects) {
-		this.numErrorWaterObjects = numErrorWaterObjects;
-	}
-
-}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/TooFewPolygonsType.java

-/*-
- * Copyright 2020 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.jaxb;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "GE_S_TOO_FEW_POLYGONS")
-public class TooFewPolygonsType extends SolidErrorType {
-	
-}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationErrorType.java

-/*-
- * Copyright 2020 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.jaxb;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlTransient;
-
-@XmlSeeAlso({ RingErrorType.class, PolygonErrorType.class, SolidErrorType.class, SemanticErrorType.class })
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "ValidationError")
-public abstract class ValidationErrorType {
-	
-	@XmlTransient
-	private String name;
-	
-	protected ValidationErrorType() {
-		name = getClass().getAnnotation(XmlRootElement.class).name();
-	}
-	
-	public String getName() {
-		return name;
-	}
-
-}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/package-info.java

-/*-
- * Copyright 2020 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.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.3", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = {
-		@javax.xml.bind.annotation.XmlNs(namespaceURI = "https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.3", prefix = "qual") })
-package de.hft.stuttgart.quality.model.jaxb;

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractErrorProperty.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.AbstractError;
+
+public class AbstractErrorProperty extends AbstractInlineProperty<AbstractError> implements ADEObject {
+
+	private static final long serialVersionUID = 1411862623125946009L;
+
+	public AbstractErrorProperty() {
+		super();
+	}
+
+	public AbstractErrorProperty(AbstractError ae) {
+		super(ae);
+	}
+
+	@Override
+	public Class<AbstractError> getTargetType() {
+		return AbstractError.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractGeometryErrorProperty.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.AbstractGeometryError;
+
+public class AbstractGeometryErrorProperty extends AbstractInlineProperty<AbstractGeometryError> implements ADEObject {
+
+	private static final long serialVersionUID = 7034671234592671680L;
+
+	public AbstractGeometryErrorProperty() {
+		super();
+	}
+
+	public AbstractGeometryErrorProperty(AbstractGeometryError age) {
+		super(age);
+	}
+
+	@Override
+	public Class<AbstractGeometryError> getTargetType() {
+		return AbstractGeometryError.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/NonPlanarDistancePlaneType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractPolygonErrorProperty.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,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;
 
-import net.opengis.gml.DirectPositionType;
-import net.opengis.gml.LengthType;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.base.AbstractInlineProperty;
 
-@XmlRootElement(name = "GE_P_NON_PLANAR_POLYGON_DISTANCE_PLANE")
-public class NonPlanarDistancePlaneType extends PolygonErrorType {
+import de.hft.stuttgart.quality.model.types.AbstractPolygonError;
 
-	private DirectPositionType vertex;
-	private LengthType distance;
+public class AbstractPolygonErrorProperty extends AbstractInlineProperty<AbstractPolygonError> implements ADEObject {
 
-	public void setVertex(DirectPositionType vertex) {
-		this.vertex = vertex;
-	}
+    private static final long serialVersionUID = 70692012962059529L;
 
-	public void setDistance(LengthType distance) {
-		this.distance = distance;
-	}
+    public AbstractPolygonErrorProperty() {
+        super();
+    }
 
-	public DirectPositionType getVertex() {
-		return vertex;
-	}
+    public AbstractPolygonErrorProperty(AbstractPolygonError ape) {
+        super(ape);
+    }
 
-	public LengthType getDistance() {
-		return distance;
-	}
+    @Override
+    public Class<AbstractPolygonError> getTargetType() {
+        return AbstractPolygonError.class;
+    }
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractRingErrorProperty.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.AbstractRingError;
+
+public class AbstractRingErrorProperty extends AbstractInlineProperty<AbstractRingError> implements ADEObject {
+
+	private static final long serialVersionUID = 6934180997181643185L;
+
+	public AbstractRingErrorProperty() {
+		super();
+	}
+
+	public AbstractRingErrorProperty(AbstractRingError are) {
+		super(are);
+	}
+
+	@Override
+	public Class<AbstractRingError> getTargetType() {
+		return AbstractRingError.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractSemanticErrorProperty.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.AbstractSemanticError;
+
+public class AbstractSemanticErrorProperty extends AbstractInlineProperty<AbstractSemanticError> implements ADEObject {
+
+	private static final long serialVersionUID = 8488922114751949334L;
+
+	public AbstractSemanticErrorProperty() {
+		super();
+	}
+
+	public AbstractSemanticErrorProperty(AbstractSemanticError ase) {
+		super(ase);
+	}
+
+	@Override
+	public Class<AbstractSemanticError> getTargetType() {
+		return AbstractSemanticError.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AbstractSolidErrorProperty.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.AbstractSolidError;
+
+public class AbstractSolidErrorProperty extends AbstractInlineProperty<AbstractSolidError> implements ADEObject {
+
+	private static final long serialVersionUID = 4191279461525842687L;
+
+	public AbstractSolidErrorProperty() {
+		super();
+	}
+
+	public AbstractSolidErrorProperty(AbstractSolidError ase) {
+		super(ase);
+	}
+
+	@Override
+	public Class<AbstractSolidError> getTargetType() {
+		return AbstractSolidError.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/CheckingProperty.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.Checking;
+
+public class CheckingProperty extends AbstractInlineProperty<Checking> implements ADEObject {
+
+	private static final long serialVersionUID = 2275964563754871682L;
+
+	public CheckingProperty() {
+		super();
+	}
+
+	public CheckingProperty(Checking c) {
+		super(c);
+	}
+
+	@Override
+	public Class<Checking> getTargetType() {
+		return Checking.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/EdgeListProperty.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.EdgeList;
+
+public class EdgeListProperty extends AbstractInlineProperty<EdgeList> implements ADEObject {
+
+	private static final long serialVersionUID = 2336457353379630637L;
+
+	public EdgeListProperty() {
+		super();
+	}
+
+	public EdgeListProperty(EdgeList el) {
+		super(el);
+	}
+
+	@Override
+	public Class<EdgeList> getTargetType() {
+		return EdgeList.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/util/UncheckedMissingADESchemaException.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/EdgeProperty.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,24 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.util;
+package de.hft.stuttgart.quality.model.properties;
 
-import org.citygml4j.xml.io.reader.MissingADESchemaException;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.base.AbstractInlineProperty;
 
-public class UncheckedMissingADESchemaException extends RuntimeException {
-	
-	private static final long serialVersionUID = -5684499826072882203L;
-	
-	private MissingADESchemaException cause;
+import de.hft.stuttgart.quality.model.types.Edge;
 
-	public UncheckedMissingADESchemaException(MissingADESchemaException e) {
+public class EdgeProperty extends AbstractInlineProperty<Edge> implements ADEObject {
+
+	private static final long serialVersionUID = 3087019382945722678L;
+
+	public EdgeProperty() {
+		super();
+	}
+
+	public EdgeProperty(Edge e) {
 		super(e);
-		this.cause = e;
 	}
-	
+
 	@Override
-	public synchronized MissingADESchemaException getCause() {
-		return cause;
+	public Class<Edge> getTargetType() {
+		return Edge.class;
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ErrorProperty.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.Error;
+
+public class ErrorProperty extends AbstractInlineProperty<Error> implements ADEObject {
+
+	private static final long serialVersionUID = 1405693040162674820L;
+
+	public ErrorProperty() {
+		super();
+	}
+
+	public ErrorProperty(Error e) {
+		super(e);
+	}
+
+	@Override
+	public Class<Error> getTargetType() {
+		return Error.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/SolidNotClosed.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/FeatureStatisticsProperty.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;
+package de.hft.stuttgart.quality.model.properties;
 
-import java.util.ArrayList;
-import java.util.List;
+import org.citygml4j.core.model.ade.ADEObject;
+import org.xmlobjects.gml.model.base.AbstractInlineProperty;
 
-import org.citygml4j.builder.copy.CopyBuilder;
+import de.hft.stuttgart.quality.model.types.FeatureStatistics;
 
-public class SolidNotClosed extends SolidError {
+public class FeatureStatisticsProperty extends AbstractInlineProperty<FeatureStatistics> implements ADEObject {
 
-	private static final long serialVersionUID = 4609395125395073697L;
+	private static final long serialVersionUID = 4725452691563906950L;
 
-	private List<Edge> edges;
-
-	public boolean isSetEdges() {
-		return edges != null && !edges.isEmpty();
+	public FeatureStatisticsProperty() {
+		super();
 	}
 
-	public List<Edge> getEdges() {
-		if (edges == null) {
-			edges = new ArrayList<>();
-		}
-		return edges;
+	public FeatureStatisticsProperty(FeatureStatistics fs) {
+		super(fs);
 	}
 
 	@Override
-	public Object copy(CopyBuilder copyBuilder) {
-		return copyTo(new SolidNotClosed(), copyBuilder);
+	public Class<FeatureStatistics> getTargetType() {
+		return FeatureStatistics.class;
 	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/FilterProperty.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.Filter;
+
+public class FilterProperty extends AbstractInlineProperty<Filter> implements ADEObject {
+
+	private static final long serialVersionUID = 2202767186145199981L;
+
+	public FilterProperty() {
+		super();
+	}
+
+	public FilterProperty(Filter f) {
+		super(f);
+	}
+
+	@Override
+	public Class<Filter> getTargetType() {
+		return Filter.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/GlobalParametersProperty.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.GlobalParameters;
+
+public class GlobalParametersProperty extends AbstractInlineProperty<GlobalParameters> implements ADEObject {
+
+	private static final long serialVersionUID = 4688667898762529244L;
+
+	public GlobalParametersProperty() {
+		super();
+	}
+
+	public GlobalParametersProperty(GlobalParameters gp) {
+		super(gp);
+	}
+
+	@Override
+	public Class<GlobalParameters> getTargetType() {
+		return GlobalParameters.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ParameterProperty.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.Parameter;
+
+public class ParameterProperty extends AbstractInlineProperty<Parameter> implements ADEObject {
+
+	private static final long serialVersionUID = 3826499653407209573L;
+
+	public ParameterProperty() {
+		super();
+	}
+
+	public ParameterProperty(Parameter p) {
+		super(p);
+	}
+
+	@Override
+	public Class<Parameter> getTargetType() {
+		return Parameter.class;
+	}
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PolygonIdListProperty.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.PolygonIdList;
+
+public class PolygonIdListProperty extends AbstractInlineProperty<PolygonIdList> implements ADEObject {
+
+	private static final long serialVersionUID = 8212792040324739831L;
+
+	public PolygonIdListProperty() {
+		super();
+	}
+
+	public PolygonIdListProperty(PolygonIdList pil) {
+		super(pil);
+	}
+
+	@Override
+	public Class<PolygonIdList> getTargetType() {
+		return PolygonIdList.class;
+	}
+
+}