Skip to content
GitLab
Commit 0d5ebbdf authored by Riegel's avatar Riegel
Browse files

Refactor: Rename AbstractCheck

parent 1be58aea
Pipeline #11115 passed with stage
in 1 minute and 26 seconds
Hide whitespace changes
Inline Side-by-side
CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GeometryTest.java
View file @ 0d5ebbdf
...@@ -32,8 +32,8 @@ import static org.mockito.Mockito.when; ...@@ -32,8 +32,8 @@ import static org.mockito.Mockito.when;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import de.hft.stuttgart.citydoctor2.check.AbstractCheck; import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
import de.hft.stuttgart.citydoctor2.utils.visitors.ClearCheckResultsVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor;
import org.citygml4j.core.model.construction.AbstractConstructionSurface; import org.citygml4j.core.model.construction.AbstractConstructionSurface;
import org.citygml4j.core.model.construction.WallSurface; import org.citygml4j.core.model.construction.WallSurface;
import org.citygml4j.core.util.geometry.GeometryFactory; import org.citygml4j.core.util.geometry.GeometryFactory;
...@@ -63,7 +63,7 @@ public class GeometryTest { ...@@ -63,7 +63,7 @@ public class GeometryTest {
geom.addPolygon(mockPolygon); geom.addPolygon(mockPolygon);
AbstractCheck c = new AbstractCheck() { AbstractVisitor c = new AbstractVisitor() {
}; };
geom.accept(c); geom.accept(c);
...@@ -300,7 +300,7 @@ public class GeometryTest { ...@@ -300,7 +300,7 @@ public class GeometryTest {
Polygon p = mock(Polygon.class); Polygon p = mock(Polygon.class);
geom.addPolygon(p); geom.addPolygon(p);
geom.clearAllContainedCheckResults(); geom.clearAllContainedCheckResults();
verify(p).accept(any(ClearCheckResultsVisitor.class)); verify(p).accept(any(ClearVisitorResultsVisitor.class));
assertFalse(geom.containsError(CheckId.C_GE_P_HOLE_OUTSIDE)); assertFalse(geom.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
} }
......
CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryTest.java
View file @ 0d5ebbdf
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.AbstractVisitor;
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;
...@@ -150,7 +150,7 @@ public class ImplicitGeometryTest { ...@@ -150,7 +150,7 @@ public class ImplicitGeometryTest {
AtomicInteger loCounter = new AtomicInteger(0); AtomicInteger loCounter = new AtomicInteger(0);
AbstractCheck c = new AbstractCheck() { AbstractVisitor c = new AbstractVisitor() {
@Override @Override
public void check(Polygon lo) { public void check(Polygon lo) {
loCounter.incrementAndGet(); loCounter.incrementAndGet();
......
CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObjectTest.java
View file @ 0d5ebbdf
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.AbstractVisitor;
import org.citygml4j.core.model.relief.ReliefFeature; import org.citygml4j.core.model.relief.ReliefFeature;
import org.junit.Test; import org.junit.Test;
...@@ -16,7 +16,7 @@ public class ReliefObjectTest { ...@@ -16,7 +16,7 @@ public class ReliefObjectTest {
TinObject mockTin = mock(TinObject.class); TinObject mockTin = mock(TinObject.class);
relief.addComponent(mockTin); relief.addComponent(mockTin);
AbstractCheck c = new AbstractCheck() { AbstractVisitor c = new AbstractVisitor() {
}; };
relief.accept(c); relief.accept(c);
......
CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TinObjectTest.java
View file @ 0d5ebbdf
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.AbstractVisitor;
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 TinObjectTest { ...@@ -32,7 +32,7 @@ public class TinObjectTest {
tin.addGeometry(mockGeometry); tin.addGeometry(mockGeometry);
AbstractCheck c = new AbstractCheck() { AbstractVisitor c = new AbstractVisitor() {
}; };
tin.accept(c); tin.accept(c);
......
CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeatureTest.java
View file @ 0d5ebbdf
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.AbstractVisitor;
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;
...@@ -54,7 +54,7 @@ public class TopLevelTransportFeatureTest { ...@@ -54,7 +54,7 @@ public class TopLevelTransportFeatureTest {
top.addSection(mockSection); top.addSection(mockSection);
top.addIntersection(mockIntersection); top.addIntersection(mockIntersection);
AbstractCheck c = new AbstractCheck() { AbstractVisitor c = new AbstractVisitor() {
}; };
top.accept(c); top.accept(c);
......
CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceTest.java
View file @ 0d5ebbdf
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.AbstractVisitor;
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;
import de.hft.stuttgart.citydoctor2.check.ResultStatus; import de.hft.stuttgart.citydoctor2.check.ResultStatus;
import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
import de.hft.stuttgart.citydoctor2.utils.visitors.ClearCheckResultsVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor;
import org.citygml4j.core.model.core.AbstractSpaceBoundary; import org.citygml4j.core.model.core.AbstractSpaceBoundary;
import org.citygml4j.core.model.core.AbstractUnoccupiedSpace; import org.citygml4j.core.model.core.AbstractUnoccupiedSpace;
import org.citygml4j.core.model.deprecated.core.DeprecatedPropertiesOfAbstractCityObject; import org.citygml4j.core.model.deprecated.core.DeprecatedPropertiesOfAbstractCityObject;
...@@ -37,7 +37,7 @@ public class TrafficSpaceTest { ...@@ -37,7 +37,7 @@ public class TrafficSpaceTest {
TrafficAreaObject areaMock = mock(TrafficAreaObject.class); TrafficAreaObject areaMock = mock(TrafficAreaObject.class);
tso.addTrafficArea(areaMock); tso.addTrafficArea(areaMock);
AbstractCheck c = new AbstractCheck() { AbstractVisitor c = new AbstractVisitor() {
}; };
tso.accept(c); tso.accept(c);
...@@ -91,7 +91,7 @@ public class TrafficSpaceTest { ...@@ -91,7 +91,7 @@ public class TrafficSpaceTest {
tso.clearAllContainedCheckResults(); tso.clearAllContainedCheckResults();
assertFalse(tso.containsError(CheckId.C_GE_P_HOLE_OUTSIDE)); assertFalse(tso.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
verify(taMock).accept(any(ClearCheckResultsVisitor.class)); verify(taMock).accept(any(ClearVisitorResultsVisitor.class));
} }
@Test @Test
......
CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationSpaceTest.java
View file @ 0d5ebbdf
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.AbstractVisitor;
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() { AbstractVisitor c = new AbstractVisitor() {
}; };
space.accept(c); space.accept(c);
......
CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/WaterTest.java
View file @ 0d5ebbdf
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.AbstractVisitor;
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() { AbstractVisitor c = new AbstractVisitor() {
}; };
water.accept(c); water.accept(c);
......
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/Renderer.java
View file @ 0d5ebbdf
...@@ -14,6 +14,7 @@ import de.hft.stuttgart.citydoctor2.gui.tree.node.PolygonNode; ...@@ -14,6 +14,7 @@ import de.hft.stuttgart.citydoctor2.gui.tree.node.PolygonNode;
import de.hft.stuttgart.citydoctor2.gui.tree.node.VertexNode; import de.hft.stuttgart.citydoctor2.gui.tree.node.VertexNode;
import de.hft.stuttgart.citydoctor2.math.Triangle3d; import de.hft.stuttgart.citydoctor2.math.Triangle3d;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.scene.CacheHint;
import javafx.scene.control.TreeItem; import javafx.scene.control.TreeItem;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.shape.CullFace; import javafx.scene.shape.CullFace;
...@@ -467,6 +468,8 @@ public class Renderer { ...@@ -467,6 +468,8 @@ public class Renderer {
Platform.runLater(() -> { Platform.runLater(() -> {
mainWindow.getMeshGroup().getChildren().clear(); mainWindow.getMeshGroup().getChildren().clear();
mainWindow.getMeshGroup().getChildren().addAll(currentTriGeom.getMeshes()); mainWindow.getMeshGroup().getChildren().addAll(currentTriGeom.getMeshes());
mainWindow.getMeshGroup().setCache(true);
mainWindow.getMeshGroup().setCacheHint(CacheHint.SPEED);
}); });
mainWindow.getGridButton().setDisable(false); mainWindow.getGridButton().setDisable(false);
mainWindow.getCullingButton().setDisable(false); mainWindow.getCullingButton().setDisable(false);
......
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/TriangulatedGeometry.java
View file @ 0d5ebbdf
...@@ -8,6 +8,7 @@ import de.hft.stuttgart.citydoctor2.math.Triangle3d; ...@@ -8,6 +8,7 @@ import de.hft.stuttgart.citydoctor2.math.Triangle3d;
import de.hft.stuttgart.citydoctor2.math.UnitVector3d; import de.hft.stuttgart.citydoctor2.math.UnitVector3d;
import de.hft.stuttgart.citydoctor2.math.Vector3d; import de.hft.stuttgart.citydoctor2.math.Vector3d;
import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon; import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon;
import javafx.scene.CacheHint;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.paint.PhongMaterial; import javafx.scene.paint.PhongMaterial;
import javafx.scene.shape.*; import javafx.scene.shape.*;
...@@ -67,6 +68,8 @@ public class TriangulatedGeometry { ...@@ -67,6 +68,8 @@ public class TriangulatedGeometry {
MeshView view = new MeshView(triMesh); MeshView view = new MeshView(triMesh);
view.setUserData(new PolygonClickDispatcher(p)); view.setUserData(new PolygonClickDispatcher(p));
view.setCache(true);
view.setCacheHint(CacheHint.SPEED);
PhongMaterial mat = triGeom.calculateMaterial(p, basePolygonColor); PhongMaterial mat = triGeom.calculateMaterial(p, basePolygonColor);
triGeom.materials.add(mat); triGeom.materials.add(mat);
......
CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healer/Healer.java
View file @ 0d5ebbdf
...@@ -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.AbstractVisitor;
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 AbstractVisitor() {
@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++) {
......
CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healing/HealMissingSolid.java
View file @ 0d5ebbdf
...@@ -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.AbstractVisitor;
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() { AbstractVisitor polygonCheck = new AbstractVisitor() {
@Override @Override
public void check(Polygon p) { public void check(Polygon p) {
if (!p.isLink()) { if (!p.isLink()) {
......
CityDoctorParent/Extensions/CityDoctorHealer/src/test/java/de/hft/stuttgart/citydoctor2/healing/bht/TestExample.java
View file @ 0d5ebbdf
...@@ -6,7 +6,7 @@ import java.util.HashSet; ...@@ -6,7 +6,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import de.hft.stuttgart.citydoctor2.check.AbstractCheck; import de.hft.stuttgart.citydoctor2.check.AbstractVisitor;
import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration; import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration;
import de.hft.stuttgart.citydoctor2.datastructure.Building; import de.hft.stuttgart.citydoctor2.datastructure.Building;
import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel; import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel;
...@@ -28,7 +28,7 @@ public class TestExample { ...@@ -28,7 +28,7 @@ public class TestExample {
// filter duplicate polygons out // filter duplicate polygons out
Set<ConcretePolygon> allBuildingPolygons = new HashSet<>(); Set<ConcretePolygon> allBuildingPolygons = new HashSet<>();
for (Building b : model.getBuildings()) { for (Building b : model.getBuildings()) {
b.accept(new AbstractCheck() { b.accept(new AbstractVisitor() {
public void check(Polygon poly) { public void check(Polygon poly) {
allBuildingPolygons.add(poly.getOriginal()); allBuildingPolygons.add(poly.getOriginal());
} }
......
CityDoctorParent/Extensions/CityDoctorHealerGenetic/src/test/java/de/hft/stuttgart/citydoctor2/healer/genetic/NonPlanarGenetic.java
View file @ 0d5ebbdf
...@@ -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.AbstractVisitor;
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 AbstractVisitor() {
@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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal