From 9b970421996973c7918653ea3a0de5a8463b6926 Mon Sep 17 00:00:00 2001 From: Matthias Betz Date: Thu, 31 Mar 2022 13:11:02 +0200 Subject: [PATCH] remove abstract from non abstract types --- .../properties/ValidationResultProperty.java | 43 ------------------- .../types/AllPolygonsOrientedWrongError.java | 2 +- .../quality/model/types/Checking.java | 2 +- .../quality/model/types/ComponentList.java | 2 +- .../types/ConsecutivePointsSameError.java | 2 +- .../stuttgart/quality/model/types/Edge.java | 2 +- .../quality/model/types/EdgeList.java | 2 +- .../stuttgart/quality/model/types/Error.java | 2 +- .../model/types/FeatureStatistics.java | 2 +- .../stuttgart/quality/model/types/Filter.java | 2 +- .../quality/model/types/GlobalParameters.java | 2 +- .../quality/model/types/HoleOutsideError.java | 2 +- .../model/types/InnerRingsNestedError.java | 2 +- .../types/InteriorDisconnectedError.java | 2 +- .../model/types/IntersectingRingsError.java | 2 +- .../model/types/MultipleComponentsError.java | 2 +- .../model/types/NonManifoldEdgeError.java | 2 +- .../model/types/NonManifoldVertexError.java | 2 +- .../types/OrientationRingsSameError.java | 2 +- .../quality/model/types/Parameter.java | 2 +- .../model/types/PlanarDistancePlaneError.java | 2 +- .../types/PlanarNormalsDeviationError.java | 2 +- .../quality/model/types/PolygonIdList.java | 2 +- .../types/PolygonWrongOrientationError.java | 2 +- .../quality/model/types/Requirement.java | 2 +- .../model/types/RingNotClosedError.java | 2 +- .../types/RingSelfIntersectionError.java | 2 +- .../model/types/RingTooFewPointsError.java | 2 +- .../types/SemanticAttributeMissingError.java | 2 +- .../SemanticAttributeWrongValueError.java | 2 +- .../model/types/SolidNotClosedError.java | 2 +- .../types/SolidSelfIntersectionError.java | 2 +- .../model/types/SolidTooFewPolygonsError.java | 2 +- .../quality/model/types/Statistics.java | 2 +- .../quality/model/types/Validation.java | 3 +- .../quality/model/types/ValidationPlan.java | 2 +- .../quality/model/types/ValidationResult.java | 2 +- .../model/types/ValidationResultProperty.java | 37 ++++++++++++++++ 38 files changed, 74 insertions(+), 79 deletions(-) delete mode 100644 citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationResultProperty.java create 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/ValidationResultProperty.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationResultProperty.java deleted file mode 100644 index c7e45d0..0000000 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/properties/ValidationResultProperty.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.ValidationResult; - -public class ValidationResultProperty extends AbstractInlineProperty implements ADEObject { - - @Serial - private static final long serialVersionUID = 765825311371672821L; - - public ValidationResultProperty() { - super(); - } - - public ValidationResultProperty(ValidationResult vr) { - super(vr); - } - - @Override - public Class getTargetType() { - return ValidationResult.class; - } - -} diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AllPolygonsOrientedWrongError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AllPolygonsOrientedWrongError.java index 68dba4f..f3634a1 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AllPolygonsOrientedWrongError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AllPolygonsOrientedWrongError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class AllPolygonsOrientedWrongError extends AbstractSolidError { +public class AllPolygonsOrientedWrongError extends AbstractSolidError { @Serial private static final long serialVersionUID = 4295306777217062184L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java index b8031f9..86191f0 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java @@ -21,7 +21,7 @@ import org.xmlobjects.gml.model.GMLObject; import de.hft.stuttgart.quality.model.enums.TopLevelFeatureType; -public abstract class Checking extends GMLObject { +public class Checking extends GMLObject { @Serial private static final long serialVersionUID = 8248598807454312291L; 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 6e05df8..6a4ab49 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 @@ -23,7 +23,7 @@ import org.xmlobjects.gml.model.GMLObject; import de.hft.stuttgart.quality.model.properties.PolygonIdListProperty; -public abstract class ComponentList extends GMLObject { +public class ComponentList extends GMLObject { @Serial private static final long serialVersionUID = 7846916128728837265L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ConsecutivePointsSameError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ConsecutivePointsSameError.java index 203ec2a..5621f9a 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ConsecutivePointsSameError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ConsecutivePointsSameError.java @@ -19,7 +19,7 @@ import java.io.Serial; import org.xmlobjects.gml.model.geometry.DirectPosition; -public abstract class ConsecutivePointsSameError extends AbstractRingError { +public class ConsecutivePointsSameError extends AbstractRingError { @Serial private static final long serialVersionUID = 960107689338308020L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java index a81ded6..7eec0e2 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Edge.java @@ -20,7 +20,7 @@ import java.io.Serial; import org.xmlobjects.gml.model.GMLObject; import org.xmlobjects.gml.model.geometry.DirectPosition; -public abstract class Edge extends GMLObject { +public class Edge extends GMLObject { @Serial private static final long serialVersionUID = 8021062845313752146L; 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 472ca77..1e953f7 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 @@ -23,7 +23,7 @@ import org.xmlobjects.gml.model.GMLObject; import de.hft.stuttgart.quality.model.properties.EdgeProperty; -public abstract class EdgeList extends GMLObject { +public class EdgeList extends GMLObject { @Serial private static final long serialVersionUID = 5900643456940461301L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java index 3f08fe8..2fa3e1d 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java @@ -21,7 +21,7 @@ import org.xmlobjects.gml.model.GMLObject; import de.hft.stuttgart.quality.model.enums.ErrorId; -public abstract class Error extends GMLObject { +public class Error extends GMLObject { @Serial private static final long serialVersionUID = 2447962257841143458L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java index 6355a18..ba3d5e1 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java @@ -19,7 +19,7 @@ import java.io.Serial; import org.xmlobjects.gml.model.GMLObject; -public abstract class FeatureStatistics extends GMLObject { +public class FeatureStatistics extends GMLObject { @Serial private static final long serialVersionUID = 5835765260535725839L; 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 7e9539b..145d66a 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 @@ -23,7 +23,7 @@ import org.xmlobjects.gml.model.GMLObject; import de.hft.stuttgart.quality.model.properties.CheckingProperty; -public abstract class Filter extends GMLObject { +public class Filter extends GMLObject { @Serial private static final long serialVersionUID = 2766323821940477659L; 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 95473f0..2823851 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 @@ -23,7 +23,7 @@ import org.xmlobjects.gml.model.GMLObject; import de.hft.stuttgart.quality.model.properties.ParameterProperty; -public abstract class GlobalParameters extends GMLObject { +public class GlobalParameters extends GMLObject { @Serial private static final long serialVersionUID = 5470016232480954926L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/HoleOutsideError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/HoleOutsideError.java index ce6080e..fafdb46 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/HoleOutsideError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/HoleOutsideError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class HoleOutsideError extends AbstractPolygonError { +public class HoleOutsideError extends AbstractPolygonError { @Serial private static final long serialVersionUID = 7823516103018988170L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InnerRingsNestedError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InnerRingsNestedError.java index aa34d17..e03aaba 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InnerRingsNestedError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InnerRingsNestedError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class InnerRingsNestedError extends AbstractPolygonError { +public class InnerRingsNestedError extends AbstractPolygonError { @Serial private static final long serialVersionUID = 6801491749796411678L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InteriorDisconnectedError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InteriorDisconnectedError.java index ebacc2b..b9f782e 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InteriorDisconnectedError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InteriorDisconnectedError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class InteriorDisconnectedError extends AbstractPolygonError { +public class InteriorDisconnectedError extends AbstractPolygonError { @Serial private static final long serialVersionUID = 8270468563578479182L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/IntersectingRingsError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/IntersectingRingsError.java index 4341c8e..02c1efe 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/IntersectingRingsError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/IntersectingRingsError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class IntersectingRingsError extends AbstractPolygonError { +public class IntersectingRingsError extends AbstractPolygonError { @Serial private static final long serialVersionUID = 4733342962974436966L; 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 fb6c0eb..a05fcd1 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 @@ -21,7 +21,7 @@ import java.util.List; import de.hft.stuttgart.quality.model.properties.ComponentListProperty; -public abstract class MultipleComponentsError extends AbstractSolidError { +public class MultipleComponentsError extends AbstractSolidError { @Serial private static final long serialVersionUID = 4322219502819024437L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldEdgeError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldEdgeError.java index 7d0ba0a..f38e008 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldEdgeError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldEdgeError.java @@ -19,7 +19,7 @@ import java.io.Serial; import de.hft.stuttgart.quality.model.properties.EdgeListProperty; -public abstract class NonManifoldEdgeError extends AbstractSolidError { +public class NonManifoldEdgeError extends AbstractSolidError { @Serial private static final long serialVersionUID = 3499800929524507025L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldVertexError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldVertexError.java index b7f33e0..1ca2485 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldVertexError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/NonManifoldVertexError.java @@ -19,7 +19,7 @@ import java.io.Serial; import org.xmlobjects.gml.model.geometry.DirectPosition; -public abstract class NonManifoldVertexError extends AbstractSolidError { +public class NonManifoldVertexError extends AbstractSolidError { @Serial private static final long serialVersionUID = 6428627491730618046L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/OrientationRingsSameError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/OrientationRingsSameError.java index b86a289..287ad7a 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/OrientationRingsSameError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/OrientationRingsSameError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class OrientationRingsSameError extends AbstractPolygonError { +public class OrientationRingsSameError extends AbstractPolygonError { @Serial private static final long serialVersionUID = 5732797947859046889L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Parameter.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Parameter.java index 3431064..7276d75 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Parameter.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Parameter.java @@ -19,7 +19,7 @@ import java.io.Serial; import org.xmlobjects.gml.model.GMLObject; -public abstract class Parameter extends GMLObject { +public class Parameter extends GMLObject { @Serial private static final long serialVersionUID = 3493525795867922745L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarDistancePlaneError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarDistancePlaneError.java index 58d20c8..3a02bea 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarDistancePlaneError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarDistancePlaneError.java @@ -20,7 +20,7 @@ import java.io.Serial; import org.xmlobjects.gml.model.geometry.DirectPosition; import org.xmlobjects.gml.model.measures.Length; -public abstract class PlanarDistancePlaneError extends AbstractPolygonError { +public class PlanarDistancePlaneError extends AbstractPolygonError { @Serial private static final long serialVersionUID = 9186823395923829178L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarNormalsDeviationError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarNormalsDeviationError.java index 058c52e..04f3f60 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarNormalsDeviationError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PlanarNormalsDeviationError.java @@ -19,7 +19,7 @@ import java.io.Serial; import org.xmlobjects.gml.model.measures.Angle; -public abstract class PlanarNormalsDeviationError extends AbstractPolygonError { +public class PlanarNormalsDeviationError extends AbstractPolygonError { @Serial private static final long serialVersionUID = 5914728363336771016L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonIdList.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonIdList.java index 2bf6f9d..5b541e2 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonIdList.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonIdList.java @@ -21,7 +21,7 @@ import java.util.List; import org.xmlobjects.gml.model.GMLObject; -public abstract class PolygonIdList extends GMLObject { +public class PolygonIdList extends GMLObject { @Serial private static final long serialVersionUID = 4396447239956257299L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonWrongOrientationError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonWrongOrientationError.java index efc3f9c..786914b 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonWrongOrientationError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/PolygonWrongOrientationError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class PolygonWrongOrientationError extends AbstractSolidError { +public class PolygonWrongOrientationError extends AbstractSolidError { @Serial private static final long serialVersionUID = 4975827693656963892L; 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 53767e6..a7ec84a 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 @@ -24,7 +24,7 @@ import org.xmlobjects.gml.model.GMLObject; import de.hft.stuttgart.quality.model.enums.RequirementId; import de.hft.stuttgart.quality.model.properties.ParameterProperty; -public abstract class Requirement extends GMLObject { +public class Requirement extends GMLObject { @Serial private static final long serialVersionUID = 4428291416242684642L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingNotClosedError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingNotClosedError.java index 76e1d24..faf44a2 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingNotClosedError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingNotClosedError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class RingNotClosedError extends AbstractRingError { +public class RingNotClosedError extends AbstractRingError { @Serial private static final long serialVersionUID = 3327214274004406000L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingSelfIntersectionError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingSelfIntersectionError.java index 6b92bd3..1444bc4 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingSelfIntersectionError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingSelfIntersectionError.java @@ -22,7 +22,7 @@ import org.xmlobjects.gml.model.geometry.DirectPosition; import de.hft.stuttgart.quality.model.enums.RingSelfIntType; import de.hft.stuttgart.quality.model.properties.EdgeProperty; -public abstract class RingSelfIntersectionError extends AbstractRingError { +public class RingSelfIntersectionError extends AbstractRingError { @Serial private static final long serialVersionUID = 9103800366580888883L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingTooFewPointsError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingTooFewPointsError.java index 0b8fa9c..c8866b7 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingTooFewPointsError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/RingTooFewPointsError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class RingTooFewPointsError extends AbstractRingError { +public class RingTooFewPointsError extends AbstractRingError { @Serial private static final long serialVersionUID = 8057350098649982235L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeMissingError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeMissingError.java index 11a14fa..45ddcdb 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeMissingError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeMissingError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class SemanticAttributeMissingError extends AbstractSemanticError { +public class SemanticAttributeMissingError extends AbstractSemanticError { @Serial private static final long serialVersionUID = 7157884749606290596L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeWrongValueError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeWrongValueError.java index 1695fb2..2564a49 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeWrongValueError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SemanticAttributeWrongValueError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class SemanticAttributeWrongValueError extends AbstractSemanticError { +public class SemanticAttributeWrongValueError extends AbstractSemanticError { @Serial private static final long serialVersionUID = 3478578364446339884L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidNotClosedError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidNotClosedError.java index 30ad8c9..c53192a 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidNotClosedError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidNotClosedError.java @@ -19,7 +19,7 @@ import java.io.Serial; import de.hft.stuttgart.quality.model.properties.EdgeListProperty; -public abstract class SolidNotClosedError extends AbstractSolidError { +public class SolidNotClosedError extends AbstractSolidError { @Serial private static final long serialVersionUID = 297029245173578437L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidSelfIntersectionError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidSelfIntersectionError.java index 01a8df0..2bbe224 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidSelfIntersectionError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidSelfIntersectionError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class SolidSelfIntersectionError extends AbstractSolidError { +public class SolidSelfIntersectionError extends AbstractSolidError { @Serial private static final long serialVersionUID = 5070991901664859830L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidTooFewPolygonsError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidTooFewPolygonsError.java index 3ac118c..f3deede 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidTooFewPolygonsError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/SolidTooFewPolygonsError.java @@ -17,7 +17,7 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; -public abstract class SolidTooFewPolygonsError extends AbstractSolidError { +public class SolidTooFewPolygonsError extends AbstractSolidError { @Serial private static final long serialVersionUID = 1987841643971824973L; 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 834900e..32f6c2a 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 @@ -24,7 +24,7 @@ import org.xmlobjects.gml.model.GMLObject; import de.hft.stuttgart.quality.model.properties.ErrorProperty; import de.hft.stuttgart.quality.model.properties.FeatureStatisticsProperty; -public abstract class Statistics extends GMLObject { +public class Statistics extends GMLObject { @Serial private static final long serialVersionUID = 2935590283116950203L; diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Validation.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Validation.java index b1338cf..4596926 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Validation.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Validation.java @@ -18,12 +18,13 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; import java.time.ZonedDateTime; +import org.citygml4j.core.model.ade.ADEObject; import org.citygml4j.core.model.core.AbstractFeature; import de.hft.stuttgart.quality.model.properties.StatisticsProperty; import de.hft.stuttgart.quality.model.properties.ValidationPlanProperty; -public abstract class Validation extends AbstractFeature { +public class Validation extends AbstractFeature implements ADEObject { @Serial private static final long serialVersionUID = 7821104529898548535L; 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 72225a9..135520f 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 @@ -25,7 +25,7 @@ import de.hft.stuttgart.quality.model.properties.FilterProperty; import de.hft.stuttgart.quality.model.properties.GlobalParametersProperty; import de.hft.stuttgart.quality.model.properties.RequirementProperty; -public abstract class ValidationPlan extends GMLObject { +public class ValidationPlan extends GMLObject { @Serial private static final long serialVersionUID = 434443226848485642L; 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 9b8eb6e..64feb7b 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 @@ -25,7 +25,7 @@ import org.xmlobjects.gml.model.base.Reference; import de.hft.stuttgart.quality.model.enums.ResultType; import de.hft.stuttgart.quality.model.properties.AbstractErrorProperty; -public abstract class ValidationResult extends GMLObject { +public class ValidationResult extends GMLObject { @Serial private static final long serialVersionUID = 4867627296196445082L; 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 new file mode 100644 index 0000000..a986363 --- /dev/null +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ValidationResultProperty.java @@ -0,0 +1,37 @@ +/*- + * 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 = result; + } + +} -- GitLab