Merge branch 'citygml3' into fix-model

# Conflicts:
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ComponentList.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Parameter.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonIdList.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Requirement.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Statistics.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationPlan.java
#	citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResult.java

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

-package de.hft.stuttgart.quality.model.types;
-
-import de.hft.stuttgart.quality.model.properties.ValidationResultProperty;
-import org.citygml4j.core.model.core.ADEOfAbstractCityObject;
-
-import java.io.Serial;
-
-public class CityObjectProperties extends ADEOfAbstractCityObject {
-
-    @Serial
-    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/properties/ValidationResultProperty.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResultProperty.java

@@ -13,31 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.properties;
+package de.hft.stuttgart.quality.model.types;
 
 import java.io.Serial;
 
-import org.citygml4j.core.model.ade.ADEObject;
-import org.xmlobjects.gml.model.base.AbstractInlineProperty;
+import org.citygml4j.core.model.core.ADEOfAbstractCityObject;
 
-import de.hft.stuttgart.quality.model.types.ValidationResult;
+public class ValidationResultProperty extends ADEOfAbstractCityObject {
 
-public class ValidationResultProperty extends AbstractInlineProperty<ValidationResult> implements ADEObject {
+	@Serial
+	private static final long serialVersionUID = 765825311371672821L;
 
-    @Serial
-    private static final long serialVersionUID = 765825311371672821L;
+	private ValidationResult result;
 
-    public ValidationResultProperty() {
-        super();
-    }
+	public ValidationResult getResult() {
+		return result;
+	}
 
-    public ValidationResultProperty(ValidationResult vr) {
-        super(vr);
-    }
-
-    @Override
-    public Class<ValidationResult> getTargetType() {
-        return ValidationResult.class;
-    }
+	public void setResult(ValidationResult result) {
+		this.result = asChild(result);
+	}
 
 }