From a349d45cf20c3880da9a1698514b7adeb6f9edd0 Mon Sep 17 00:00:00 2001 From: Matthias Betz <matthias.betz@hft-stuttgart.de> Date: Thu, 7 Apr 2022 10:18:02 +0200 Subject: [PATCH] removing unnecessary properties fix imports readded CityObjectProperties and removed ValidationResultProperty --- ...AllPolygonsOrientedWrongErrorProperty.java | 43 ------------------- .../ConsecutivePointsSameErrorProperty.java | 43 ------------------- .../properties/HoleOutsideErrorProperty.java | 43 ------------------- .../InnerRingsNestedErrorProperty.java | 43 ------------------- .../InteriorDisconnectedErrorProperty.java | 43 ------------------- .../IntersectingRingsErrorProperty.java | 43 ------------------- .../MultipleComponentsErrorProperty.java | 43 ------------------- .../NonManifoldEdgeErrorProperty.java | 43 ------------------- .../NonManifoldVertexErrorProperty.java | 43 ------------------- .../OrientationRingsSameErrorProperty.java | 43 ------------------- .../PlanarDistancePlaneErrorProperty.java | 43 ------------------- .../PlanarNormalsDeviationErrorProperty.java | 43 ------------------- .../PolygonWrongOrientationErrorProperty.java | 43 ------------------- .../RingNotClosedErrorProperty.java | 43 ------------------- .../RingSelfIntersectionErrorProperty.java | 43 ------------------- .../RingTooFewPointsErrorProperty.java | 43 ------------------- ...SemanticAttributeMissingErrorProperty.java | 43 ------------------- ...anticAttributeWrongValueErrorProperty.java | 43 ------------------- .../SolidNotClosedErrorProperty.java | 43 ------------------- .../SolidSelfIntersectionErrorProperty.java | 43 ------------------- .../SolidTooFewPolygonsErrorProperty.java | 43 ------------------- .../model/types/CityObjectProperties.java | 21 +++++++++ .../quality/model/types/ComponentList.java | 3 +- .../quality/model/types/EdgeList.java | 3 +- .../stuttgart/quality/model/types/Filter.java | 3 +- .../quality/model/types/GlobalParameters.java | 3 +- .../model/types/MultipleComponentsError.java | 4 +- .../quality/model/types/Requirement.java | 3 +- .../quality/model/types/Statistics.java | 3 +- .../quality/model/types/ValidationPlan.java | 3 +- .../quality/model/types/ValidationResult.java | 3 +- .../model/types/ValidationResultProperty.java | 37 ---------------- 32 files changed, 31 insertions(+), 958 deletions(-) delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AllPolygonsOrientedWrongErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ConsecutivePointsSameErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/HoleOutsideErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/InnerRingsNestedErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/InteriorDisconnectedErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/IntersectingRingsErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/MultipleComponentsErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/NonManifoldEdgeErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/NonManifoldVertexErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/OrientationRingsSameErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PlanarDistancePlaneErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PlanarNormalsDeviationErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PolygonWrongOrientationErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingNotClosedErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingSelfIntersectionErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingTooFewPointsErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SemanticAttributeMissingErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SemanticAttributeWrongValueErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidNotClosedErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidSelfIntersectionErrorProperty.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidTooFewPolygonsErrorProperty.java create mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/CityObjectProperties.java delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResultProperty.java diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AllPolygonsOrientedWrongErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AllPolygonsOrientedWrongErrorProperty.java deleted file mode 100644 index 19a004d..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/AllPolygonsOrientedWrongErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.AllPolygonsOrientedWrongError; - -public class AllPolygonsOrientedWrongErrorProperty extends AbstractInlineProperty<AllPolygonsOrientedWrongError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 441706560214349475L; - - public AllPolygonsOrientedWrongErrorProperty() { - super(); - } - - public AllPolygonsOrientedWrongErrorProperty(AllPolygonsOrientedWrongError apowe) { - super(apowe); - } - - @Override - public Class<AllPolygonsOrientedWrongError> getTargetType() { - return AllPolygonsOrientedWrongError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ConsecutivePointsSameErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ConsecutivePointsSameErrorProperty.java deleted file mode 100644 index 38a1bc4..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ConsecutivePointsSameErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.ConsecutivePointsSameError; - -public class ConsecutivePointsSameErrorProperty extends AbstractInlineProperty<ConsecutivePointsSameError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 3869036308848839709L; - - public ConsecutivePointsSameErrorProperty() { - super(); - } - - public ConsecutivePointsSameErrorProperty(ConsecutivePointsSameError cpse) { - super(cpse); - } - - @Override - public Class<ConsecutivePointsSameError> getTargetType() { - return ConsecutivePointsSameError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/HoleOutsideErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/HoleOutsideErrorProperty.java deleted file mode 100644 index 9a0a0b2..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/HoleOutsideErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.HoleOutsideError; - -public class HoleOutsideErrorProperty extends AbstractInlineProperty<HoleOutsideError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 4196743912365692331L; - - public HoleOutsideErrorProperty() { - super(); - } - - public HoleOutsideErrorProperty(HoleOutsideError gepholeoutside) { - super(gepholeoutside); - } - - @Override - public Class<HoleOutsideError> getTargetType() { - return HoleOutsideError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/InnerRingsNestedErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/InnerRingsNestedErrorProperty.java deleted file mode 100644 index 9957c83..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/InnerRingsNestedErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.InnerRingsNestedError; - -public class InnerRingsNestedErrorProperty extends AbstractInlineProperty<InnerRingsNestedError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 3036689276151551958L; - - public InnerRingsNestedErrorProperty() { - super(); - } - - public InnerRingsNestedErrorProperty(InnerRingsNestedError irne) { - super(irne); - } - - @Override - public Class<InnerRingsNestedError> getTargetType() { - return InnerRingsNestedError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/InteriorDisconnectedErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/InteriorDisconnectedErrorProperty.java deleted file mode 100644 index f50d443..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/InteriorDisconnectedErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.InteriorDisconnectedError; - -public class InteriorDisconnectedErrorProperty extends AbstractInlineProperty<InteriorDisconnectedError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 84761615612278576L; - - public InteriorDisconnectedErrorProperty() { - super(); - } - - public InteriorDisconnectedErrorProperty(InteriorDisconnectedError ide) { - super(ide); - } - - @Override - public Class<InteriorDisconnectedError> getTargetType() { - return InteriorDisconnectedError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/IntersectingRingsErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/IntersectingRingsErrorProperty.java deleted file mode 100644 index bc97fa0..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/IntersectingRingsErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.IntersectingRingsError; - -public class IntersectingRingsErrorProperty extends AbstractInlineProperty<IntersectingRingsError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 1608106125509503698L; - - public IntersectingRingsErrorProperty() { - super(); - } - - public IntersectingRingsErrorProperty(IntersectingRingsError ire) { - super(ire); - } - - @Override - public Class<IntersectingRingsError> getTargetType() { - return IntersectingRingsError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/MultipleComponentsErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/MultipleComponentsErrorProperty.java deleted file mode 100644 index 32e1820..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/MultipleComponentsErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.MultipleComponentsError; - -public class MultipleComponentsErrorProperty extends AbstractInlineProperty<MultipleComponentsError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 5294284044767336204L; - - public MultipleComponentsErrorProperty() { - super(); - } - - public MultipleComponentsErrorProperty(MultipleComponentsError mce) { - super(mce); - } - - @Override - public Class<MultipleComponentsError> getTargetType() { - return MultipleComponentsError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/NonManifoldEdgeErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/NonManifoldEdgeErrorProperty.java deleted file mode 100644 index c033d34..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/NonManifoldEdgeErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.NonManifoldEdgeError; - -public class NonManifoldEdgeErrorProperty extends AbstractInlineProperty<NonManifoldEdgeError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 8331219256576062664L; - - public NonManifoldEdgeErrorProperty() { - super(); - } - - public NonManifoldEdgeErrorProperty(NonManifoldEdgeError nmee) { - super(nmee); - } - - @Override - public Class<NonManifoldEdgeError> getTargetType() { - return NonManifoldEdgeError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/NonManifoldVertexErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/NonManifoldVertexErrorProperty.java deleted file mode 100644 index e650444..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/NonManifoldVertexErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.NonManifoldVertexError; - -public class NonManifoldVertexErrorProperty extends AbstractInlineProperty<NonManifoldVertexError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 3582401333822811835L; - - public NonManifoldVertexErrorProperty() { - super(); - } - - public NonManifoldVertexErrorProperty(NonManifoldVertexError nmve) { - super(nmve); - } - - @Override - public Class<NonManifoldVertexError> getTargetType() { - return NonManifoldVertexError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/OrientationRingsSameErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/OrientationRingsSameErrorProperty.java deleted file mode 100644 index 1a424b0..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/OrientationRingsSameErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.OrientationRingsSameError; - -public class OrientationRingsSameErrorProperty extends AbstractInlineProperty<OrientationRingsSameError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 7924476601392934115L; - - public OrientationRingsSameErrorProperty() { - super(); - } - - public OrientationRingsSameErrorProperty(OrientationRingsSameError orse) { - super(orse); - } - - @Override - public Class<OrientationRingsSameError> getTargetType() { - return OrientationRingsSameError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PlanarDistancePlaneErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PlanarDistancePlaneErrorProperty.java deleted file mode 100644 index e1932b8..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PlanarDistancePlaneErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.PlanarDistancePlaneError; - -public class PlanarDistancePlaneErrorProperty extends AbstractInlineProperty<PlanarDistancePlaneError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 805859214704441973L; - - public PlanarDistancePlaneErrorProperty() { - super(); - } - - public PlanarDistancePlaneErrorProperty(PlanarDistancePlaneError pdpe) { - super(pdpe); - } - - @Override - public Class<PlanarDistancePlaneError> getTargetType() { - return PlanarDistancePlaneError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PlanarNormalsDeviationErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PlanarNormalsDeviationErrorProperty.java deleted file mode 100644 index bb24833..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PlanarNormalsDeviationErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.PlanarNormalsDeviationError; - -public class PlanarNormalsDeviationErrorProperty extends AbstractInlineProperty<PlanarNormalsDeviationError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 2464000011383104477L; - - public PlanarNormalsDeviationErrorProperty() { - super(); - } - - public PlanarNormalsDeviationErrorProperty(PlanarNormalsDeviationError pnde) { - super(pnde); - } - - @Override - public Class<PlanarNormalsDeviationError> getTargetType() { - return PlanarNormalsDeviationError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PolygonWrongOrientationErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PolygonWrongOrientationErrorProperty.java deleted file mode 100644 index b915a46..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/PolygonWrongOrientationErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.PolygonWrongOrientationError; - -public class PolygonWrongOrientationErrorProperty extends AbstractInlineProperty<PolygonWrongOrientationError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 1919616461719834613L; - - public PolygonWrongOrientationErrorProperty() { - super(); - } - - public PolygonWrongOrientationErrorProperty(PolygonWrongOrientationError pwoe) { - super(pwoe); - } - - @Override - public Class<PolygonWrongOrientationError> getTargetType() { - return PolygonWrongOrientationError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingNotClosedErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingNotClosedErrorProperty.java deleted file mode 100644 index e12a96a..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingNotClosedErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.RingNotClosedError; - -public class RingNotClosedErrorProperty extends AbstractInlineProperty<RingNotClosedError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 4846831546489598508L; - - public RingNotClosedErrorProperty() { - super(); - } - - public RingNotClosedErrorProperty(RingNotClosedError rnce) { - super(rnce); - } - - @Override - public Class<RingNotClosedError> getTargetType() { - return RingNotClosedError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingSelfIntersectionErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingSelfIntersectionErrorProperty.java deleted file mode 100644 index 20eacca..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingSelfIntersectionErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.RingSelfIntersectionError; - -public class RingSelfIntersectionErrorProperty extends AbstractInlineProperty<RingSelfIntersectionError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 3588871792641629601L; - - public RingSelfIntersectionErrorProperty() { - super(); - } - - public RingSelfIntersectionErrorProperty(RingSelfIntersectionError rsie) { - super(rsie); - } - - @Override - public Class<RingSelfIntersectionError> getTargetType() { - return RingSelfIntersectionError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingTooFewPointsErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingTooFewPointsErrorProperty.java deleted file mode 100644 index b42eb98..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/RingTooFewPointsErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.RingTooFewPointsError; - -public class RingTooFewPointsErrorProperty extends AbstractInlineProperty<RingTooFewPointsError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 3447025584248177548L; - - public RingTooFewPointsErrorProperty() { - super(); - } - - public RingTooFewPointsErrorProperty(RingTooFewPointsError rtfpep) { - super(rtfpep); - } - - @Override - public Class<RingTooFewPointsError> getTargetType() { - return RingTooFewPointsError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SemanticAttributeMissingErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SemanticAttributeMissingErrorProperty.java deleted file mode 100644 index 6d917b5..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SemanticAttributeMissingErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.SemanticAttributeMissingError; - -public class SemanticAttributeMissingErrorProperty extends AbstractInlineProperty<SemanticAttributeMissingError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 5697199293825250908L; - - public SemanticAttributeMissingErrorProperty() { - super(); - } - - public SemanticAttributeMissingErrorProperty(SemanticAttributeMissingError same) { - super(same); - } - - @Override - public Class<SemanticAttributeMissingError> getTargetType() { - return SemanticAttributeMissingError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SemanticAttributeWrongValueErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SemanticAttributeWrongValueErrorProperty.java deleted file mode 100644 index 9a567d1..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SemanticAttributeWrongValueErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.SemanticAttributeWrongValueError; - -public class SemanticAttributeWrongValueErrorProperty extends AbstractInlineProperty<SemanticAttributeWrongValueError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 7617151896616913019L; - - public SemanticAttributeWrongValueErrorProperty() { - super(); - } - - public SemanticAttributeWrongValueErrorProperty(SemanticAttributeWrongValueError sawve) { - super(sawve); - } - - @Override - public Class<SemanticAttributeWrongValueError> getTargetType() { - return SemanticAttributeWrongValueError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidNotClosedErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidNotClosedErrorProperty.java deleted file mode 100644 index 23a72de..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidNotClosedErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.SolidNotClosedError; - -public class SolidNotClosedErrorProperty extends AbstractInlineProperty<SolidNotClosedError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 1268531869052860508L; - - public SolidNotClosedErrorProperty() { - super(); - } - - public SolidNotClosedErrorProperty(SolidNotClosedError snce) { - super(snce); - } - - @Override - public Class<SolidNotClosedError> getTargetType() { - return SolidNotClosedError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidSelfIntersectionErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidSelfIntersectionErrorProperty.java deleted file mode 100644 index 5199803..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidSelfIntersectionErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.SolidSelfIntersectionError; - -public class SolidSelfIntersectionErrorProperty extends AbstractInlineProperty<SolidSelfIntersectionError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 6578584720594833303L; - - public SolidSelfIntersectionErrorProperty() { - super(); - } - - public SolidSelfIntersectionErrorProperty(SolidSelfIntersectionError ssie) { - super(ssie); - } - - @Override - public Class<SolidSelfIntersectionError> getTargetType() { - return SolidSelfIntersectionError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidTooFewPolygonsErrorProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidTooFewPolygonsErrorProperty.java deleted file mode 100644 index 56f7e1f..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/SolidTooFewPolygonsErrorProperty.java +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.ade.ADEObject; -import org.xmlobjects.gml.model.base.AbstractInlineProperty; - -import de.hft.stuttgart.quality.model.types.SolidTooFewPolygonsError; - -public class SolidTooFewPolygonsErrorProperty extends AbstractInlineProperty<SolidTooFewPolygonsError> implements ADEObject { - - @Serial - private static final long serialVersionUID = 998050793852068510L; - - public SolidTooFewPolygonsErrorProperty() { - super(); - } - - public SolidTooFewPolygonsErrorProperty(SolidTooFewPolygonsError stfpe) { - super(stfpe); - } - - @Override - public Class<SolidTooFewPolygonsError> getTargetType() { - return SolidTooFewPolygonsError.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/CityObjectProperties.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/CityObjectProperties.java new file mode 100644 index 0000000..e9c058d --- /dev/null +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/CityObjectProperties.java @@ -0,0 +1,21 @@ +package de.hft.stuttgart.quality.model.types; + +import java.io.Serial; + +import org.citygml4j.core.model.core.ADEOfAbstractCityObject; + +public class CityObjectProperties extends ADEOfAbstractCityObject { + + @Serial + private static final long serialVersionUID = 1273072314736964714L; + + private ValidationResult validationResult; + + public ValidationResult getValidationResult() { + return validationResult; + } + + public void setValidationResult(ValidationResult validationResult) { + this.validationResult = asChild(validationResult); + } +} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ComponentList.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ComponentList.java index 24b625a..6ad6181 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ComponentList.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ComponentList.java @@ -16,14 +16,13 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -import java.util.ArrayList; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; +import org.xmlobjects.model.ChildList; import de.hft.stuttgart.quality.model.properties.PolygonIdListProperty; -import org.xmlobjects.model.ChildList; public class ComponentList extends GMLObject implements ADEObject { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java index ba5e431..a67004a 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java @@ -16,14 +16,13 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -import java.util.ArrayList; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; +import org.xmlobjects.model.ChildList; import de.hft.stuttgart.quality.model.properties.EdgeProperty; -import org.xmlobjects.model.ChildList; public class EdgeList extends GMLObject implements ADEObject { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java index 4b65fcf..d0b8249 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java @@ -16,14 +16,13 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -import java.util.ArrayList; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; +import org.xmlobjects.model.ChildList; import de.hft.stuttgart.quality.model.properties.CheckingProperty; -import org.xmlobjects.model.ChildList; public class Filter extends GMLObject implements ADEObject { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java index 75b5997..8b53d77 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java @@ -16,14 +16,13 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -import java.util.ArrayList; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; +import org.xmlobjects.model.ChildList; import de.hft.stuttgart.quality.model.properties.ParameterProperty; -import org.xmlobjects.model.ChildList; public class GlobalParameters extends GMLObject implements ADEObject { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/MultipleComponentsError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/MultipleComponentsError.java index 718b73e..02eb853 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/MultipleComponentsError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/MultipleComponentsError.java @@ -16,12 +16,12 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -import java.util.ArrayList; import java.util.List; -import de.hft.stuttgart.quality.model.properties.ComponentListProperty; import org.xmlobjects.model.ChildList; +import de.hft.stuttgart.quality.model.properties.ComponentListProperty; + public class MultipleComponentsError extends AbstractSolidError { @Serial diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Requirement.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Requirement.java index a59593b..4dad3b5 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Requirement.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Requirement.java @@ -16,15 +16,14 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -import java.util.ArrayList; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; +import org.xmlobjects.model.ChildList; import de.hft.stuttgart.quality.model.enums.RequirementId; import de.hft.stuttgart.quality.model.properties.ParameterProperty; -import org.xmlobjects.model.ChildList; public class Requirement extends GMLObject implements ADEObject { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Statistics.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Statistics.java index a33051e..9034217 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Statistics.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Statistics.java @@ -16,15 +16,14 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -import java.util.ArrayList; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; +import org.xmlobjects.model.ChildList; import de.hft.stuttgart.quality.model.properties.ErrorProperty; import de.hft.stuttgart.quality.model.properties.FeatureStatisticsProperty; -import org.xmlobjects.model.ChildList; public class Statistics extends GMLObject implements ADEObject { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationPlan.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationPlan.java index ee8461b..32af5a4 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationPlan.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationPlan.java @@ -16,16 +16,15 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -import java.util.ArrayList; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; +import org.xmlobjects.model.ChildList; import de.hft.stuttgart.quality.model.properties.FilterProperty; import de.hft.stuttgart.quality.model.properties.GlobalParametersProperty; import de.hft.stuttgart.quality.model.properties.RequirementProperty; -import org.xmlobjects.model.ChildList; public class ValidationPlan extends GMLObject implements ADEObject { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResult.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResult.java index 4020323..308ddb2 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResult.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResult.java @@ -16,16 +16,15 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -import java.util.ArrayList; import java.util.List; import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; import org.xmlobjects.gml.model.base.Reference; +import org.xmlobjects.model.ChildList; import de.hft.stuttgart.quality.model.enums.ResultType; import de.hft.stuttgart.quality.model.properties.AbstractErrorProperty; -import org.xmlobjects.model.ChildList; public class ValidationResult extends GMLObject implements ADEObject { diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResultProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResultProperty.java deleted file mode 100644 index 287c190..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResultProperty.java +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * 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 java.io.Serial; - -import org.citygml4j.core.model.core.ADEOfAbstractCityObject; - -public class ValidationResultProperty extends ADEOfAbstractCityObject { - - @Serial - private static final long serialVersionUID = 765825311371672821L; - - private ValidationResult result; - - public ValidationResult getResult() { - return result; - } - - public void setResult(ValidationResult result) { - this.result = asChild(result); - } - -} -- GitLab