From da89b3a69d58cda0f41e1fd7dd27dd2076135549 Mon Sep 17 00:00:00 2001
From: Matthias Betz <matthias.betz@hft-stuttgart.de>
Date: Thu, 17 Jun 2021 16:04:09 +0200
Subject: [PATCH] removed unnecessary inheritance in java classes

---
 .../quality/model/ValidationResult.java       | 29 +------------------
 .../model/jaxb/ValidationResultType.java      |  7 +++--
 .../quality/model/jaxb/ValidationType.java    |  6 ++--
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/ValidationResult.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/ValidationResult.java
index f9c6780..c547d61 100644
--- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/ValidationResult.java
+++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/ValidationResult.java
@@ -19,16 +19,10 @@ 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;
 
 import de.hft.stuttgart.quality.model.jaxb.ResultType;
 
-public class ValidationResult extends AbstractFeature implements ADEModelObject {
+public class ValidationResult extends ChildObject {
 
 	private static final long serialVersionUID = 1180762313908627342L;
 	
@@ -60,25 +54,4 @@ public class ValidationResult extends AbstractFeature implements ADEModelObject
 		return copyTo(new ValidationResult(), 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);
-	}
-
-
 }
diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationResultType.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationResultType.java
index e1fc8aa..cadc930 100644
--- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationResultType.java
+++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationResultType.java
@@ -18,12 +18,13 @@ package de.hft.stuttgart.quality.model.jaxb;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElementRef;
 
-import net.opengis.gml.AbstractFeatureType;
-
-public class ValidationResultType extends AbstractFeatureType {
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ValidationResultType {
 
 	@XmlAttribute(name = "result")
 	private ResultType result;
diff --git a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationType.java b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationType.java
index e8ef812..af233c9 100644
--- a/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationType.java
+++ b/citygml4j-quality-ade/src/main/java/de/hft/stuttgart/quality/model/jaxb/ValidationType.java
@@ -17,14 +17,16 @@ package de.hft.stuttgart.quality.model.jaxb;
 
 import java.time.ZonedDateTime;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import de.hft.stuttgart.quality.marshaller.ZonedDateTimeAdapter;
-import net.opengis.gml.AbstractGMLType;
 
 @XmlType(name = "validation")
-public class ValidationType extends AbstractGMLType {
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ValidationType {
 
 	@XmlJavaTypeAdapter(ZonedDateTimeAdapter.class)
 	private ZonedDateTime validationDate;
-- 
GitLab