update model for citygml4j 3 and quality ade 1.4.0

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

+/*-
+ * Copyright 2022 Hochschule für Technik Stuttgart
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.hft.stuttgart.quality.model.types;
+
+import java.io.Serial;
+
+import org.xmlobjects.gml.model.GMLObject;
+
+public abstract class AbstractError extends GMLObject {
+
+    @Serial
+    private static final long serialVersionUID = 4456303926951620441L;
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/InteriorDisconnectedType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractGeometryError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serial;
 
-@XmlRootElement(name = "GE_P_INTERIOR_DISCONNECTED")
-public class InteriorDisconnectedType extends PolygonErrorType {
+public abstract class AbstractGeometryError extends AbstractError {
+
+    @Serial
+    private static final long serialVersionUID = 5584980708521134866L;
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/PolygonError.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractPolygonError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-public abstract class PolygonError extends ValidationError {
+import java.io.Serial;
 
-	private static final long serialVersionUID = 4694297467768369526L;
-	
+public abstract class AbstractPolygonError extends AbstractGeometryError {
+
+    @Serial
+    private static final long serialVersionUID = 8765755615504522764L;
+    
 	private String polygonId;
 
+	public String getPolygonId() {
+		return polygonId;
+	}
+
 	public void setPolygonId(String polygonId) {
 		this.polygonId = polygonId;
 	}
 
-	public String getPolygonId() {
-		return polygonId;
-	}
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/OrientationRingsSameType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractRingError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,21 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serial;
 
-@XmlRootElement(name = "GE_P_ORIENTATION_RINGS_SAME")
-public class OrientationRingsSameType extends PolygonErrorType {
+public abstract class AbstractRingError extends AbstractGeometryError {
 
-	private String linearRingId;
-
-	public void setLinearRingId(String linearRingId) {
-		this.linearRingId = linearRingId;
-	}
+    @Serial
+    private static final long serialVersionUID = 6406932524599157467L;
+    
+    private String linearRingId;
 
 	public String getLinearRingId() {
 		return linearRingId;
 	}
 
+	public void setLinearRingId(String linearRingId) {
+		this.linearRingId = linearRingId;
+	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/SemanticError.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSemanticError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-public abstract class SemanticError extends ValidationError {
+import java.io.Serial;
 
-	private static final long serialVersionUID = 8986289777859562928L;
+public abstract class AbstractSemanticError extends AbstractError {
+
+    @Serial
+    private static final long serialVersionUID = 3754322190455789991L;
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/SolidError.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/AbstractSolidError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,18 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-public abstract class SolidError extends ValidationError {
-	private static final long serialVersionUID = 6430138970493794998L;
-	
-	private String geometryId;
+import java.io.Serial;
 
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
+public abstract class AbstractSolidError extends AbstractGeometryError {
+
+    @Serial
+    private static final long serialVersionUID = 8616094562996823088L;
+    
+    private String geometryId;
 
 	public String getGeometryId() {
 		return geometryId;
 	}
+
+	public void setGeometryId(String geometryId) {
+		this.geometryId = geometryId;
+	}
+
 }

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

+/*-
+ * Copyright 2022 Hochschule für Technik Stuttgart
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.hft.stuttgart.quality.model.types;
+
+import java.io.Serial;
+
+public abstract class AllPolygonsOrientedWrongError extends AbstractSolidError {
+
+    @Serial
+    private static final long serialVersionUID = 4295306777217062184L;
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/AllPolygonsWrongOrientation.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Checking.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,22 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-import org.citygml4j.builder.copy.CopyBuilder;
+import java.io.Serial;
 
-public class AllPolygonsWrongOrientation extends SolidError {
+import org.xmlobjects.gml.model.GMLObject;
 
-	private static final long serialVersionUID = 3817224755569965908L;
+import de.hft.stuttgart.quality.model.enums.TopLevelFeatureType;
 
-	@Override
-	public String toString() {
-		return "AllPolygonsWrongOrientation [geometryId=" + getGeometryId() + "]";
+public abstract class Checking extends GMLObject {
+
+    @Serial
+    private static final long serialVersionUID = 8248598807454312291L;
+    
+    private TopLevelFeatureType featureType;
+
+	public TopLevelFeatureType getFeatureType() {
+		return featureType;
 	}
 
-	@Override
-	public Object copy(CopyBuilder copyBuilder) {
-		return copyTo(new AllPolygonsWrongOrientation(), copyBuilder);
+	public void setFeatureType(TopLevelFeatureType featureType) {
+		this.featureType = featureType;
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/MultipleConnectedComponentsType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ComponentList.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,31 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
+import java.io.Serial;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "GE_S_MULTIPLE_CONNECTED_COMPONENTS")
-public class MultipleConnectedComponentsType extends SolidErrorType {
-	
-	@XmlElementWrapper
-	@XmlElement(name = "component")
-	private List<Component> components;
-	
-	public boolean isSetComponents() {
-		return components != null && !components.isEmpty();
-	}
-	
-	public List<Component> getComponents() {
+import org.xmlobjects.gml.model.GMLObject;
+
+import de.hft.stuttgart.quality.model.properties.PolygonIdListProperty;
+
+public abstract class ComponentList extends GMLObject {
+
+    @Serial
+    private static final long serialVersionUID = 7846916128728837265L;
+    
+    private List<PolygonIdListProperty> components;
+
+	public List<PolygonIdListProperty> getComponents() {
 		if (components == null) {
 			components = new ArrayList<>();
 		}
 		return components;
 	}
 
+	public void setComponents(List<PolygonIdListProperty> components) {
+		this.components = components;
+	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/ConsecutivePointsSame.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/ConsecutivePointsSameError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,43 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-import org.citygml4j.builder.copy.CopyBuilder;
-import org.citygml4j.model.gml.geometry.primitives.DirectPosition;
+import java.io.Serial;
+
+import org.xmlobjects.gml.model.geometry.DirectPosition;
+
+public abstract class ConsecutivePointsSameError extends AbstractRingError {
+
+	@Serial
+	private static final long serialVersionUID = 960107689338308020L;
 
-public class ConsecutivePointsSame extends RingError {
-	
-	private static final long serialVersionUID = -838421312521561747L;
-	
 	private DirectPosition vertex1;
 	private DirectPosition vertex2;
-	
-	public void setVertex1(DirectPosition vertex1) {
-		this.vertex1 = vertex1;
-	}
-	
-	public void setVertex2(DirectPosition vertex2) {
-		this.vertex2 = vertex2;
-	}
 
 	public DirectPosition getVertex1() {
 		return vertex1;
 	}
-	
+
+	public void setVertex1(DirectPosition vertex1) {
+		this.vertex1 = vertex1;
+	}
+
 	public DirectPosition getVertex2() {
 		return vertex2;
 	}
 
-	@Override
-	public String toString() {
-		return "ConsecutivePointsSame [linearRingId=" + getLinearRingId() + ", vertex1=" + vertex1 + ", vertex2=" + vertex2
-				+ "]";
+	public void setVertex2(DirectPosition vertex2) {
+		this.vertex2 = vertex2;
 	}
 
 	@Override
-	public Object copy(CopyBuilder copyBuilder) {
-		return copyTo(new ConsecutivePointsSame(), copyBuilder);
+	public String toString() {
+		return "ConsecutivePointsSameError [vertex1=" + vertex1 + ", vertex2=" + vertex2 + "]";
 	}
 
 }

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

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,33 +13,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-import java.io.Serializable;
+import java.io.Serial;
 
-import org.citygml4j.model.gml.geometry.primitives.DirectPosition;
+import org.xmlobjects.gml.model.GMLObject;
+import org.xmlobjects.gml.model.geometry.DirectPosition;
+
+public abstract class Edge extends GMLObject {
+
+	@Serial
+	private static final long serialVersionUID = 8021062845313752146L;
 
-public class Edge implements Serializable {
-	
-	private static final long serialVersionUID = -5076265818764666094L;
-	
 	private DirectPosition from;
 	private DirectPosition to;
-	
+
+	public DirectPosition getFrom() {
+		return from;
+	}
+
 	public void setFrom(DirectPosition from) {
 		this.from = from;
 	}
-	
+
+	public DirectPosition getTo() {
+		return to;
+	}
+
 	public void setTo(DirectPosition to) {
 		this.to = to;
 	}
-	
-	public DirectPosition getFrom() {
-		return from;
-	}
-	
-	public DirectPosition getTo() {
-		return to;
+
+	@Override
+	public String toString() {
+		return "Edge [from=" + from + ", to=" + to + "]";
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/NonManifoldEdge.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/EdgeList.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,32 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
+import java.io.Serial;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.citygml4j.builder.copy.CopyBuilder;
+import org.xmlobjects.gml.model.GMLObject;
 
-public class NonManifoldEdge extends SolidError {
+import de.hft.stuttgart.quality.model.properties.EdgeProperty;
 
-	private static final long serialVersionUID = -4312748985706248178L;
+public abstract class EdgeList extends GMLObject {
 
-	private List<Edge> edges;
+    @Serial
+    private static final long serialVersionUID = 5900643456940461301L;
+    
+    private List<EdgeProperty> edges;
 
-	public boolean isSetEdges() {
-		return edges != null && !edges.isEmpty();
-	}
-
-	public List<Edge> getEdges() {
+	public List<EdgeProperty> getEdges() {
 		if (edges == null) {
 			edges = new ArrayList<>();
 		}
 		return edges;
 	}
 
-	@Override
-	public Object copy(CopyBuilder copyBuilder) {
-		return copyTo(new NonPlanarNormalsDeviation(), copyBuilder);
+	public void setEdges(List<EdgeProperty> edges) {
+		this.edges = edges;
 	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ErrorStatistics.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Error.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,45 +13,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import java.io.Serializable;
+import java.io.Serial;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlValue;
+import org.xmlobjects.gml.model.GMLObject;
 
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ErrorStatistics implements Serializable {
-	
-	private static final long serialVersionUID = -1007447539987946146L;
+import de.hft.stuttgart.quality.model.enums.ErrorId;
 
-	@XmlAttribute
+public abstract class Error extends GMLObject {
+
+	@Serial
+	private static final long serialVersionUID = 2447962257841143458L;
+
+	private int occurences;
 	private ErrorId name;
-	
-	@XmlValue
-	private int amount;
-	
-	public void setName(ErrorId name) {
-		this.name = name;
+
+	public int getOccurences() {
+		return occurences;
+	}
+
+	public void setOccurences(int occurences) {
+		this.occurences = occurences;
 	}
-	
+
 	public ErrorId getName() {
 		return name;
 	}
-	
-	public void setAmount(int amount) {
-		this.amount = amount;
-	}
-	
-	public int getAmount() {
-		return amount;
+
+	public void setName(ErrorId name) {
+		this.name = name;
 	}
 
 	@Override
 	public String toString() {
-		return "ErrorStatistics [name=" + name + ", amount=" + amount + "]";
+		return "Error [occurences=" + occurences + ", name=" + name + "]";
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/FeatureStatistics.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/FeatureStatistics.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,52 +13,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import java.io.Serializable;
+import java.io.Serial;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlValue;
+import org.xmlobjects.gml.model.GMLObject;
 
-@XmlAccessorType(XmlAccessType.FIELD)
-public class FeatureStatistics implements Serializable {
+public abstract class FeatureStatistics extends GMLObject {
 
-	private static final long serialVersionUID = 5794335930507488398L;
+	@Serial
+	private static final long serialVersionUID = 5835765260535725839L;
 
-	@XmlAttribute
 	private int numChecked;
-	
-	@XmlValue
 	private int numErrors;
-	
-	public FeatureStatistics() {
-	}
-	
-	public FeatureStatistics(int numChecked, int numErrors) {
-		this.numChecked = numChecked;
-		this.numErrors = numErrors;
+
+	public int getNumChecked() {
+		return numChecked;
 	}
 
 	public void setNumChecked(int numChecked) {
 		this.numChecked = numChecked;
 	}
-	
-	public void setNumErrors(int numErrors) {
-		this.numErrors = numErrors;
-	}
-	
-	public int getNumChecked() {
-		return numChecked;
-	}
-	
+
 	public int getNumErrors() {
 		return numErrors;
 	}
 
-	@Override
-	public String toString() {
-		return "FeatureStatistics [numChecked=" + numChecked + ", numErrors=" + numErrors + "]";
+	public void setNumErrors(int numErrors) {
+		this.numErrors = numErrors;
 	}
+
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/SolidNotClosedType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/Filter.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,31 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
+import java.io.Serial;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
+import org.xmlobjects.gml.model.GMLObject;
 
-@XmlRootElement(name = "GE_S_NOT_CLOSED")
-public class SolidNotClosedType extends SolidErrorType {
+import de.hft.stuttgart.quality.model.properties.CheckingProperty;
 
-	@XmlElementWrapper
-	@XmlElement(name = "edge")
-	private List<EdgeType> edges;
+public abstract class Filter extends GMLObject {
 
-	public boolean isSetEdges() {
-		return edges != null && !edges.isEmpty();
-	}
+	@Serial
+	private static final long serialVersionUID = 2766323821940477659L;
+
+	private List<CheckingProperty> checking;
 
-	public List<EdgeType> getEdges() {
-		if (edges == null) {
-			edges = new ArrayList<>();
+	public List<CheckingProperty> getChecking() {
+		if (checking == null) {
+			checking = new ArrayList<>();
 		}
-		return edges;
+		return checking;
+	}
+
+	public void setChecking(List<CheckingProperty> checking) {
+		this.checking = checking;
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/NonManifoldEdgeType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/GlobalParameters.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,31 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
+import java.io.Serial;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
+import org.xmlobjects.gml.model.GMLObject;
 
-@XmlRootElement(name = "GE_S_NON_MANIFOLD_EDGE")
-public class NonManifoldEdgeType extends SolidErrorType {
+import de.hft.stuttgart.quality.model.properties.ParameterProperty;
 
-	@XmlElementWrapper
-	@XmlElement(name = "edge")
-	private List<EdgeType> edges;
+public abstract class GlobalParameters extends GMLObject {
 
-	public boolean isSetEdges() {
-		return edges != null && !edges.isEmpty();
-	}
+	@Serial
+	private static final long serialVersionUID = 5470016232480954926L;
+
+	private List<ParameterProperty> parameters;
 
-	public List<EdgeType> getEdges() {
-		if (edges == null) {
-			edges = new ArrayList<>();
+	public List<ParameterProperty> getParameters() {
+		if (parameters == null) {
+			parameters = new ArrayList<>();
 		}
-		return edges;
+		return parameters;
+	}
+
+	public void setParameters(List<ParameterProperty> parameters) {
+		this.parameters = parameters;
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/HoleOutsideType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/HoleOutsideError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,21 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serial;
 
-@XmlRootElement(name = "GE_P_HOLE_OUTSIDE")
-public class HoleOutsideType extends PolygonErrorType {
+public abstract class HoleOutsideError extends AbstractPolygonError {
+
+	@Serial
+	private static final long serialVersionUID = 7823516103018988170L;
 
 	private String linearRingId;
 
+	public String getLinearRingId() {
+		return linearRingId;
+	}
+
 	public void setLinearRingId(String linearRingId) {
 		this.linearRingId = linearRingId;
 	}
 
-	public String getLinearRingId() {
-		return linearRingId;
+	@Override
+	public String toString() {
+		return "HoleOutsideError [linearRingId=" + linearRingId + "]";
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/InnerRingsNested.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/InnerRingsNestedError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,35 +13,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model;
+package de.hft.stuttgart.quality.model.types;
 
-import org.citygml4j.builder.copy.CopyBuilder;
+import java.io.Serial;
 
-public class InnerRingsNested extends PolygonError {
+public abstract class InnerRingsNestedError extends AbstractPolygonError {
 
-	private static final long serialVersionUID = 2291087505629924993L;
+	@Serial
+	private static final long serialVersionUID = 6801491749796411678L;
 
 	private String linearRingId1;
 	private String linearRingId2;
 
-	public void setLinearRingId1(String linearRingId1) {
-		this.linearRingId1 = linearRingId1;
-	}
-
-	public void setLinearRingId2(String linearRingId2) {
-		this.linearRingId2 = linearRingId2;
-	}
-
 	public String getLinearRingId1() {
 		return linearRingId1;
 	}
 
+	public void setLinearRingId1(String linearRingId1) {
+		this.linearRingId1 = linearRingId1;
+	}
+
 	public String getLinearRingId2() {
 		return linearRingId2;
 	}
 
+	public void setLinearRingId2(String linearRingId2) {
+		this.linearRingId2 = linearRingId2;
+	}
+
 	@Override
-	public Object copy(CopyBuilder copyBuilder) {
-		return copyTo(new InnerRingsNested(), copyBuilder);
+	public String toString() {
+		return "InnerRingsNestedError [linearRingId1=" + linearRingId1 + ", linearRingId2=" + linearRingId2 + "]";
 	}
+
 }

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

+/*-
+ * Copyright 2022 Hochschule für Technik Stuttgart
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.hft.stuttgart.quality.model.types;
+
+import java.io.Serial;
+
+public abstract class InteriorDisconnectedError extends AbstractPolygonError {
+
+    @Serial
+    private static final long serialVersionUID = 8270468563578479182L;
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/IntersectingRingsType.java → citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/types/IntersectingRingsError.java

 /*-
- * Copyright 2020 Hochschule für Technik Stuttgart
+ * Copyright 2022 Hochschule für Technik Stuttgart
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,30 +13,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package de.hft.stuttgart.quality.model.jaxb;
+package de.hft.stuttgart.quality.model.types;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serial;
 
-@XmlRootElement(name = "GE_P_INTERSECTING_RINGS")
-public class IntersectingRingsType extends PolygonErrorType {
+public abstract class IntersectingRingsError extends AbstractPolygonError {
+
+	@Serial
+	private static final long serialVersionUID = 4733342962974436966L;
 
 	private String linearRingId1;
 	private String linearRingId2;
 
+	public String getLinearRingId1() {
+		return linearRingId1;
+	}
+
 	public void setLinearRingId1(String linearRingId1) {
 		this.linearRingId1 = linearRingId1;
 	}
 
-	public String getLinearRingId1() {
-		return linearRingId1;
+	public String getLinearRingId2() {
+		return linearRingId2;
 	}
 
 	public void setLinearRingId2(String linearRingId2) {
 		this.linearRingId2 = linearRingId2;
 	}
 
-	public String getLinearRingId2() {
-		return linearRingId2;
+	@Override
+	public String toString() {
+		return "IntersectingRingsError [linearRingId1=" + linearRingId1 + ", linearRingId2=" + linearRingId2 + "]";
 	}
 
 }