Commit b50c5f13 authored by Riegel's avatar Riegel
Browse files

Merge branch 'dev_visitor_rework' into 'dev'

Cleanup Visitor implementation

See merge request !33
parents e0e40fdd bc6e1817
Pipeline #11128 passed with stage
in 1 minute and 25 seconds
package de.hft.stuttgart.citydoctor2.datastructure; package de.hft.stuttgart.citydoctor2.datastructure;
import de.hft.stuttgart.citydoctor2.check.AbstractCheck; import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
import de.hft.stuttgart.citydoctor2.check.CheckError; import de.hft.stuttgart.citydoctor2.check.CheckError;
import de.hft.stuttgart.citydoctor2.check.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckId;
import de.hft.stuttgart.citydoctor2.check.CheckResult; import de.hft.stuttgart.citydoctor2.check.CheckResult;
...@@ -32,7 +32,7 @@ public class TransportationSpaceTest { ...@@ -32,7 +32,7 @@ public class TransportationSpaceTest {
space.addTrafficSpace(mockSpace); space.addTrafficSpace(mockSpace);
space.addAuxTrafficSpace(auxMockSpace); space.addAuxTrafficSpace(auxMockSpace);
AbstractCheck c = new AbstractCheck() { CheckableUtilsVisitor c = new CheckableUtilsVisitor() {
}; };
space.accept(c); space.accept(c);
......
package de.hft.stuttgart.citydoctor2.datastructure; package de.hft.stuttgart.citydoctor2.datastructure;
import de.hft.stuttgart.citydoctor2.check.AbstractCheck; import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
import de.hft.stuttgart.citydoctor2.check.CheckError; import de.hft.stuttgart.citydoctor2.check.CheckError;
import de.hft.stuttgart.citydoctor2.check.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckId;
import de.hft.stuttgart.citydoctor2.check.CheckResult; import de.hft.stuttgart.citydoctor2.check.CheckResult;
...@@ -33,7 +33,7 @@ public class WaterTest { ...@@ -33,7 +33,7 @@ public class WaterTest {
water.addBoundarySurface(bsMock); water.addBoundarySurface(bsMock);
water.addBoundarySurface(bsMock2); water.addBoundarySurface(bsMock2);
AbstractCheck c = new AbstractCheck() { CheckableUtilsVisitor c = new CheckableUtilsVisitor() {
}; };
water.accept(c); water.accept(c);
......
...@@ -26,7 +26,7 @@ import org.citygml4j.xml.writer.CityGMLWriteException; ...@@ -26,7 +26,7 @@ import org.citygml4j.xml.writer.CityGMLWriteException;
import org.citygml4j.xml.writer.CityGMLWriter; import org.citygml4j.xml.writer.CityGMLWriter;
import de.hft.stuttgart.citydoctor2.CityDoctorValidation; import de.hft.stuttgart.citydoctor2.CityDoctorValidation;
import de.hft.stuttgart.citydoctor2.check.AbstractCheck; import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
import de.hft.stuttgart.citydoctor2.check.CheckError; import de.hft.stuttgart.citydoctor2.check.CheckError;
import de.hft.stuttgart.citydoctor2.check.Checker; import de.hft.stuttgart.citydoctor2.check.Checker;
import de.hft.stuttgart.citydoctor2.check.HealingMethod; import de.hft.stuttgart.citydoctor2.check.HealingMethod;
...@@ -353,7 +353,7 @@ public class Healer { ...@@ -353,7 +353,7 @@ public class Healer {
private void filterOutDuplicateVertices(CityObject co) { private void filterOutDuplicateVertices(CityObject co) {
Map<Vertex, Vertex> map = new HashMap<>(); Map<Vertex, Vertex> map = new HashMap<>();
co.accept(new AbstractCheck() { co.accept(new CheckableUtilsVisitor() {
@Override @Override
public void check(LinearRing ring) { public void check(LinearRing ring) {
for (int i = 0; i < ring.getVertices().size(); i++) { for (int i = 0; i < ring.getVertices().size(); i++) {
......
...@@ -24,7 +24,7 @@ import java.util.List; ...@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import de.hft.stuttgart.citydoctor2.check.AbstractCheck; import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
import de.hft.stuttgart.citydoctor2.check.HealingID; import de.hft.stuttgart.citydoctor2.check.HealingID;
import de.hft.stuttgart.citydoctor2.check.HealingMethod; import de.hft.stuttgart.citydoctor2.check.HealingMethod;
import de.hft.stuttgart.citydoctor2.check.ModificationListener; import de.hft.stuttgart.citydoctor2.check.ModificationListener;
...@@ -103,7 +103,7 @@ public class HealMissingSolid implements HealingMethod { ...@@ -103,7 +103,7 @@ public class HealMissingSolid implements HealingMethod {
private List<Polygon> collectPolygons(CityObject co) { private List<Polygon> collectPolygons(CityObject co) {
List<Polygon> polygons = new ArrayList<>(); List<Polygon> polygons = new ArrayList<>();
AbstractCheck polygonCheck = new AbstractCheck() { CheckableUtilsVisitor polygonCheck = new CheckableUtilsVisitor() {
@Override @Override
public void check(Polygon p) { public void check(Polygon p) {
if (!p.isLink()) { if (!p.isLink()) {
......
...@@ -36,10 +36,8 @@ import java.util.Map.Entry; ...@@ -36,10 +36,8 @@ import java.util.Map.Entry;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
import org.junit.Test;
import Jama.EigenvalueDecomposition; import Jama.EigenvalueDecomposition;
import de.hft.stuttgart.citydoctor2.check.AbstractCheck; import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor;
import de.hft.stuttgart.citydoctor2.check.CheckError; import de.hft.stuttgart.citydoctor2.check.CheckError;
import de.hft.stuttgart.citydoctor2.check.Checker; import de.hft.stuttgart.citydoctor2.check.Checker;
import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration; import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration;
...@@ -448,7 +446,7 @@ public class NonPlanarGenetic { ...@@ -448,7 +446,7 @@ public class NonPlanarGenetic {
private Polygon findPolygonInFeature(CityObject copy, Polygon polygon) { private Polygon findPolygonInFeature(CityObject copy, Polygon polygon) {
Polygon[] result = new Polygon[1]; Polygon[] result = new Polygon[1];
copy.accept(new AbstractCheck() { copy.accept(new CheckableUtilsVisitor() {
@Override @Override
public void check(Polygon p) { public void check(Polygon p) {
......
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