From d323a750c172b5b26636dfaccc96da1f1d71abd1 Mon Sep 17 00:00:00 2001 From: Claus Nagel Date: Mon, 4 Apr 2022 07:54:07 +0200 Subject: [PATCH] added ADEObject interface --- .../de/hft/stuttgart/quality/model/types/AbstractError.java | 3 ++- .../java/de/hft/stuttgart/quality/model/types/Checking.java | 3 ++- .../de/hft/stuttgart/quality/model/types/ComponentList.java | 3 ++- .../main/java/de/hft/stuttgart/quality/model/types/Edge.java | 3 ++- .../java/de/hft/stuttgart/quality/model/types/EdgeList.java | 3 ++- .../main/java/de/hft/stuttgart/quality/model/types/Error.java | 3 ++- .../hft/stuttgart/quality/model/types/FeatureStatistics.java | 3 ++- .../main/java/de/hft/stuttgart/quality/model/types/Filter.java | 3 ++- .../de/hft/stuttgart/quality/model/types/GlobalParameters.java | 3 ++- .../java/de/hft/stuttgart/quality/model/types/Parameter.java | 3 ++- .../de/hft/stuttgart/quality/model/types/PolygonIdList.java | 3 ++- .../java/de/hft/stuttgart/quality/model/types/Requirement.java | 3 ++- .../java/de/hft/stuttgart/quality/model/types/Statistics.java | 3 ++- .../de/hft/stuttgart/quality/model/types/ValidationPlan.java | 3 ++- .../de/hft/stuttgart/quality/model/types/ValidationResult.java | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractError.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractError.java index 520b6a9..8d06b53 100644 --- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractError.java +++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractError.java @@ -17,9 +17,10 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; +import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; -public abstract class AbstractError extends GMLObject { +public abstract class AbstractError extends GMLObject implements ADEObject { @Serial private static final long serialVersionUID = 4456303926951620441L; 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 86191f0..60b178d 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 @@ -17,11 +17,12 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; +import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; import de.hft.stuttgart.quality.model.enums.TopLevelFeatureType; -public class Checking extends GMLObject { +public class Checking extends GMLObject implements ADEObject { @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 6a4ab49..d2807a2 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 @@ -19,11 +19,12 @@ 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 de.hft.stuttgart.quality.model.properties.PolygonIdListProperty; -public class ComponentList extends GMLObject { +public class ComponentList extends GMLObject implements ADEObject { @Serial private static final long serialVersionUID = 7846916128728837265L; 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 7eec0e2..05dd3e6 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 @@ -17,10 +17,11 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; +import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; import org.xmlobjects.gml.model.geometry.DirectPosition; -public class Edge extends GMLObject { +public class Edge extends GMLObject implements ADEObject { @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 1e953f7..8257fe3 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 @@ -19,11 +19,12 @@ 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 de.hft.stuttgart.quality.model.properties.EdgeProperty; -public class EdgeList extends GMLObject { +public class EdgeList extends GMLObject implements ADEObject { @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 2fa3e1d..0444f3b 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 @@ -17,11 +17,12 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; +import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; import de.hft.stuttgart.quality.model.enums.ErrorId; -public class Error extends GMLObject { +public class Error extends GMLObject implements ADEObject { @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 ba3d5e1..125a10c 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 @@ -17,9 +17,10 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; +import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; -public class FeatureStatistics extends GMLObject { +public class FeatureStatistics extends GMLObject implements ADEObject { @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 145d66a..98eee08 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 @@ -19,11 +19,12 @@ 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 de.hft.stuttgart.quality.model.properties.CheckingProperty; -public class Filter extends GMLObject { +public class Filter extends GMLObject implements ADEObject { @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 2823851..6f92463 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 @@ -19,11 +19,12 @@ 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 de.hft.stuttgart.quality.model.properties.ParameterProperty; -public class GlobalParameters extends GMLObject { +public class GlobalParameters extends GMLObject implements ADEObject { @Serial private static final long serialVersionUID = 5470016232480954926L; 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 7276d75..16e0a2f 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 @@ -17,9 +17,10 @@ package de.hft.stuttgart.quality.model.types; import java.io.Serial; +import org.citygml4j.core.model.ade.ADEObject; import org.xmlobjects.gml.model.GMLObject; -public class Parameter extends GMLObject { +public class Parameter extends GMLObject implements ADEObject { @Serial private static final long serialVersionUID = 3493525795867922745L; 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 5b541e2..58f00bb 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 @@ -19,9 +19,10 @@ 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; -public class PolygonIdList extends GMLObject { +public class PolygonIdList extends GMLObject implements ADEObject { @Serial private static final long serialVersionUID = 4396447239956257299L; 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 a7ec84a..9fb5f80 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 @@ -19,12 +19,13 @@ 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 de.hft.stuttgart.quality.model.enums.RequirementId; import de.hft.stuttgart.quality.model.properties.ParameterProperty; -public class Requirement extends GMLObject { +public class Requirement extends GMLObject implements ADEObject { @Serial private static final long serialVersionUID = 4428291416242684642L; 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 32f6c2a..798f752 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 @@ -19,12 +19,13 @@ 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 de.hft.stuttgart.quality.model.properties.ErrorProperty; import de.hft.stuttgart.quality.model.properties.FeatureStatisticsProperty; -public class Statistics extends GMLObject { +public class Statistics extends GMLObject implements ADEObject { @Serial private static final long serialVersionUID = 2935590283116950203L; 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 135520f..62b8ab9 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 @@ -19,13 +19,14 @@ 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 de.hft.stuttgart.quality.model.properties.FilterProperty; import de.hft.stuttgart.quality.model.properties.GlobalParametersProperty; import de.hft.stuttgart.quality.model.properties.RequirementProperty; -public class ValidationPlan extends GMLObject { +public class ValidationPlan extends GMLObject implements ADEObject { @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 64feb7b..c91fa39 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 @@ -19,13 +19,14 @@ 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 de.hft.stuttgart.quality.model.enums.ResultType; import de.hft.stuttgart.quality.model.properties.AbstractErrorProperty; -public class ValidationResult extends GMLObject { +public class ValidationResult extends GMLObject implements ADEObject { @Serial private static final long serialVersionUID = 4867627296196445082L; -- GitLab