fixing inheritance abundance where not needed, release 1.3

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

@@ -23,22 +23,12 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_S_NON_MANIFOLD_EDGE")
-public class NonManifoldEdgeType extends ValidationErrorType {
-
-	private String geometryId;
+public class NonManifoldEdgeType extends SolidErrorType {
 
 	@XmlElementWrapper
 	@XmlElement(name = "edge")
 	private List<EdgeType> edges;
 
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-
-	public String getGeometryId() {
-		return geometryId;
-	}
-
 	public boolean isSetEdges() {
 		return edges != null && !edges.isEmpty();
 	}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/NonManifoldVertexType.java

@@ -20,23 +20,14 @@ import javax.xml.bind.annotation.XmlRootElement;
 import net.opengis.gml.DirectPositionType;
 
 @XmlRootElement(name = "GE_S_NON_MANIFOLD_VERTEX")
-public class NonManifoldVertexType extends ValidationErrorType {
+public class NonManifoldVertexType extends SolidErrorType {
 
-	private String geometryId;
 	private DirectPositionType vertex;
 
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-
 	public void setVertex(DirectPositionType vertex) {
 		this.vertex = vertex;
 	}
 
-	public String getGeometryId() {
-		return geometryId;
-	}
-
 	public DirectPositionType getVertex() {
 		return vertex;
 	}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/NonPlanarDistancePlaneType.java

@@ -21,16 +21,11 @@ import net.opengis.gml.DirectPositionType;
 import net.opengis.gml.LengthType;
 
 @XmlRootElement(name = "GE_P_NON_PLANAR_POLYGON_DISTANCE_PLANE")
-public class NonPlanarDistancePlaneType extends ValidationErrorType {
+public class NonPlanarDistancePlaneType extends PolygonErrorType {
 
-	private String polygonId;
 	private DirectPositionType vertex;
 	private LengthType distance;
 
-	public void setPolygonId(String polygonId) {
-		this.polygonId = polygonId;
-	}
-
 	public void setVertex(DirectPositionType vertex) {
 		this.vertex = vertex;
 	}
@@ -39,10 +34,6 @@ public class NonPlanarDistancePlaneType extends ValidationErrorType {
 		this.distance = distance;
 	}
 
-	public String getPolygonId() {
-		return polygonId;
-	}
-
 	public DirectPositionType getVertex() {
 		return vertex;
 	}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/NonPlanarNormalsDeviationType.java

@@ -20,23 +20,14 @@ import javax.xml.bind.annotation.XmlRootElement;
 import net.opengis.gml.AngleType;
 
 @XmlRootElement(name = "GE_P_NON_PLANAR_POLYGON_NORMALS_DEVIATION")
-public class NonPlanarNormalsDeviationType extends ValidationErrorType {
+public class NonPlanarNormalsDeviationType extends PolygonErrorType {
 
-	private String polygonId;
 	private AngleType deviation;
 
-	public void setPolygonId(String polygonId) {
-		this.polygonId = polygonId;
-	}
-
 	public void setDeviation(AngleType deviation) {
 		this.deviation = deviation;
 	}
 
-	public String getPolygonId() {
-		return polygonId;
-	}
-
 	public AngleType getDeviation() {
 		return deviation;
 	}

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

@@ -18,23 +18,14 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_P_ORIENTATION_RINGS_SAME")
-public class OrientationRingsSameType extends ValidationErrorType {
+public class OrientationRingsSameType extends PolygonErrorType {
 
-	private String polygonId;
 	private String linearRingId;
 
-	public void setPolygonId(String polygonId) {
-		this.polygonId = polygonId;
-	}
-
 	public void setLinearRingId(String linearRingId) {
 		this.linearRingId = linearRingId;
 	}
 
-	public String getPolygonId() {
-		return polygonId;
-	}
-
 	public String getLinearRingId() {
 		return linearRingId;
 	}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/PolygonErrorType.java

+/*-
+ * Copyright 2020 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.jaxb;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+@XmlSeeAlso({ InteriorDisconnectedType.class, IntersectingRingsType.class, HoleOutsideType.class,
+		InnerRingsNestedType.class, NonPlanarDistancePlaneType.class, NonPlanarNormalsDeviationType.class,
+		OrientationRingsSameType.class })
+
+@XmlRootElement(name = "PolygonError")
+public class PolygonErrorType extends ValidationErrorType {
+
+	private String 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/PolygonWrongOrientationType.java

@@ -23,22 +23,12 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_S_POLYGON_WRONG_ORIENTATION")
-public class PolygonWrongOrientationType extends ValidationErrorType {
-	
-	private String geometryId;
+public class PolygonWrongOrientationType extends SolidErrorType {
 	
 	@XmlElementWrapper
 	@XmlElement(name = "edge")
 	private List<EdgeType> edges;
 	
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-	
-	public String getGeometryId() {
-		return geometryId;
-	}
-	
 	public boolean isSetEdges() {
 		return edges != null && !edges.isEmpty();
 	}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/RingErrorType.java

+/*-
+ * Copyright 2020 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.jaxb;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+@XmlSeeAlso({ ConsecutivePointsSameType.class, RingNotClosedType.class, RingSelfIntersectionType.class,
+		TooFewPointsType.class })
+@XmlRootElement(name = "RingError")
+public class RingErrorType extends ValidationErrorType {
+
+	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/jaxb/RingNotClosedType.java

@@ -18,16 +18,6 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_R_NOT_CLOSED")
-public class RingNotClosedType extends ValidationErrorType {
-	
-	private String linearRingId;
-	
-	public void setLinearRingId(String linarRingId) {
-		this.linearRingId = linarRingId;
-	}
-	
-	public String getLinearRingId() {
-		return linearRingId;
-	}
+public class RingNotClosedType extends RingErrorType {
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/RingSelfIntersectionType.java

@@ -20,19 +20,14 @@ import javax.xml.bind.annotation.XmlRootElement;
 import net.opengis.gml.DirectPositionType;
 
 @XmlRootElement(name = "GE_R_SELF_INTERSECTION")
-public class RingSelfIntersectionType extends ValidationErrorType {
+public class RingSelfIntersectionType extends RingErrorType {
 
-	private String linearRingId;
 	private RingSelfIntType type;
 	private EdgeType edge1;
 	private EdgeType edge2;
 	private DirectPositionType vertex1;
 	private DirectPositionType vertex2;
 
-	public void setLinearRingId(String linearRingId) {
-		this.linearRingId = linearRingId;
-	}
-
 	public void setType(RingSelfIntType type) {
 		this.type = type;
 	}
@@ -53,10 +48,6 @@ public class RingSelfIntersectionType extends ValidationErrorType {
 		this.vertex2 = vertex2;
 	}
 
-	public String getLinearRingId() {
-		return linearRingId;
-	}
-
 	public RingSelfIntType getType() {
 		return type;
 	}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/SemanticErrorType.java

+/*-
+ * Copyright 2020 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.jaxb;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+@XmlSeeAlso({ AttributeWrongValueType.class, AttributeMissingType.class })
+@XmlRootElement(name = "SemanticError")
+public class SemanticErrorType extends ValidationErrorType {
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/SolidErrorType.java

+/*-
+ * Copyright 2020 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.jaxb;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+
+@XmlSeeAlso({ SolidNotClosedType.class, AllPolygonsWrongOrientationType.class, PolygonWrongOrientationType.class,
+		NonManifoldVertexType.class, NonManifoldEdgeType.class, TooFewPolygonsType.class,
+		MultipleConnectedComponentsType.class, SolidSelfIntersectionType.class })
+@XmlRootElement(name = "SolidError")
+public class SolidErrorType extends ValidationErrorType {
+
+	private String geometryId;
+
+	public void setGeometryId(String geometryId) {
+		this.geometryId = geometryId;
+	}
+
+	public String getGeometryId() {
+		return geometryId;
+	}
+
+}

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

@@ -23,22 +23,12 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_S_NOT_CLOSED")
-public class SolidNotClosedType extends ValidationErrorType {
-
-	private String geometryId;
+public class SolidNotClosedType extends SolidErrorType {
 
 	@XmlElementWrapper
 	@XmlElement(name = "edge")
 	private List<EdgeType> edges;
 
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-
-	public String getGeometryId() {
-		return geometryId;
-	}
-
 	public boolean isSetEdges() {
 		return edges != null && !edges.isEmpty();
 	}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/SolidSelfIntersectionType.java

@@ -18,16 +18,11 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_S_SELF_INTERSECTION")
-public class SolidSelfIntersectionType extends ValidationErrorType {
+public class SolidSelfIntersectionType extends SolidErrorType {
 
-	private String geometryId;
 	private String polygonId1;
 	private String polygonId2;
 
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-
 	public void setPolygonId1(String polygonId1) {
 		this.polygonId1 = polygonId1;
 	}
@@ -36,10 +31,6 @@ public class SolidSelfIntersectionType extends ValidationErrorType {
 		this.polygonId2 = polygonId2;
 	}
 
-	public String getGeometryId() {
-		return geometryId;
-	}
-
 	public String getPolygonId1() {
 		return polygonId1;
 	}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/TooFewPointsType.java

@@ -18,46 +18,11 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_R_TOO_FEW_POINTS")
-public class TooFewPointsType extends ValidationErrorType {
-
-	private String linearRingId;
-
-	public void setLinearRingId(String linearRingId) {
-		this.linearRingId = linearRingId;
-	}
-
-	public String getLinearRingId() {
-		return linearRingId;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((linearRingId == null) ? 0 : linearRingId.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		TooFewPointsType other = (TooFewPointsType) obj;
-		if (linearRingId == null) {
-			if (other.linearRingId != null)
-				return false;
-		} else if (!linearRingId.equals(other.linearRingId))
-			return false;
-		return true;
-	}
+public class TooFewPointsType extends RingErrorType {
 
 	@Override
 	public String toString() {
-		return "TooFewPoints [linearRingId=" + linearRingId + "]";
+		return "TooFewPoints [linearRingId=" + getLinearRingId() + "]";
 	}
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/TooFewPolygonsType.java

@@ -18,16 +18,6 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_S_TOO_FEW_POLYGONS")
-public class TooFewPolygonsType extends ValidationErrorType {
-	
-	private String geometryId;
-	
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-	
-	public String getGeometryId() {
-		return geometryId;
-	}
+public class TooFewPolygonsType extends SolidErrorType {
 	
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationErrorType.java

@@ -17,18 +17,12 @@ package de.hft.stuttgart.quality.model.jaxb;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
 
-import net.opengis.gml.AbstractFeatureType;
-
-@XmlSeeAlso({ ConsecutivePointsSameType.class, RingSelfIntersectionType.class, TooFewPointsType.class,
-		RingNotClosedType.class, InteriorDisconnectedType.class, IntersectingRingsType.class,
-		NonPlanarDistancePlaneType.class, InnerRingsNestedType.class, HoleOutsideType.class,
-		NonPlanarNormalsDeviationType.class, OrientationRingsSameType.class, AllPolygonsWrongOrientationType.class,
-		PolygonWrongOrientationType.class, NonManifoldVertexType.class, NonManifoldEdgeType.class,
-		SolidNotClosedType.class, TooFewPolygonsType.class, MultipleConnectedComponentsType.class,
-		AttributeWrongValueType.class, AttributeMissingType.class, SolidSelfIntersectionType.class })
+@XmlSeeAlso({ RingErrorType.class, PolygonErrorType.class, SolidErrorType.class, SemanticErrorType.class })
 @XmlAccessorType(XmlAccessType.FIELD)
-public abstract class ValidationErrorType extends AbstractFeatureType {
+@XmlRootElement(name = "ValidationError")
+public abstract class ValidationErrorType {
 
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationType.java

@@ -21,10 +21,10 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import de.hft.stuttgart.quality.marshaller.ZonedDateTimeAdapter;
-import net.opengis.gml.AbstractFeatureType;
+import net.opengis.gml.AbstractGMLType;
 
 @XmlType(name = "validation")
-public class ValidationType extends AbstractFeatureType {
+public class ValidationType extends AbstractGMLType {
 
 	@XmlJavaTypeAdapter(ZonedDateTimeAdapter.class)
 	private ZonedDateTime validationDate;

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/package-info.java

@@ -13,6 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@javax.xml.bind.annotation.XmlSchema(namespace = "https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = {
-		@javax.xml.bind.annotation.XmlNs(namespaceURI = "https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.2", prefix = "qual") })
+@javax.xml.bind.annotation.XmlSchema(namespace = "https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.3", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED, xmlns = {
+		@javax.xml.bind.annotation.XmlNs(namespaceURI = "https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.3", prefix = "qual") })
 package de.hft.stuttgart.quality.model.jaxb;

citygml4j-quality-ade/src/main/resources/qualityAde.xsd

 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:qual="https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.2"
-	targetNamespace="https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.2"
+	xmlns:qual="https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.3"
+	targetNamespace="https://transfer.hft-stuttgart.de/pages/citydoctor/qualityade/0.1.3"
 	xmlns:core="http://www.opengis.net/citygml/2.0"
 	xmlns:bldg="http://www.opengis.net/citygml/building/2.0"
 	xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified"
@@ -45,26 +45,43 @@
 		</restriction>
 	</simpleType>
 
+	<complexType name="ValidationError">
+	</complexType>
+
+	<complexType name="RingError">
+		<complexContent>
+			<extension base="qual:ValidationError">
+				<sequence>
+					<element name="linearRingId" type="string" />
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+
 	<complexType name="GE_R_CONSECUTIVE_POINTS_SAME">
 		<annotation>
 			<documentation>Consecutive point are the same</documentation>
 		</annotation>
+		<complexContent>
+			<extension base="qual:RingError">
 				<sequence>
-			<element name="linearRingId" type="string" />
 					<element name="vertex1" type="gml:DirectPositionType" />
 					<element name="vertex2" type="gml:DirectPositionType" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="GE_R_TOO_FEW_POINTS">
-		<sequence>
-			<element name="linearRingId" type="string" />
-		</sequence>
+		<complexContent>
+			<extension base="qual:RingError" />
+		</complexContent>
 	</complexType>
 
 	<complexType name="GE_R_SELF_INTERSECTION">
+		<complexContent>
+			<extension base="qual:RingError">
 				<sequence>
-			<element name="linearRingId" type="string" />
 					<element name="type" type="qual:ringSelfIntType" />
 					<element name="edge1" type="qual:edgeType" minOccurs="0" />
 					<element name="edge2" type="qual:edgeType" minOccurs="0" />
@@ -73,6 +90,8 @@
 					<element name="vertex2" type="gml:DirectPositionType"
 						minOccurs="0" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<simpleType name="ringSelfIntType">
@@ -91,66 +110,96 @@
 	</complexType>
 
 	<complexType name="GE_R_NOT_CLOSED">
-		<sequence>
-			<element name="linearRingId" type="string" />
-		</sequence>
+		<complexContent>
+			<extension base="qual:RingError" />
+		</complexContent>
 	</complexType>
 
-	<complexType name="GE_P_INTERIOR_DISCONNECTED">
+	<complexType name="PolygonError">
 		<sequence>
 			<element name="polygonId" type="string" />
 		</sequence>
 	</complexType>
 
+	<complexType name="GE_P_INTERIOR_DISCONNECTED">
+		<complexContent>
+			<extension base="qual:PolygonError" />
+		</complexContent>
+	</complexType>
+
 	<complexType name="GE_P_INTERSECTING_RINGS">
+		<complexContent>
+			<extension base="qual:PolygonError">
 				<sequence>
-			<element name="polygonId" type="string" />
 					<element name="linearRingId1" type="string" />
 					<element name="linearRingId2" type="string" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="GE_P_INNER_RINGS_NESTED">
+		<complexContent>
+			<extension base="qual:PolygonError">
 				<sequence>
-			<element name="polygonId" type="string" />
 					<element name="linearRingId1" type="string" />
 					<element name="linearRingId2" type="string" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="GE_P_HOLE_OUTSIDE">
+		<complexContent>
+			<extension base="qual:PolygonError">
 				<sequence>
-			<element name="polygonId" type="string" />
 					<element name="linearRingId" type="string" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType
 		name="GE_P_NON_PLANAR_POLYGON_NORMALS_DEVIATION">
+		<complexContent>
+			<extension base="qual:PolygonError">
 				<sequence>
-			<element name="polygonId" type="string" />
 					<element name="deviation" type="gml:AngleType"></element>
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="GE_P_ORIENTATION_RINGS_SAME">
+		<complexContent>
+			<extension base="qual:PolygonError">
 				<sequence>
-			<element name="polygonId" type="string" />
 					<element name="linearRingId" type="string" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
-	<complexType name="GE_S_ALL_POLYGONS_WRONG_ORIENTATION">
+	<complexType name="SolidError">
 		<sequence>
 			<element name="geometryId" type="string" />
 		</sequence>
 	</complexType>
 
+	<complexType name="GE_S_ALL_POLYGONS_WRONG_ORIENTATION">
+		<complexContent>
+			<extension base="qual:SolidError" />
+		</complexContent>
+	</complexType>
+
 	<complexType name="GE_S_POLYGON_WRONG_ORIENTATION">
+		<complexContent>
+			<extension base="qual:SolidError">
 				<sequence>
-			<element name="geometryId" type="string" />
 					<element name="edges" type="qual:EdgeList" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="EdgeList">
@@ -161,45 +210,60 @@
 	</complexType>
 
 	<complexType name="GE_S_SELF_INTERSECTION">
+		<complexContent>
+			<extension base="qual:SolidError">
 				<sequence>
-			<element name="geometryId" type="string" />
 					<element name="polygonId1" type="string" />
 					<element name="polygonId2" type="string" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="GE_S_NON_MANIFOLD_VERTEX">
+		<complexContent>
+			<extension base="qual:SolidError">
 				<sequence>
-			<element name="geometryId" type="string" />
 					<element name="vertex" type="gml:DirectPositionType" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="GE_S_NON_MANIFOLD_EDGE">
+		<complexContent>
+			<extension base="qual:SolidError">
 				<sequence>
-			<element name="geometryId" type="string" />
 					<element name="edges" type="qual:EdgeList" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="GE_S_NOT_CLOSED">
+		<complexContent>
+			<extension base="qual:SolidError">
 				<sequence>
-			<element name="geometryId" type="string" />
 					<element name="edges" type="qual:EdgeList" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="GE_S_TOO_FEW_POLYGONS">
-		<sequence>
-			<element name="geometryId" type="string" />
-		</sequence>
+		<complexContent>
+			<extension base="qual:SolidError" />
+		</complexContent>
 	</complexType>
 
 	<complexType name="GE_S_MULTIPLE_CONNECTED_COMPONENTS">
+		<complexContent>
+			<extension base="qual:SolidError">
 				<sequence>
-			<element name="geometryId" type="string" />
 					<element name="components" type="qual:ComponentList" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="ComponentList">
@@ -221,27 +285,41 @@
 				regression plane
 			</documentation>
 		</annotation>
+		<complexContent>
+			<extension base="qual:PolygonError">
 				<sequence>
-			<element name="polygonId" type="string" />
 					<element name="vertex" type="gml:DirectPositionType" />
 					<element name="distance" type="gml:LengthType" />
 				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<complexType name="SemanticError">
 	</complexType>
 
 	<complexType name="SE_ATTRIBUTE_WRONG_VALUE">
+		<complexContent>
+			<extension base="qual:SemanticError">
 				<sequence>
-			<element name="childId" type="string" minOccurs="0"/>
+					<element name="childId" type="string" minOccurs="0" />
 					<element name="attributeName" type="string" />
 					<element name="generic" type="boolean" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="SE_ATTRIBUTE_MISSING">
+		<complexContent>
+			<extension base="qual:SemanticError">
 				<sequence>
 					<element name="childId" type="string" minOccurs="0" />
 					<element name="attributeName" type="string" />
 					<element name="generic" type="boolean" />
 				</sequence>
+			</extension>
+		</complexContent>
 	</complexType>
 
 	<complexType name="validationResultType">
@@ -311,8 +389,7 @@
 				type="qual:SE_ATTRIBUTE_WRONG_VALUE" minOccurs="0"
 				maxOccurs="unbounded" />
 			<element name="SE_ATTRIBUTE_MISSING"
-				type="qual:SE_ATTRIBUTE_MISSING" minOccurs="0"
-				maxOccurs="unbounded" />
+				type="qual:SE_ATTRIBUTE_MISSING" minOccurs="0" maxOccurs="unbounded" />
 		</sequence>
 		<attribute name="result" type="qual:result" />
 	</complexType>
@@ -491,7 +568,6 @@
 				statistics of a validation process
 			</documentation>
 		</annotation>
-		<!-- <complexContent> <extension base="gml:AbstractFeatureType"> -->
 		<sequence>
 			<element name="validationDate" type="dateTime" />
 			<element name="validationSoftware" type="string" />
@@ -500,6 +576,5 @@
 			<element name="statistics" type="qual:statisticsType"
 				maxOccurs="1" />
 		</sequence>
-		<!-- </extension> </complexContent> -->
 	</complexType>
 </schema>
\ No newline at end of file