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 f9c6780b9de9a28bc43c980f59de2a48bf2a11a3..c547d6119ce71b95dc62163e85922c617c01bbb0 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 accept(FeatureFunctor visitor) { - return visitor.apply(this); - } - - @Override - public void accept(GMLVisitor visitor) { - visitor.visit(this); - } - - @Override - public T accept(GMLFunctor 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 e1fc8aa63cb4ab7ef9b866e06594358cde133cbc..cadc930f72c9fe568c3873f780c8a305e99c6d72 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 e8ef812dbbfe49ca1e2c7b4376716752ad3de550..af233c97ed5747347f605e10ebfba3e21ee6b566 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;