fixing inheritance abundance where not needed, release 1.3

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/RingError.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;
+
+public abstract class RingError extends ValidationError {
+
+	private static final long serialVersionUID = -8610600028811350500L;
+	
+	private String linearRingId;
+
+	public void setLinearRingId(String linearRingId) {
+		this.linearRingId = linearRingId;
+	}
+
+	public String getLinearRingId() {
+		return linearRingId;
+	}
+}

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

@@ -16,56 +16,18 @@
 package de.hft.stuttgart.quality.model;
 
 import org.citygml4j.builder.copy.CopyBuilder;
-import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
-import org.citygml4j.model.common.visitor.FeatureFunctor;
-import org.citygml4j.model.common.visitor.FeatureVisitor;
-import org.citygml4j.model.common.visitor.GMLFunctor;
-import org.citygml4j.model.common.visitor.GMLVisitor;
-import org.citygml4j.model.gml.feature.AbstractFeature;
 
-public class RingNotClosed extends AbstractFeature implements ValidationError, ADEModelObject {
+public class RingNotClosed extends RingError {
 	
 	private static final long serialVersionUID = 5502668444088395535L;
 	
-	private String linearRingId;
-	
-	public void setLinearRingId(String linearRingId) {
-		this.linearRingId = linearRingId;
-	}
-	
-	public String getLinearRingId() {
-		return linearRingId;
-	}
-	
-
 	@Override
 	public String toString() {
-		return "RingNotClosed [linearRingId=" + linearRingId + "]";
+		return "RingNotClosed [linearRingId=" + getLinearRingId() + "]";
 	}
 
 	@Override
 	public Object copy(CopyBuilder copyBuilder) {
 		return copyTo(new RingNotClosed(), copyBuilder);
 	}
-
-	@Override
-	public void accept(FeatureVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(FeatureFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
-	@Override
-	public void accept(GMLVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(GMLFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
 }

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

@@ -16,31 +16,20 @@
 package de.hft.stuttgart.quality.model;
 
 import org.citygml4j.builder.copy.CopyBuilder;
-import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
-import org.citygml4j.model.common.visitor.FeatureFunctor;
-import org.citygml4j.model.common.visitor.FeatureVisitor;
-import org.citygml4j.model.common.visitor.GMLFunctor;
-import org.citygml4j.model.common.visitor.GMLVisitor;
-import org.citygml4j.model.gml.feature.AbstractFeature;
 import org.citygml4j.model.gml.geometry.primitives.DirectPosition;
 
 import de.hft.stuttgart.quality.model.jaxb.RingSelfIntType;
 
-public class RingSelfIntersection extends AbstractFeature implements ValidationError, ADEModelObject {
+public class RingSelfIntersection extends RingError {
 
 	private static final long serialVersionUID = -4426615638983209222L;
 	
-	private String linearRingId;
 	private RingSelfIntType type;
 	private Edge edge1;
 	private Edge edge2;
 	private DirectPosition vertex1;
 	private DirectPosition vertex2;
 
-	public void setLinearRingId(String linearRingId) {
-		this.linearRingId = linearRingId;
-	}
-
 	public void setType(RingSelfIntType type) {
 		this.type = type;
 	}
@@ -61,10 +50,6 @@ public class RingSelfIntersection extends AbstractFeature implements ValidationE
 		this.vertex2 = vertex2;
 	}
 
-	public String getLinearRingId() {
-		return linearRingId;
-	}
-
 	public RingSelfIntType getType() {
 		return type;
 	}
@@ -87,7 +72,7 @@ public class RingSelfIntersection extends AbstractFeature implements ValidationE
 
 	@Override
 	public String toString() {
-		return "RingSelfIntersection [linearRingId=" + linearRingId + ", type=" + type + ", edge1=" + edge1 + ", edge2="
+		return "RingSelfIntersection [linearRingId=" + getLinearRingId() + ", type=" + type + ", edge1=" + edge1 + ", edge2="
 				+ edge2 + ", vertex1=" + vertex1 + ", vertex2=" + vertex2 + "]";
 	}
 
@@ -95,25 +80,4 @@ public class RingSelfIntersection extends AbstractFeature implements ValidationE
 	public Object copy(CopyBuilder copyBuilder) {
 		return copyTo(new RingSelfIntersection(), copyBuilder);
 	}
-
-	@Override
-	public void accept(FeatureVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(FeatureFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
-	@Override
-	public void accept(GMLVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(GMLFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
 }

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/SemanticError.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;
+
+public abstract class SemanticError extends ValidationError {
+
+	private static final long serialVersionUID = 8986289777859562928L;
+
+}

citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/SolidError.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;
+
+public abstract class SolidError extends ValidationError {
+	private static final long serialVersionUID = 6430138970493794998L;
+	
+	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/SolidNotClosed.java

@@ -19,61 +19,26 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.citygml4j.builder.copy.CopyBuilder;
-import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
-import org.citygml4j.model.common.visitor.FeatureFunctor;
-import org.citygml4j.model.common.visitor.FeatureVisitor;
-import org.citygml4j.model.common.visitor.GMLFunctor;
-import org.citygml4j.model.common.visitor.GMLVisitor;
-import org.citygml4j.model.gml.feature.AbstractFeature;
 
-public class SolidNotClosed extends AbstractFeature implements ValidationError, ADEModelObject {
+public class SolidNotClosed extends SolidError {
 
 	private static final long serialVersionUID = 4609395125395073697L;
-	
-	private String geometryId;
+
 	private List<Edge> edges;
-	
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-	public String getGeometryId() {
-		return geometryId;
-	}
-	
+
 	public boolean isSetEdges() {
 		return edges != null && !edges.isEmpty();
 	}
-	
+
 	public List<Edge> getEdges() {
 		if (edges == null) {
 			edges = new ArrayList<>();
 		}
 		return edges;
 	}
-	
+
 	@Override
 	public Object copy(CopyBuilder copyBuilder) {
 		return copyTo(new SolidNotClosed(), copyBuilder);
 	}
-
-	@Override
-	public void accept(FeatureVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(FeatureFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
-	@Override
-	public void accept(GMLVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(GMLFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
 }

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

@@ -16,29 +16,14 @@
 package de.hft.stuttgart.quality.model;
 
 import org.citygml4j.builder.copy.CopyBuilder;
-import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
-import org.citygml4j.model.common.visitor.FeatureFunctor;
-import org.citygml4j.model.common.visitor.FeatureVisitor;
-import org.citygml4j.model.common.visitor.GMLFunctor;
-import org.citygml4j.model.common.visitor.GMLVisitor;
-import org.citygml4j.model.gml.feature.AbstractFeature;
 
-public class SolidSelfIntersection extends AbstractFeature implements ValidationError, ADEModelObject {
+public class SolidSelfIntersection extends SolidError {
 
 	private static final long serialVersionUID = 4086097021438848040L;
 
-	private String geometryId;
 	private String polygonId1;
 	private String polygonId2;
 
-	public String getGeometryId() {
-		return geometryId;
-	}
-
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-
 	public String getPolygonId1() {
 		return polygonId1;
 	}
@@ -57,7 +42,7 @@ public class SolidSelfIntersection extends AbstractFeature implements Validation
 
 	@Override
 	public String toString() {
-		return "SolidSelfIntersection [geometryId=" + geometryId + ", polygonId1=" + polygonId1 + ", polygonId2="
+		return "SolidSelfIntersection [geometryId=" + getGeometryId() + ", polygonId1=" + polygonId1 + ", polygonId2="
 				+ polygonId2 + "]";
 	}
 
@@ -65,24 +50,4 @@ public class SolidSelfIntersection extends AbstractFeature implements Validation
 	public Object copy(CopyBuilder copyBuilder) {
 		return copyTo(new SolidSelfIntersection(), copyBuilder);
 	}
-
-	@Override
-	public void accept(FeatureVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(FeatureFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
-	@Override
-	public void accept(GMLVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(GMLFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
 }

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

@@ -16,55 +16,18 @@
 package de.hft.stuttgart.quality.model;
 
 import org.citygml4j.builder.copy.CopyBuilder;
-import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
-import org.citygml4j.model.common.visitor.FeatureFunctor;
-import org.citygml4j.model.common.visitor.FeatureVisitor;
-import org.citygml4j.model.common.visitor.GMLFunctor;
-import org.citygml4j.model.common.visitor.GMLVisitor;
-import org.citygml4j.model.gml.feature.AbstractFeature;
 
-public class TooFewPoints extends AbstractFeature implements ValidationError, ADEModelObject {
+public class TooFewPoints extends RingError {
 
 	private static final long serialVersionUID = -904319347280328865L;
 	
-	private String linearRingId;
-	
-	public void setLinearRingId(String linearRingId) {
-		this.linearRingId = linearRingId;
-	}
-	
-	public String getLinearRingId() {
-		return linearRingId;
-	}
-	
 	@Override
 	public String toString() {
-		return "TooFewPoints [linearRingId=" + linearRingId + "]";
+		return "TooFewPoints [linearRingId=" + getLinearRingId() + "]";
 	}
 
 	@Override
 	public Object copy(CopyBuilder copyBuilder) {
 		return copyTo(new TooFewPoints(), copyBuilder);
 	}
-
-	@Override
-	public void accept(FeatureVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(FeatureFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
-	@Override
-	public void accept(GMLVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(GMLFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
 }

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

@@ -16,55 +16,18 @@
 package de.hft.stuttgart.quality.model;
 
 import org.citygml4j.builder.copy.CopyBuilder;
-import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
-import org.citygml4j.model.common.visitor.FeatureFunctor;
-import org.citygml4j.model.common.visitor.FeatureVisitor;
-import org.citygml4j.model.common.visitor.GMLFunctor;
-import org.citygml4j.model.common.visitor.GMLVisitor;
-import org.citygml4j.model.gml.feature.AbstractFeature;
 
-public class TooFewPolygons extends AbstractFeature implements ValidationError, ADEModelObject {
+public class TooFewPolygons extends SolidError {
 
 	private static final long serialVersionUID = -51591095439740599L;
 
-	private String geometryId;
-
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-
-	public String getGeometryId() {
-		return geometryId;
-	}
-
 	@Override
 	public String toString() {
-		return "TooFewPolygons [geometryId=" + geometryId + "]";
+		return "TooFewPolygons [geometryId=" + getGeometryId() + "]";
 	}
 
 	@Override
 	public Object copy(CopyBuilder copyBuilder) {
 		return copyTo(new TooFewPolygons(), copyBuilder);
 	}
-
-	@Override
-	public void accept(FeatureVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(FeatureFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
-	@Override
-	public void accept(GMLVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(GMLFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
 }

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

@@ -18,17 +18,11 @@ package de.hft.stuttgart.quality.model;
 import java.time.ZonedDateTime;
 
 import org.citygml4j.builder.copy.CopyBuilder;
-import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
-import org.citygml4j.model.common.visitor.FeatureFunctor;
-import org.citygml4j.model.common.visitor.FeatureVisitor;
-import org.citygml4j.model.common.visitor.GMLFunctor;
-import org.citygml4j.model.common.visitor.GMLVisitor;
-import org.citygml4j.model.gml.feature.AbstractFeature;
 
 import de.hft.stuttgart.quality.model.jaxb.Statistics;
 import de.hft.stuttgart.quality.model.jaxb.ValidationPlan;
 
-public class Validation extends AbstractFeature implements ADEModelObject {
+public class Validation extends ChildObject {
 
 	private static final long serialVersionUID = 1738293574859506005L;
 	
@@ -82,7 +76,6 @@ public class Validation extends AbstractFeature implements ADEModelObject {
 		return validationDate;
 	}
 	
-	
 	public void setValidationSoftware(String validationSoftware) {
 		this.validationSoftware = validationSoftware;
 	}
@@ -90,24 +83,4 @@ public class Validation extends AbstractFeature implements ADEModelObject {
 	public String getValidationSoftware() {
 		return validationSoftware;
 	}
-
-	@Override
-	public void accept(FeatureVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(FeatureFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
-
-	@Override
-	public void accept(GMLVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public <T> T accept(GMLFunctor<T> visitor) {
-		return visitor.apply(this);
-	}
 }

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

@@ -15,8 +15,7 @@
  */
 package de.hft.stuttgart.quality.model;
 
-import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
-
-public interface ValidationError extends ADEModelObject {
-
+public abstract class ValidationError extends ChildObject {
+	
+	private static final long serialVersionUID = -2995694676938108325L;
 }

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

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

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

@@ -18,7 +18,7 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "SE_ATTRIBUTE_MISSING")
-public class AttributeMissingType extends ValidationErrorType {
+public class AttributeMissingType extends SemanticErrorType {
 	
 	private String childId;
 	private String attributeName;

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

@@ -18,7 +18,7 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "SE_ATTRIBUTE_WRONG_VALUE")
-public class AttributeWrongValueType extends ValidationErrorType {
+public class AttributeWrongValueType extends SemanticErrorType {
 
 	private String childId;
 	private String attributeName;

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

@@ -20,20 +20,11 @@ import javax.xml.bind.annotation.XmlRootElement;
 import net.opengis.gml.DirectPositionType;
 
 @XmlRootElement(name = "GE_R_CONSECUTIVE_POINTS_SAME")
-public class ConsecutivePointsSameType extends ValidationErrorType {
+public class ConsecutivePointsSameType extends RingErrorType {
 	
-	private String linearRingId;
 	private DirectPositionType vertex1;
 	private DirectPositionType vertex2;
 	
-	public String getLinearRingId() {
-		return linearRingId;
-	}
-	
-	public void setLinearRingId(String linearRingId) {
-		this.linearRingId = linearRingId;
-	}
-	
 	public void setVertex1(DirectPositionType vertex1) {
 		this.vertex1 = vertex1;
 	}
@@ -52,7 +43,7 @@ public class ConsecutivePointsSameType extends ValidationErrorType {
 
 	@Override
 	public String toString() {
-		return "ConsecutivePointsSameType [linearRingId=" + linearRingId + ", vertex1=" + vertex1 + ", vertex2=" + vertex2
+		return "ConsecutivePointsSameType [linearRingId=" + getLinearRingId() + ", vertex1=" + vertex1 + ", vertex2=" + vertex2
 				+ "]";
 	}
 

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

@@ -18,23 +18,14 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_P_HOLE_OUTSIDE")
-public class HoleOutsideType extends ValidationErrorType {
+public class HoleOutsideType 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/InnerRingsNestedType.java

@@ -18,16 +18,11 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_P_INNER_RINGS_NESTED")
-public class InnerRingsNestedType extends ValidationErrorType {
+public class InnerRingsNestedType extends PolygonErrorType {
 
-	private String polygonId;
 	private String linearRingId1;
 	private String linearRingId2;
 
-	public void setPolygonId(String polygonId) {
-		this.polygonId = polygonId;
-	}
-
 	public void setLinearRingId1(String linearRingId1) {
 		this.linearRingId1 = linearRingId1;
 	}
@@ -36,10 +31,6 @@ public class InnerRingsNestedType extends ValidationErrorType {
 		this.linearRingId2 = linearRingId2;
 	}
 
-	public String getPolygonId() {
-		return polygonId;
-	}
-
 	public String getLinearRingId1() {
 		return linearRingId1;
 	}

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

@@ -18,16 +18,6 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_P_INTERIOR_DISCONNECTED")
-public class InteriorDisconnectedType extends ValidationErrorType {
-	
-	private String polygonId;
-	
-	public void setPolygonId(String polygonId) {
-		this.polygonId = polygonId;
-	}
-	
-	public String getPolygonId() {
-		return polygonId;
-	}
+public class InteriorDisconnectedType extends PolygonErrorType {
 
 }

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

@@ -18,20 +18,11 @@ package de.hft.stuttgart.quality.model.jaxb;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_P_INTERSECTING_RINGS")
-public class IntersectingRingsType extends ValidationErrorType {
+public class IntersectingRingsType extends PolygonErrorType {
 
-	private String polygonId;
 	private String linearRingId1;
 	private String linearRingId2;
 
-	public void setPolygonId(String polygonId) {
-		this.polygonId = polygonId;
-	}
-
-	public String getPolygonId() {
-		return polygonId;
-	}
-
 	public void setLinearRingId1(String linearRingId1) {
 		this.linearRingId1 = linearRingId1;
 	}

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

@@ -23,22 +23,12 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "GE_S_MULTIPLE_CONNECTED_COMPONENTS")
-public class MultipleConnectedComponentsType extends ValidationErrorType {
-	
-	private String geometryId;
+public class MultipleConnectedComponentsType extends SolidErrorType {
 	
 	@XmlElementWrapper
 	@XmlElement(name = "component")
 	private List<Component> components;
 	
-	public void setGeometryId(String geometryId) {
-		this.geometryId = geometryId;
-	}
-	
-	public String getGeometryId() {
-		return geometryId;
-	}
-	
 	public boolean isSetComponents() {
 		return components != null && !components.isEmpty();
 	}