Commit bd8f73de authored by Matthias Betz's avatar Matthias Betz
Browse files

quality ade 0.1.4

No related merge requests found
Showing with 264 additions and 175 deletions
+264 -175
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -15,23 +15,31 @@ import org.xmlobjects.xml.Namespaces; ...@@ -15,23 +15,31 @@ import org.xmlobjects.xml.Namespaces;
import de.hft.stuttgart.quality.QualityADEModule; import de.hft.stuttgart.quality.QualityADEModule;
import de.hft.stuttgart.quality.model.types.AbstractPolygonError; import de.hft.stuttgart.quality.model.types.AbstractPolygonError;
public abstract class AbstractPolygonErrorAdapter<T extends AbstractPolygonError> extends AbstractGeometryErrorAdapter<T> { public abstract class AbstractPolygonErrorAdapter<T extends AbstractPolygonError>
extends AbstractGeometryErrorAdapter<T> {
@Override @Override
public void buildChildObject(AbstractPolygonError object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { public void buildChildObject(AbstractPolygonError object, QName name, Attributes attributes, XMLReader reader)
if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { throws ObjectBuildException, XMLReadException {
return; if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) {
} return;
switch (name.getLocalPart()) { }
case "polygonId" -> reader.getTextContent().ifPresent(object::setPolygonId); switch (name.getLocalPart()) {
default -> throw new IllegalStateException("Cannot handle name " + name + " when building AbstractPolygonError element"); case "polygonId":
} reader.getTextContent().ifPresent(object::setPolygonId);
} break;
default:
throw new IllegalStateException(
"Cannot handle name " + name + " when building AbstractPolygonError element");
}
}
@Override @Override
public void writeChildElements(AbstractPolygonError object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { public void writeChildElements(AbstractPolygonError object, Namespaces namespaces, XMLWriter writer)
if (object.getPolygonId() != null) { throws ObjectSerializeException, XMLWriteException {
writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "polygonId").addTextContent(object.getPolygonId())); if (object.getPolygonId() != null) {
} writer.writeElement(
} Element.of(QualityADEModule.NAMESPACE_URI, "polygonId").addTextContent(object.getPolygonId()));
}
}
} }
...@@ -15,22 +15,27 @@ import org.xmlobjects.xml.Namespaces; ...@@ -15,22 +15,27 @@ import org.xmlobjects.xml.Namespaces;
import de.hft.stuttgart.quality.QualityADEModule; import de.hft.stuttgart.quality.QualityADEModule;
import de.hft.stuttgart.quality.model.types.AbstractRingError; import de.hft.stuttgart.quality.model.types.AbstractRingError;
public abstract class AbstractRingErrorAdapter<T extends AbstractRingError> extends AbstractGeometryErrorAdapter<T> { public abstract class AbstractRingErrorAdapter<T extends AbstractRingError> extends AbstractGeometryErrorAdapter<T> {
@Override @Override
public void buildChildObject(AbstractRingError object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { public void buildChildObject(AbstractRingError object, QName name, Attributes attributes, XMLReader reader)
if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { throws ObjectBuildException, XMLReadException {
return; if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) {
} return;
switch (name.getLocalPart()) { }
case "linearRingId" -> reader.getTextContent().ifPresent(object::setLinearRingId); switch (name.getLocalPart()) {
} case "linearRingId":
} reader.getTextContent().ifPresent(object::setLinearRingId);
break;
}
}
@Override @Override
public void writeChildElements(AbstractRingError object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { public void writeChildElements(AbstractRingError object, Namespaces namespaces, XMLWriter writer)
if (object.getLinearRingId() != null) { throws ObjectSerializeException, XMLWriteException {
writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "linearRingId").addTextContent(object.getLinearRingId())); if (object.getLinearRingId() != null) {
} writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "linearRingId")
} .addTextContent(object.getLinearRingId()));
}
}
} }
...@@ -17,21 +17,27 @@ import de.hft.stuttgart.quality.model.types.AbstractSolidError; ...@@ -17,21 +17,27 @@ import de.hft.stuttgart.quality.model.types.AbstractSolidError;
public abstract class AbstractSolidErrorAdapter<T extends AbstractSolidError> extends AbstractGeometryErrorAdapter<T> { public abstract class AbstractSolidErrorAdapter<T extends AbstractSolidError> extends AbstractGeometryErrorAdapter<T> {
@Override @Override
public void buildChildObject(AbstractSolidError object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { public void buildChildObject(AbstractSolidError object, QName name, Attributes attributes, XMLReader reader)
if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { throws ObjectBuildException, XMLReadException {
return; if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) {
} return;
switch (name.getLocalPart()) { }
case "geometryId" -> reader.getTextContent().ifPresent(object::setGeometryId); switch (name.getLocalPart()) {
default -> throw new IllegalStateException("Cannot handle name " + name + " when building AbstractSolidError element"); case "geometryId":
} reader.getTextContent().ifPresent(object::setGeometryId);
} break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building AbstractSolidError element");
}
}
@Override @Override
public void writeChildElements(AbstractSolidError object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { public void writeChildElements(AbstractSolidError object, Namespaces namespaces, XMLWriter writer)
if (object.getGeometryId() != null) { throws ObjectSerializeException, XMLWriteException {
writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "geometryId").addTextContent(object.getGeometryId())); if (object.getGeometryId() != null) {
} writer.writeElement(
} Element.of(QualityADEModule.NAMESPACE_URI, "geometryId").addTextContent(object.getGeometryId()));
}
}
} }
...@@ -35,9 +35,11 @@ public class CheckingAdapter implements ObjectBuilder<Checking>, ObjectSerialize ...@@ -35,9 +35,11 @@ public class CheckingAdapter implements ObjectBuilder<Checking>, ObjectSerialize
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "featureType" -> reader.getTextContent() case "featureType":
.ifPresent(s -> object.setFeatureType(TopLevelFeatureType.valueOf(s))); reader.getTextContent().ifPresent(s -> object.setFeatureType(TopLevelFeatureType.valueOf(s)));
default -> throw new IllegalStateException("Cannot handle name " + name + " when building Checking element"); break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building Checking element");
} }
} }
......
...@@ -20,28 +20,36 @@ import de.hft.stuttgart.quality.adapter.properties.ValidationResultPropertyAdapt ...@@ -20,28 +20,36 @@ import de.hft.stuttgart.quality.adapter.properties.ValidationResultPropertyAdapt
import de.hft.stuttgart.quality.model.types.CityObjectProperties; import de.hft.stuttgart.quality.model.types.CityObjectProperties;
@XMLElement(name = "validationResult", namespaceURI = QualityADEModule.NAMESPACE_URI) @XMLElement(name = "validationResult", namespaceURI = QualityADEModule.NAMESPACE_URI)
public class CityObjectPropertiesAdapter implements ObjectBuilder<CityObjectProperties>, ObjectSerializer<CityObjectProperties> { public class CityObjectPropertiesAdapter
implements ObjectBuilder<CityObjectProperties>, ObjectSerializer<CityObjectProperties> {
@Override @Override
public CityObjectProperties createObject(QName name, Object parent) throws ObjectBuildException { public CityObjectProperties createObject(QName name, Object parent) throws ObjectBuildException {
return new CityObjectProperties(); return new CityObjectProperties();
} }
@Override @Override
public void buildChildObject(CityObjectProperties object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { public void buildChildObject(CityObjectProperties object, QName name, Attributes attributes, XMLReader reader)
if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { throws ObjectBuildException, XMLReadException {
return; if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) {
} return;
switch (name.getLocalPart()) { }
case "ValidationResult" -> object.setValidationResult(reader.getObjectUsingBuilder(ValidationResultPropertyAdapter.class)); switch (name.getLocalPart()) {
default -> throw new IllegalStateException("Cannot handle name " + name + " when building CityObjectProperties element"); case "ValidationResult":
} object.setValidationResult(reader.getObjectUsingBuilder(ValidationResultPropertyAdapter.class));
} break;
default:
throw new IllegalStateException(
"Cannot handle name " + name + " when building CityObjectProperties element");
}
}
@Override @Override
public void writeChildElements(CityObjectProperties object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { public void writeChildElements(CityObjectProperties object, Namespaces namespaces, XMLWriter writer)
if (object.getValidationResult() != null) { throws ObjectSerializeException, XMLWriteException {
writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "validationResult"), object.getValidationResult(), ValidationResultPropertyAdapter.class, namespaces); if (object.getValidationResult() != null) {
} writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "validationResult"),
} object.getValidationResult(), ValidationResultPropertyAdapter.class, namespaces);
}
}
} }
...@@ -32,12 +32,17 @@ public class ConsecutivePointsSameErrorAdapter extends AbstractRingErrorAdapter< ...@@ -32,12 +32,17 @@ public class ConsecutivePointsSameErrorAdapter extends AbstractRingErrorAdapter<
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "vertex1" -> object.setVertex1(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); case "vertex1":
case "vertex2" -> object.setVertex2(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); object.setVertex1(reader.getObjectUsingBuilder(DirectPositionAdapter.class));
default -> super.buildChildObject(object, name, attributes, reader); break;
case "vertex2":
object.setVertex2(reader.getObjectUsingBuilder(DirectPositionAdapter.class));
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
@Override @Override
public Element createElement(ConsecutivePointsSameError object, Namespaces namespaces) public Element createElement(ConsecutivePointsSameError object, Namespaces namespaces)
throws ObjectSerializeException { throws ObjectSerializeException {
......
...@@ -22,35 +22,44 @@ import de.hft.stuttgart.quality.model.types.Edge; ...@@ -22,35 +22,44 @@ import de.hft.stuttgart.quality.model.types.Edge;
@XMLElement(name = "Edge", namespaceURI = QualityADEModule.NAMESPACE_URI) @XMLElement(name = "Edge", namespaceURI = QualityADEModule.NAMESPACE_URI)
public class EdgeAdapter implements ObjectBuilder<Edge>, ObjectSerializer<Edge> { public class EdgeAdapter implements ObjectBuilder<Edge>, ObjectSerializer<Edge> {
@Override @Override
public Edge createObject(QName name, Object parent) throws ObjectBuildException { public Edge createObject(QName name, Object parent) throws ObjectBuildException {
return new Edge(); return new Edge();
} }
@Override @Override
public void buildChildObject(Edge object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { public void buildChildObject(Edge object, QName name, Attributes attributes, XMLReader reader)
if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { throws ObjectBuildException, XMLReadException {
return; if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) {
} return;
switch (name.getLocalPart()) { }
case "from" -> object.setFrom(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); switch (name.getLocalPart()) {
case "to" -> object.setTo(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); case "from":
default -> throw new IllegalStateException("Cannot handle name " + name + " when building Edge element"); object.setFrom(reader.getObjectUsingBuilder(DirectPositionAdapter.class));
} break;
} case "to":
object.setTo(reader.getObjectUsingBuilder(DirectPositionAdapter.class));
@Override break;
public Element createElement(Edge object, Namespaces namespaces) throws ObjectSerializeException { default:
return Element.of(QualityADEModule.NAMESPACE_URI, "Edge"); throw new IllegalStateException("Cannot handle name " + name + " when building Edge element");
} }
}
@Override
public void writeChildElements(Edge object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { @Override
if (object.getFrom() != null) { public Element createElement(Edge object, Namespaces namespaces) throws ObjectSerializeException {
writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "from"), object.getFrom(), DirectPositionAdapter.class, namespaces); return Element.of(QualityADEModule.NAMESPACE_URI, "Edge");
} }
if (object.getTo() != null) {
writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "to"), object.getTo(), DirectPositionAdapter.class, namespaces); @Override
} public void writeChildElements(Edge object, Namespaces namespaces, XMLWriter writer)
} throws ObjectSerializeException, XMLWriteException {
if (object.getFrom() != null) {
writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "from"), object.getFrom(),
DirectPositionAdapter.class, namespaces);
}
if (object.getTo() != null) {
writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "to"), object.getTo(),
DirectPositionAdapter.class, namespaces);
}
}
} }
...@@ -35,11 +35,14 @@ public class EdgeListAdapter implements ObjectBuilder<EdgeList>, ObjectSerialize ...@@ -35,11 +35,14 @@ public class EdgeListAdapter implements ObjectBuilder<EdgeList>, ObjectSerialize
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "edge" -> object.getEdges().add(reader.getObjectUsingBuilder(EdgePropertyAdapter.class)); case "edge":
default -> throw new IllegalStateException("Cannot handle name " + name + " when building EdgeList element"); object.getEdges().add(reader.getObjectUsingBuilder(EdgePropertyAdapter.class));
break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building EdgeList element");
} }
} }
@Override @Override
public Element createElement(EdgeList object, Namespaces namespaces) throws ObjectSerializeException { public Element createElement(EdgeList object, Namespaces namespaces) throws ObjectSerializeException {
return Element.of(QualityADEModule.NAMESPACE_URI, "EdgeList"); return Element.of(QualityADEModule.NAMESPACE_URI, "EdgeList");
...@@ -49,7 +52,8 @@ public class EdgeListAdapter implements ObjectBuilder<EdgeList>, ObjectSerialize ...@@ -49,7 +52,8 @@ public class EdgeListAdapter implements ObjectBuilder<EdgeList>, ObjectSerialize
public void writeChildElements(EdgeList object, Namespaces namespaces, XMLWriter writer) public void writeChildElements(EdgeList object, Namespaces namespaces, XMLWriter writer)
throws ObjectSerializeException, XMLWriteException { throws ObjectSerializeException, XMLWriteException {
for (EdgeProperty edgeProp : object.getEdges()) { for (EdgeProperty edgeProp : object.getEdges()) {
writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "edge"), edgeProp, EdgePropertyAdapter.class, namespaces); writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "edge"), edgeProp,
EdgePropertyAdapter.class, namespaces);
} }
} }
} }
...@@ -34,12 +34,17 @@ public class ErrorAdapter implements ObjectBuilder<Error>, ObjectSerializer<Erro ...@@ -34,12 +34,17 @@ public class ErrorAdapter implements ObjectBuilder<Error>, ObjectSerializer<Erro
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "occurrences" -> reader.getTextContent().ifPresent(s -> object.setOccurrences(Integer.parseInt(s))); case "occurrences":
case "name" -> reader.getTextContent().ifPresent(s -> object.setName(ErrorId.valueOf(s))); reader.getTextContent().ifPresent(s -> object.setOccurrences(Integer.parseInt(s)));
default -> throw new IllegalStateException("Cannot handle name " + name + " when building Error element"); break;
case "name":
reader.getTextContent().ifPresent(s -> object.setName(ErrorId.valueOf(s)));
break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building Error element");
} }
} }
@Override @Override
public Element createElement(Error object, Namespaces namespaces) throws ObjectSerializeException { public Element createElement(Error object, Namespaces namespaces) throws ObjectSerializeException {
return Element.of(QualityADEModule.NAMESPACE_URI, "Error"); return Element.of(QualityADEModule.NAMESPACE_URI, "Error");
......
...@@ -34,13 +34,17 @@ public class FeatureStatisticsAdapter implements ObjectBuilder<FeatureStatistics ...@@ -34,13 +34,17 @@ public class FeatureStatisticsAdapter implements ObjectBuilder<FeatureStatistics
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "numChecked" -> reader.getTextContent().ifPresent(s -> object.setNumChecked(Integer.parseInt(s))); case "numChecked":
case "numErrors" -> reader.getTextContent().ifPresent(s -> object.setNumErrors(Integer.parseInt(s))); reader.getTextContent().ifPresent(s -> object.setNumChecked(Integer.parseInt(s)));
default -> throw new IllegalStateException( break;
"Cannot handle name " + name + " when building FeatureStatistics element"); case "numErrors":
reader.getTextContent().ifPresent(s -> object.setNumErrors(Integer.parseInt(s)));
break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building FeatureStatistics element");
} }
} }
@Override @Override
public Element createElement(FeatureStatistics object, Namespaces namespaces) throws ObjectSerializeException { public Element createElement(FeatureStatistics object, Namespaces namespaces) throws ObjectSerializeException {
return Element.of(QualityADEModule.NAMESPACE_URI, "FeatureStatistics"); return Element.of(QualityADEModule.NAMESPACE_URI, "FeatureStatistics");
......
...@@ -35,8 +35,11 @@ public class FilterAdapter implements ObjectBuilder<Filter>, ObjectSerializer<Fi ...@@ -35,8 +35,11 @@ public class FilterAdapter implements ObjectBuilder<Filter>, ObjectSerializer<Fi
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "checking" -> object.getChecking().add(reader.getObjectUsingBuilder(CheckingPropertyAdapter.class)); case "checking":
default -> throw new IllegalStateException("Cannot handle name " + name + " when building Filter element"); object.getChecking().add(reader.getObjectUsingBuilder(CheckingPropertyAdapter.class));
break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building Filter element");
} }
} }
......
...@@ -35,9 +35,11 @@ public class GlobalParametersAdapter implements ObjectBuilder<GlobalParameters>, ...@@ -35,9 +35,11 @@ public class GlobalParametersAdapter implements ObjectBuilder<GlobalParameters>,
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "parameter" -> object.getParameters().add(reader.getObjectUsingBuilder(ParameterPropertyAdapter.class)); case "parameter":
default -> throw new IllegalStateException( object.getParameters().add(reader.getObjectUsingBuilder(ParameterPropertyAdapter.class));
"Cannot handle name " + name + " when building GlobalParameters element"); break;
default:
throw new IllegalStateException("Cannot handle name " + name + " when building GlobalParameters element");
} }
} }
......
...@@ -31,11 +31,14 @@ public class HoleOutsideErrorAdapter extends AbstractPolygonErrorAdapter<HoleOut ...@@ -31,11 +31,14 @@ public class HoleOutsideErrorAdapter extends AbstractPolygonErrorAdapter<HoleOut
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "linearRingId" -> reader.getTextContent().ifPresent(object::setLinearRingId); case "linearRingId":
default -> super.buildChildObject(object, name, attributes, reader); reader.getTextContent().ifPresent(object::setLinearRingId);
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
@Override @Override
public Element createElement(HoleOutsideError object, Namespaces namespaces) throws ObjectSerializeException { public Element createElement(HoleOutsideError object, Namespaces namespaces) throws ObjectSerializeException {
return Element.of(QualityADEModule.NAMESPACE_URI, "GE_P_HOLE_OUTSIDE"); return Element.of(QualityADEModule.NAMESPACE_URI, "GE_P_HOLE_OUTSIDE");
...@@ -45,7 +48,7 @@ public class HoleOutsideErrorAdapter extends AbstractPolygonErrorAdapter<HoleOut ...@@ -45,7 +48,7 @@ public class HoleOutsideErrorAdapter extends AbstractPolygonErrorAdapter<HoleOut
public void writeChildElements(HoleOutsideError object, Namespaces namespaces, XMLWriter writer) public void writeChildElements(HoleOutsideError object, Namespaces namespaces, XMLWriter writer)
throws ObjectSerializeException, XMLWriteException { throws ObjectSerializeException, XMLWriteException {
super.writeChildElements(object, namespaces, writer); super.writeChildElements(object, namespaces, writer);
if (object.getLinearRingId() != null) { if (object.getLinearRingId() != null) {
writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "linearRingId") writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "linearRingId")
.addTextContent(object.getLinearRingId())); .addTextContent(object.getLinearRingId()));
......
...@@ -31,9 +31,14 @@ public class InnerRingsNestedErrorAdapter extends AbstractPolygonErrorAdapter<In ...@@ -31,9 +31,14 @@ public class InnerRingsNestedErrorAdapter extends AbstractPolygonErrorAdapter<In
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "linearRingId1" -> reader.getTextContent().ifPresent(object::setLinearRingId1); case "linearRingId1":
case "linearRingId2" -> reader.getTextContent().ifPresent(object::setLinearRingId2); reader.getTextContent().ifPresent(object::setLinearRingId1);
default -> super.buildChildObject(object, name, attributes, reader); break;
case "linearRingId2":
reader.getTextContent().ifPresent(object::setLinearRingId2);
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
......
...@@ -31,12 +31,17 @@ public class IntersectingRingsErrorAdapter extends AbstractPolygonErrorAdapter<I ...@@ -31,12 +31,17 @@ public class IntersectingRingsErrorAdapter extends AbstractPolygonErrorAdapter<I
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "linearRingId1" -> reader.getTextContent().ifPresent(object::setLinearRingId1); case "linearRingId1":
case "linearRingId2" -> reader.getTextContent().ifPresent(object::setLinearRingId2); reader.getTextContent().ifPresent(object::setLinearRingId1);
default -> super.buildChildObject(object, name, attributes, reader); break;
case "linearRingId2":
reader.getTextContent().ifPresent(object::setLinearRingId2);
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
@Override @Override
public Element createElement(IntersectingRingsError object, Namespaces namespaces) throws ObjectSerializeException { public Element createElement(IntersectingRingsError object, Namespaces namespaces) throws ObjectSerializeException {
return Element.of(QualityADEModule.NAMESPACE_URI, "GE_P_INTERSECTING_RINGS"); return Element.of(QualityADEModule.NAMESPACE_URI, "GE_P_INTERSECTING_RINGS");
...@@ -46,7 +51,7 @@ public class IntersectingRingsErrorAdapter extends AbstractPolygonErrorAdapter<I ...@@ -46,7 +51,7 @@ public class IntersectingRingsErrorAdapter extends AbstractPolygonErrorAdapter<I
public void writeChildElements(IntersectingRingsError object, Namespaces namespaces, XMLWriter writer) public void writeChildElements(IntersectingRingsError object, Namespaces namespaces, XMLWriter writer)
throws ObjectSerializeException, XMLWriteException { throws ObjectSerializeException, XMLWriteException {
super.writeChildElements(object, namespaces, writer); super.writeChildElements(object, namespaces, writer);
if (object.getLinearRingId1() != null) { if (object.getLinearRingId1() != null) {
writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "linearRingId1") writer.writeElement(Element.of(QualityADEModule.NAMESPACE_URI, "linearRingId1")
.addTextContent(object.getLinearRingId1())); .addTextContent(object.getLinearRingId1()));
......
...@@ -33,8 +33,11 @@ public class MultipleComponentsErrorAdapter extends AbstractSolidErrorAdapter<Mu ...@@ -33,8 +33,11 @@ public class MultipleComponentsErrorAdapter extends AbstractSolidErrorAdapter<Mu
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "component" -> object.getComponents().add(reader.getObjectUsingBuilder(PolygonIdListPropertyAdapter.class)); case "component":
default -> super.buildChildObject(object, name, attributes, reader); object.getComponents().add(reader.getObjectUsingBuilder(PolygonIdListPropertyAdapter.class));
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
......
...@@ -32,8 +32,11 @@ public class NonManifoldEdgeErrorAdapter extends AbstractSolidErrorAdapter<NonMa ...@@ -32,8 +32,11 @@ public class NonManifoldEdgeErrorAdapter extends AbstractSolidErrorAdapter<NonMa
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "edges" -> object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class)); case "edges":
default -> super.buildChildObject(object, name, attributes, reader); object.setEdges(reader.getObjectUsingBuilder(EdgeListPropertyAdapter.class));
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
......
...@@ -20,32 +20,38 @@ import de.hft.stuttgart.quality.model.types.NonManifoldVertexError; ...@@ -20,32 +20,38 @@ import de.hft.stuttgart.quality.model.types.NonManifoldVertexError;
@XMLElement(name = "GE_S_NON_MANIFOLD_VERTEX", namespaceURI = QualityADEModule.NAMESPACE_URI) @XMLElement(name = "GE_S_NON_MANIFOLD_VERTEX", namespaceURI = QualityADEModule.NAMESPACE_URI)
public class NonManifoldVertexErrorAdapter extends AbstractSolidErrorAdapter<NonManifoldVertexError> { public class NonManifoldVertexErrorAdapter extends AbstractSolidErrorAdapter<NonManifoldVertexError> {
@Override @Override
public NonManifoldVertexError createObject(QName name, Object parent) throws ObjectBuildException { public NonManifoldVertexError createObject(QName name, Object parent) throws ObjectBuildException {
return new NonManifoldVertexError(); return new NonManifoldVertexError();
} }
@Override @Override
public void buildChildObject(NonManifoldVertexError object, QName name, Attributes attributes, XMLReader reader) throws ObjectBuildException, XMLReadException { public void buildChildObject(NonManifoldVertexError object, QName name, Attributes attributes, XMLReader reader)
if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) { throws ObjectBuildException, XMLReadException {
return; if (!QualityADEModule.NAMESPACE_URI.equals(name.getNamespaceURI())) {
} return;
switch (name.getLocalPart()) { }
case "vertex" -> object.setVertex(reader.getObjectUsingBuilder(DirectPositionAdapter.class)); switch (name.getLocalPart()) {
default -> super.buildChildObject(object, name, attributes, reader); case "vertex":
} object.setVertex(reader.getObjectUsingBuilder(DirectPositionAdapter.class));
} break;
default:
@Override super.buildChildObject(object, name, attributes, reader);
public Element createElement(NonManifoldVertexError object, Namespaces namespaces) throws ObjectSerializeException { }
return Element.of(QualityADEModule.NAMESPACE_URI, "GE_S_NON_MANIFOLD_VERTEX"); }
}
@Override
@Override public Element createElement(NonManifoldVertexError object, Namespaces namespaces) throws ObjectSerializeException {
public void writeChildElements(NonManifoldVertexError object, Namespaces namespaces, XMLWriter writer) throws ObjectSerializeException, XMLWriteException { return Element.of(QualityADEModule.NAMESPACE_URI, "GE_S_NON_MANIFOLD_VERTEX");
super.writeChildElements(object, namespaces, writer); }
if (object.getVertex() != null) {
writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "vertex"), object.getVertex(), DirectPositionAdapter.class, namespaces); @Override
} public void writeChildElements(NonManifoldVertexError object, Namespaces namespaces, XMLWriter writer)
} throws ObjectSerializeException, XMLWriteException {
super.writeChildElements(object, namespaces, writer);
if (object.getVertex() != null) {
writer.writeElementUsingSerializer(Element.of(QualityADEModule.NAMESPACE_URI, "vertex"), object.getVertex(),
DirectPositionAdapter.class, namespaces);
}
}
} }
...@@ -31,11 +31,14 @@ public class OrientationRingsSameErrorAdapter extends AbstractPolygonErrorAdapte ...@@ -31,11 +31,14 @@ public class OrientationRingsSameErrorAdapter extends AbstractPolygonErrorAdapte
return; return;
} }
switch (name.getLocalPart()) { switch (name.getLocalPart()) {
case "linearRingId" -> reader.getTextContent().ifPresent(object::setLinearRing); case "linearRingId":
default -> super.buildChildObject(object, name, attributes, reader); reader.getTextContent().ifPresent(object::setLinearRing);
break;
default:
super.buildChildObject(object, name, attributes, reader);
} }
} }
@Override @Override
public Element createElement(OrientationRingsSameError object, Namespaces namespaces) public Element createElement(OrientationRingsSameError object, Namespaces namespaces)
throws ObjectSerializeException { throws ObjectSerializeException {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment