diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/AbstractCheck.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/AbstractCheck.java deleted file mode 100644 index 7910cdb0fd92052a1b9f80b26e262926b6326d70..0000000000000000000000000000000000000000 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/AbstractCheck.java +++ /dev/null @@ -1,60 +0,0 @@ -/*- - * Copyright 2020 Beuth Hochschule für Technik Berlin, Hochschule für Technik Stuttgart - * - * This file is part of CityDoctor2. - * - * CityDoctor2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * CityDoctor2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with CityDoctor2. If not, see . - */ -package de.hft.stuttgart.citydoctor2.check; - -import java.util.Collections; -import java.util.Set; - -/** - * - * This class serves as a Parent for non-validating checks that want to use the CheckEngine's Visitor-pattern for the - * implementation of utility functions like e.g. collecting the sub-CityObjects in a Feature. - * - * - * @author Matthias Betz - * - */ -public abstract class AbstractCheck extends Check { - - @Override - public Set appliesToRequirements() { - return Collections.emptySet(); - } - - @Override - public CheckId getCheckId() { - return null; - } - - @Override - public RequirementType getType() { - return null; - } - - @Override - public Check createNewInstance() { - return null; - } - - @Override - public final boolean isValidator() { - return false; - } - -} diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Check.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Check.java index a50d6bcfbc5dc0b64a7ea4c3f8dd9ec62f404499..e81369a1496db63586c44fad4181c7e0ae6bf1dc 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Check.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Check.java @@ -49,7 +49,7 @@ import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; * @author Matthias Betz * */ -public abstract class Check { +public abstract non-sealed class Check implements CheckableVisitor { private final List> applicableToClasses = new ArrayList<>(2); @@ -67,11 +67,6 @@ public abstract class Check { } } - /** - * Returns all classes for which the check needs to be executed - * - * @return a list of classes which the check applies to - */ public List> getApplicableToClasses() { return applicableToClasses; } @@ -108,22 +103,21 @@ public abstract class Check { * * @return true if it validates, false otherwise */ + @Override public boolean isValidator() { return true; } /** - * Checks whether the check can be executed on this checkable, meaning the - * checkable or its content can not have any error of any check dependent on - * this check.
- * If the check cannot be executed a CheckResult will be created with the + * Checks whether this Check can execute on the Checkable, meaning the Checkable contains no error from + * this Check's dependencies and is applicable to this Check.
+ * If the check cannot be executed due to not fulfilling the dependencies a CheckResult will be created with the * ResultStatus = DEPENDENCIES_NOT_MET. - * + * * @param c the checkable - * @param crc container for all check results - * @return true if the check can be executed, false if the checkable itself or - * one of its containing checkables have an error. + * @return true if the check can be executed, false otherwise */ + @Override public boolean canExecute(Checkable c) { // ignore objects where this check doesn't apply to if (!canBeApplied(c)) { diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Checkable.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Checkable.java index eee6292b740b02a30cc93eb80fe95a3af61868b4..c9b941243b99b37ea58449057e8fe05e416762bd 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Checkable.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Checkable.java @@ -26,7 +26,7 @@ import java.util.Map; import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound; import de.hft.stuttgart.citydoctor2.utils.visitors.CheckableErrorCollector; -import de.hft.stuttgart.citydoctor2.utils.visitors.ClearCheckResultsVisitor; +import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.ClearMetaInformationVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsAnyErrorVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsErrorVisitor; @@ -74,7 +74,7 @@ public abstract class Checkable implements Serializable { * @param c the check from which the check method is called with the Checkable * instance as parameter. */ - public void accept(Check c) { + public void accept(CheckableVisitor c) { if (c.canExecute(this)) { c.check(this); } @@ -232,7 +232,7 @@ public abstract class Checkable implements Serializable { * Clears the checkResults list of this checkable and all child objects in its datastructure. */ public final void clearAllContainedCheckResults() { - this.accept(new ClearCheckResultsVisitor()); + this.accept(new ClearVisitorResultsVisitor()); } /** diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/CheckableUtilsVisitor.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/CheckableUtilsVisitor.java new file mode 100644 index 0000000000000000000000000000000000000000..0034c8c093c7cd4691deb8f0dfe9dbcbde915525 --- /dev/null +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/CheckableUtilsVisitor.java @@ -0,0 +1,168 @@ +/*- + * Copyright 2020 Beuth Hochschule für Technik Berlin, Hochschule für Technik Stuttgart + * + * This file is part of CityDoctor2. + * + * CityDoctor2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * CityDoctor2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with CityDoctor2. If not, see . + */ +package de.hft.stuttgart.citydoctor2.check; + +import de.hft.stuttgart.citydoctor2.datastructure.AbstractBuilding; +import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface; +import de.hft.stuttgart.citydoctor2.datastructure.BridgeObject; +import de.hft.stuttgart.citydoctor2.datastructure.Building; +import de.hft.stuttgart.citydoctor2.datastructure.BuildingPart; +import de.hft.stuttgart.citydoctor2.datastructure.CityFurniture; +import de.hft.stuttgart.citydoctor2.datastructure.CityObject; +import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject; +import de.hft.stuttgart.citydoctor2.datastructure.Geometry; +import de.hft.stuttgart.citydoctor2.datastructure.Installation; +import de.hft.stuttgart.citydoctor2.datastructure.LandObject; +import de.hft.stuttgart.citydoctor2.datastructure.LinearRing; +import de.hft.stuttgart.citydoctor2.datastructure.Opening; +import de.hft.stuttgart.citydoctor2.datastructure.Polygon; +import de.hft.stuttgart.citydoctor2.datastructure.ReliefObject; +import de.hft.stuttgart.citydoctor2.datastructure.TinObject; +import de.hft.stuttgart.citydoctor2.datastructure.TransportationObject; +import de.hft.stuttgart.citydoctor2.datastructure.Vegetation; +import de.hft.stuttgart.citydoctor2.datastructure.WaterObject; + +/** + * + * This class serves as the base for CheckableVisitors which fulfill utility functions, like e.g. collecting all + * sub-CityObjects in the datastructure of a CityObject. + *

+ * Visitors extending from this class will not change the validated-flag of the visited Checkables. + * + */ +public abstract non-sealed class CheckableUtilsVisitor implements CheckableVisitor { + + /** + * This function is used for checking of dependencies in {@link Check}. Since UtilsVisitors do not have + * dependencies this function will always return true. + * + * @param c a Checkable + * @return true + */ + @Override + public boolean canExecute(Checkable c) { + return true; + } + + @Override + public final boolean isValidator() { + return false; + } + + @Override + public void check(Checkable checkable) { + + } + + @Override + public void check(AbstractBuilding ab) { + + } + + @Override + public void check(BoundarySurface bs) { + + } + + @Override + public void check(BridgeObject bo) { + + } + + @Override + public void check(Building b) { + + } + + @Override + public void check(Installation bi) { + + } + + @Override + public void check(BuildingPart bp) { + + } + + @Override + public void check(CityObject co) { + + } + + @Override + public void check(LandObject lo) { + + } + + @Override + public void check(Opening o) { + + } + + @Override + public void check(TransportationObject to) { + + } + + @Override + public void check(Vegetation veg) { + + } + + @Override + public void check(WaterObject wo) { + + } + + @Override + public void check(Geometry geom) { + + } + + @Override + public void check(Polygon poly) { + + } + + @Override + public void check(LinearRing ring) { + + } + + @Override + public void check(TinObject tin) { + + } + + @Override + public void check(ReliefObject relief) { + + } + + @Override + public void check(CityFurniture cf) { + + } + + @Override + public void check(GenericCityObject gco) { + + } + +} diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/CheckableVisitor.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/CheckableVisitor.java new file mode 100644 index 0000000000000000000000000000000000000000..7830c5a8b155f3529bbae00a82b9640387d394b8 --- /dev/null +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/CheckableVisitor.java @@ -0,0 +1,72 @@ +package de.hft.stuttgart.citydoctor2.check; + +import de.hft.stuttgart.citydoctor2.datastructure.AbstractBuilding; +import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface; +import de.hft.stuttgart.citydoctor2.datastructure.BridgeObject; +import de.hft.stuttgart.citydoctor2.datastructure.Building; +import de.hft.stuttgart.citydoctor2.datastructure.BuildingPart; +import de.hft.stuttgart.citydoctor2.datastructure.CityFurniture; +import de.hft.stuttgart.citydoctor2.datastructure.CityObject; +import de.hft.stuttgart.citydoctor2.datastructure.GenericCityObject; +import de.hft.stuttgart.citydoctor2.datastructure.Geometry; +import de.hft.stuttgart.citydoctor2.datastructure.Installation; +import de.hft.stuttgart.citydoctor2.datastructure.LandObject; +import de.hft.stuttgart.citydoctor2.datastructure.LinearRing; +import de.hft.stuttgart.citydoctor2.datastructure.Opening; +import de.hft.stuttgart.citydoctor2.datastructure.Polygon; +import de.hft.stuttgart.citydoctor2.datastructure.ReliefObject; +import de.hft.stuttgart.citydoctor2.datastructure.TinObject; +import de.hft.stuttgart.citydoctor2.datastructure.TransportationObject; +import de.hft.stuttgart.citydoctor2.datastructure.Vegetation; +import de.hft.stuttgart.citydoctor2.datastructure.WaterObject; + +public sealed interface CheckableVisitor permits Check, CheckableUtilsVisitor { + + /** + * Returns whether a Checkable should be flagged as validated after accepting this Visitor. + */ + boolean isValidator(); + + boolean canExecute(Checkable c); + + void check(Checkable checkable); + + void check(AbstractBuilding ab); + + void check(BoundarySurface bs); + + void check(BridgeObject bo); + + void check(Building b); + + void check(Installation bi); + + void check(BuildingPart bp); + + void check(CityObject co); + + void check(LandObject lo); + + void check(Opening o); + + void check(TransportationObject to); + + void check(Vegetation veg); + + void check(WaterObject wo); + + void check(Geometry geom); + + void check(Polygon poly); + + void check(LinearRing ring); + + void check(TinObject tin); + + void check(ReliefObject relief); + + void check(CityFurniture cf); + + void check(GenericCityObject gco); + +} diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java index e1923eceb6234e8cadfe9767e15b799f4a910170..4d6029f9981f23af447fda6f5007582172c36584 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import org.apache.logging.log4j.LogManager; @@ -160,7 +160,7 @@ public abstract class AbstractBuilding extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingSubdivision.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingSubdivision.java index 6142cb32c2cd6a26d91fcca6b34096c6c5ea0c6d..7ada0f2da6b547898a084aa7d8dfa5258ba0ffab 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingSubdivision.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingSubdivision.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import org.apache.logging.log4j.LogManager; @@ -136,7 +136,7 @@ public abstract class AbstractBuildingSubdivision extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractFurniture.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractFurniture.java index 774ca2bb05336fb43a9eedea3104f53c4db87313..002ac4f745673758b63acf837316204099ddd0a4 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractFurniture.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractFurniture.java @@ -1,7 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; - +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -30,7 +29,7 @@ public abstract class AbstractFurniture extends CityObject { private org.citygml4j.core.model.construction.AbstractFurniture af; @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoom.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoom.java index 79c08f545924ce7a67ef9c2a40fc94d23d8522da..b656ae69af91189dad7c99e5df32a9cd7f98974b 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoom.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoom.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import org.citygml4j.core.model.core.AbstractCityObject; @@ -32,7 +32,7 @@ public abstract class AbstractRoom extends CityObject { @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnel.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnel.java index 7da0c979e13612276805cf9992745e11a77ab5bd..0ea9909b4e869189d04bc9aba2066f247b999a01 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnel.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnel.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -143,7 +143,7 @@ public abstract class AbstractTunnel extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurface.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurface.java index 977202495bc739068a722a7f52f225b8d0263be4..9fa5066c6b7917a93c983831d4a05b99df03c0c3 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurface.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurface.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -145,7 +145,7 @@ public class BoundarySurface extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeConstructiveElement.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeConstructiveElement.java index 6eeea1c765e72613d05934ece006d7c7cda32a22..01b892c7ed3621693eec2a2a020957d2d379ef79 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeConstructiveElement.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeConstructiveElement.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -95,7 +95,7 @@ public class BridgeConstructiveElement extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObject.java index 0fcad336f33239b1e06b2ffe4c3e58f6c63fe2a0..b87b232e05b2edcbb9c3d544dd78271b920c6ff1 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObject.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObject.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -191,7 +191,7 @@ public class BridgeObject extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Building.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Building.java index dcd6073e1fe457c49b8c1048f769514bc4e00282..f21df6e366ac701b09aa8697ccf270c402313fd8 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Building.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Building.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import org.citygml4j.core.model.building.BuildingInstallation; import org.citygml4j.core.model.building.BuildingInstallationProperty; import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty; @@ -45,7 +45,7 @@ public class Building extends AbstractBuilding { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingUnit.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingUnit.java index 9a9bd5c800b5710e87dea68ea9b13044ab589ccd..785d9cd62386861cfaed179cc01a8b8a6aded664 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingUnit.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingUnit.java @@ -1,8 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; -import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; -import org.citygml4j.core.util.geometry.GeometryFactory; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import java.io.Serial; import java.util.ArrayList; @@ -16,7 +14,7 @@ public class BuildingUnit extends AbstractBuildingSubdivision { private final List storeys = new ArrayList<>(); @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); for (Storey storey : storeys) { storey.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityDoctorModel.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityDoctorModel.java index 918188982eecb6b9b9fe7de5129f52190ef72f53..41b2b003f4b2a7581b20a263405e6c2db74b3d17 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityDoctorModel.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityDoctorModel.java @@ -18,8 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import de.hft.stuttgart.citydoctor2.check.CheckError; import de.hft.stuttgart.citydoctor2.exceptions.CityDoctorWriteException; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; @@ -147,7 +146,7 @@ public class CityDoctorModel { folder.mkdirs(); createFeatureStream().forEach(co -> { Map> polygonMap = new EnumMap<>(Lod.class); - Check c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { @Override public void check(Geometry geom) { diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityFurniture.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityFurniture.java index b92ace7b2ec77e6c31239f664cf73319637bd542..8e7002b21dc75065591209a7f9913d8e4f7bf879 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityFurniture.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityFurniture.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -21,7 +21,7 @@ public class CityFurniture extends CityObject { private org.citygml4j.core.model.cityfurniture.CityFurniture cgmlCityFurniture; @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityObject.java index 1291a8de7031c57beb110e577766374084b20628..19eadd874ac460a4f4cb566e23a8a9419416dd41 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityObject.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityObject.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.visitors.GmlGeometryRebuilder; import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor; @@ -185,7 +185,7 @@ public abstract class CityObject extends GmlElement { public abstract FeatureType getFeatureType(); @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ConcretePolygon.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ConcretePolygon.java index c5c99a5ee696c96f7c991dda086c80c6460880aa..3aa734d4137c7d9fdd6722527cbad5cb98b1f149 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ConcretePolygon.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ConcretePolygon.java @@ -18,8 +18,8 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; import de.hft.stuttgart.citydoctor2.check.Checkable; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.math.Vector3d; import de.hft.stuttgart.citydoctor2.tesselation.JoglTesselator; import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon; @@ -180,7 +180,7 @@ public class ConcretePolygon extends Polygon { * citydoctor2.check.Check) */ @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java index e55e63632570a659c01d3e36d31777d61fe24fe0..34a0d022d9975433061979ff8043e724dd38f5b8 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -33,7 +33,7 @@ public class GenericCityObject extends CityObject { private final List boundarySurfaceList = new ArrayList<>(); @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Geometry.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Geometry.java index 5525115c75dd5eea78e8bd82c69c7f37ca624956..fde39d1a816623551ea25e35452e482c3f075396 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Geometry.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Geometry.java @@ -18,8 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; - +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.math.Triangle3d; import de.hft.stuttgart.citydoctor2.math.Vector3d; import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon; @@ -206,7 +205,7 @@ public class Geometry extends GmlElement { @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryHolder.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryHolder.java index 49e07c810c006cfac294d3b9faf941390773d761..b5819762cd5cccb8ebcad9133eb2efb5647fa2fe 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryHolder.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryHolder.java @@ -1,13 +1,10 @@ package de.hft.stuttgart.citydoctor2.datastructure; import java.io.Serial; -import java.util.List; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import org.citygml4j.core.model.core.ImplicitGeometry; -import de.hft.stuttgart.citydoctor2.check.Check; -import de.hft.stuttgart.citydoctor2.check.CheckError; -import de.hft.stuttgart.citydoctor2.check.CheckId; import de.hft.stuttgart.citydoctor2.math.TransformationMatrix; /** @@ -58,7 +55,7 @@ public class ImplicitGeometryHolder extends Geometry { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { prototypeGeometry.accept(c); } diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Installation.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Installation.java index 7258df5ad410960fbc9663002f0a2d47e30c9148..cbe4459bd308c254bc6866860215da7fb96af105 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Installation.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Installation.java @@ -18,8 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; - +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -130,7 +129,7 @@ public class Installation extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LandObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LandObject.java index d4ab4acae72b4089e8638e17af97cff9776ba16b..d77b9e51fba1f90ab2a03369aad19d7deebe6894 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LandObject.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LandObject.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -89,7 +89,7 @@ public class LandObject extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinearRing.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinearRing.java index 2f48bcdce4039bd1e1d2bd97da1b8056c82da480..88d621670b860df72860d252edd6655e17cf2ea4 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinearRing.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinearRing.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.math.*; import java.io.Serial; @@ -226,7 +226,7 @@ public class LinearRing extends GmlElement { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinkedPolygon.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinkedPolygon.java index 1c940c1a0def4f5f1a4f898117485e1ce96f6114..c34adb1cc9d72ce0c6c8496a4da3654d308b00a6 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinkedPolygon.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinkedPolygon.java @@ -21,6 +21,7 @@ package de.hft.stuttgart.citydoctor2.datastructure; import de.hft.stuttgart.citydoctor2.check.Check; import de.hft.stuttgart.citydoctor2.check.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.math.Vector3d; import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon; import javafx.scene.paint.Color; @@ -105,7 +106,7 @@ public class LinkedPolygon extends Polygon { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { // linked polygons are not checked setValidated(true); } diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Opening.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Opening.java index 19990e966ff1710e74c22ffff6315bf9fc830791..b64487de6c20dc229d8e3f46debc50b5e2bc06e9 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Opening.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Opening.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -114,7 +114,7 @@ public class Opening extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObject.java index b27b485e4788126cfe17fa0c57dc5a400bc5446d..7400731bf27ec57b981ac97f84a3a66267ed359e 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObject.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObject.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import javafx.scene.paint.Color; import org.citygml4j.core.model.relief.ReliefFeature; @@ -42,7 +42,7 @@ public class ReliefObject extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Storey.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Storey.java index c5cea9b5b65dd1725fe12e1e730e71711ef6d0a1..7978ade21fedc90222afa05c3888ec128f110bec 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Storey.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Storey.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import org.citygml4j.core.util.geometry.GeometryFactory; @@ -22,7 +22,7 @@ public class Storey extends AbstractBuildingSubdivision { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); for (BuildingUnit buildingUnit : buildingUnits) { buildingUnit.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TinObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TinObject.java index 4fde9c9ea3263d2aa84ce13f35b84b5818296311..e01a7bf9cc3a1105f5ccc415880d6a53ee213810 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TinObject.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TinObject.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -50,7 +50,7 @@ public class TinObject extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeature.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeature.java index 8b41c6993481bede6295851d78dc58f7034a6d97..1e52a55d060b48283d7a60daa9c227dff2d68667 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeature.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeature.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import org.citygml4j.core.model.deprecated.transportation.TransportationComplex; import org.citygml4j.core.model.transportation.Railway; import org.citygml4j.core.model.transportation.Road; @@ -76,7 +76,7 @@ public class TopLevelTransportFeature extends TransportationSpace { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceObject.java index fb60aa918287b7ba8eebe1698486b983c8521f70..bfc06e7138880a79c6796521a0fd44db89c77787 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceObject.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceObject.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import org.citygml4j.core.model.core.AbstractSpace; @@ -95,7 +95,7 @@ public class TrafficSpaceObject extends TransportationObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationSpace.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationSpace.java index 16e7ef946d745908380dd6db82b3288ecc38854a..388117176c79ae4a233a54f05faaf6f1d2aa654d 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationSpace.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationSpace.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import org.citygml4j.core.model.core.AbstractSpace; @@ -121,7 +121,7 @@ public abstract class TransportationSpace extends TransportationObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Tunnel.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Tunnel.java index 54013c4a9da76c9d818bd798d6cbd39ad13a96e2..72c7b341e0963855f87a5960b6a3d41a5aca427e 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Tunnel.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Tunnel.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty; import org.citygml4j.core.model.tunnel.TunnelInstallation; import org.citygml4j.core.model.tunnel.TunnelInstallationProperty; @@ -27,7 +27,7 @@ public class Tunnel extends AbstractTunnel { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TunnelConstructiveElement.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TunnelConstructiveElement.java index d1f896b962974aab94e45701d29cd746ddd83c13..0284f2b5d62cc99c1921a68b0beeeb1e0e5392f9 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TunnelConstructiveElement.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TunnelConstructiveElement.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -87,7 +87,7 @@ public class TunnelConstructiveElement extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Vegetation.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Vegetation.java index 79aec2a5dde1e3697fa80011e65be85c8c356c30..62d75bb7525dde9c137c43859dea23097b10ab90 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Vegetation.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Vegetation.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -27,15 +27,12 @@ import org.citygml4j.core.model.vegetation.AbstractVegetationObject; import org.citygml4j.core.model.vegetation.PlantCover; import org.citygml4j.core.model.vegetation.SolitaryVegetationObject; import org.citygml4j.core.util.geometry.GeometryFactory; -import org.xmlobjects.gml.model.geometry.aggregates.MultiSolid; -import org.xmlobjects.gml.model.geometry.aggregates.MultiSolidProperty; import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface; import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty; import org.xmlobjects.gml.model.geometry.primitives.Solid; import org.xmlobjects.gml.model.geometry.primitives.SolidProperty; import java.io.Serial; -import java.util.Collections; /** * Representation of CityGML vegetation objects @@ -172,7 +169,7 @@ public class Vegetation extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/WaterObject.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/WaterObject.java index 278a8fad0dab6718b1b1276e6390f12353684cc5..035d303eec1c591590d4e33f1a682db65bc6040f 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/WaterObject.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/WaterObject.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.Check; +import de.hft.stuttgart.citydoctor2.check.CheckableVisitor; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import de.hft.stuttgart.citydoctor2.utils.CityGmlUtils; import javafx.scene.paint.Color; @@ -141,7 +141,7 @@ public class WaterObject extends CityObject { } @Override - public void accept(Check c) { + public void accept(CheckableVisitor c) { super.accept(c); if (c.canExecute(this)) { c.check(this); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CheckableErrorCollector.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CheckableErrorCollector.java index d6af6749a758392eef1b2b288dc930aeb391488e..1f6c05c3679d1126c7cb8b116b094e275445b203 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CheckableErrorCollector.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CheckableErrorCollector.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.utils.visitors; -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.Checkable; @@ -9,7 +9,7 @@ import java.util.List; /** * This Visitor collects all CheckErrors in the datastructure of a checkable. */ -public class CheckableErrorCollector extends AbstractCheck { +public class CheckableErrorCollector extends CheckableUtilsVisitor { List errors; diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CityObjectCollector.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CityObjectCollector.java index 31948813b2bc3eaed43c26d43af59814a7fca384..a504462fb09872da554cd0b134e6ae21f19ca0ad 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CityObjectCollector.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CityObjectCollector.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.utils.visitors; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import de.hft.stuttgart.citydoctor2.datastructure.CityObject; import java.util.HashSet; @@ -9,7 +9,7 @@ import java.util.Set; /** * This Visitor collects all sub-CityObjects that are in the datastructure of a CityObject (including itself) in a Set. */ -public class CityObjectCollector extends AbstractCheck { +public class CityObjectCollector extends CheckableUtilsVisitor { private final Set objects = new HashSet<>(); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearMetaInformationVisitor.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearMetaInformationVisitor.java index b08ed1368c041f91fcd5030cdca79e919b9a9cd0..42449d742c6a805b518ea0691289678533ad3a28 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearMetaInformationVisitor.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearMetaInformationVisitor.java @@ -1,12 +1,12 @@ package de.hft.stuttgart.citydoctor2.utils.visitors; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import de.hft.stuttgart.citydoctor2.datastructure.Geometry; /** * This Visitor removes the metadata created by the {@link PrepareForCheckingVisitor} for the low-memory consumption mode. */ -public class ClearMetaInformationVisitor extends AbstractCheck { +public class ClearMetaInformationVisitor extends CheckableUtilsVisitor { @Override public void check(Geometry geometry) { diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearCheckResultsVisitor.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearVisitorResultsVisitor.java similarity index 70% rename from CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearCheckResultsVisitor.java rename to CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearVisitorResultsVisitor.java index 18019a708e3404d22b1ca5377fb2831e1801891f..15436a7ea731ce461b70449795359e3314baebea 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearCheckResultsVisitor.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ClearVisitorResultsVisitor.java @@ -1,12 +1,12 @@ package de.hft.stuttgart.citydoctor2.utils.visitors; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import de.hft.stuttgart.citydoctor2.check.Checkable; /** * This Visitor removes the check results from a CityObject and the objects in its datastructure. */ -public class ClearCheckResultsVisitor extends AbstractCheck { +public class ClearVisitorResultsVisitor extends CheckableUtilsVisitor { @Override public void check(Checkable checkable) { diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsAnyErrorVisitor.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsAnyErrorVisitor.java index 02a9a5b28fdd1a4659438190f273b574d3814cdb..5dd9cf0196e3e146e01499ea0c91e02c0c558652 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsAnyErrorVisitor.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsAnyErrorVisitor.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.utils.visitors; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import de.hft.stuttgart.citydoctor2.check.Checkable; import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound; import de.hft.stuttgart.citydoctor2.utils.ThrowUtils; @@ -11,7 +11,7 @@ import de.hft.stuttgart.citydoctor2.utils.ThrowUtils; * This visitor's check method terminates early by throwing an unchecked {@link CheckErrorFound}, * use {@link #checkObject(Checkable) ContainsAnyErrorVisitor.checkObject(Checkable)} to handle the Throwable. */ -public class ContainsAnyErrorVisitor extends AbstractCheck { +public class ContainsAnyErrorVisitor extends CheckableUtilsVisitor { /** * Checks if a Checkable, or any Object in its datastructure, contains any error. diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsErrorVisitor.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsErrorVisitor.java index 9ddc69c5a4783d3eb27f0b8cfcf7feb2cba228aa..e4e4ee7fce29d245237960db51a543681f986032 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsErrorVisitor.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsErrorVisitor.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.utils.visitors; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import de.hft.stuttgart.citydoctor2.check.CheckId; import de.hft.stuttgart.citydoctor2.check.Checkable; import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound; @@ -12,7 +12,7 @@ import de.hft.stuttgart.citydoctor2.utils.ThrowUtils; * This visitor's check method terminates early by throwing an unchecked {@link CheckErrorFound}, * use {@link #checkObject(Checkable, CheckId) ContainsAnyErrorVisitor.checkObject(Checkable, CheckId)} to handle the Throwable. */ -public class ContainsErrorVisitor extends AbstractCheck { +public class ContainsErrorVisitor extends CheckableUtilsVisitor { private CheckId checkId; diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/GmlGeometryRebuilder.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/GmlGeometryRebuilder.java index cd74226b236c7224c547dd94dab356d286d86c3a..fb199eacf09c040e3dbf009108906805403ca6f5 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/GmlGeometryRebuilder.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/GmlGeometryRebuilder.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.utils.visitors; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import de.hft.stuttgart.citydoctor2.datastructure.CityObject; import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; import org.citygml4j.core.util.geometry.GeometryFactory; @@ -11,7 +11,7 @@ import java.util.Objects; * This Visitor recreates the Geometries of the original CityGml object from the associated Geometries in CityDoctor's * internal model. */ -public class GmlGeometryRebuilder extends AbstractCheck { +public class GmlGeometryRebuilder extends CheckableUtilsVisitor { private final GeometryFactory factory; private final ParserConfiguration config; diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/PrepareForCheckingVisitor.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/PrepareForCheckingVisitor.java index 3388da78df300fb146387d2f6155c99ea89247f4..8cc4d2e4803548b6717789799a3199ca31b110ff 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/PrepareForCheckingVisitor.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/PrepareForCheckingVisitor.java @@ -1,12 +1,12 @@ package de.hft.stuttgart.citydoctor2.utils.visitors; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import de.hft.stuttgart.citydoctor2.datastructure.Geometry; /** * This Visitor prepares the {@link Geometry Geometries} in a Checkable for low-memory consumption mode. */ -public class PrepareForCheckingVisitor extends AbstractCheck { +public class PrepareForCheckingVisitor extends CheckableUtilsVisitor { @Override public void check(Geometry geom) { diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/UnsetGeometriesVisitor.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/UnsetGeometriesVisitor.java index d24948d605f0d4c5bec6b24802309d4cbf3fa119..4c65708ac76ad75a2db605864fcf7e21bf79bc04 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/UnsetGeometriesVisitor.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/UnsetGeometriesVisitor.java @@ -1,13 +1,13 @@ package de.hft.stuttgart.citydoctor2.utils.visitors; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import de.hft.stuttgart.citydoctor2.datastructure.CityObject; /** * This Visitor removes the GmlGeometries from the linked original GmlObjects in a CityObject's datastructure to reduce * memory bloat. */ -public class UnsetGeometriesVisitor extends AbstractCheck { +public class UnsetGeometriesVisitor extends CheckableUtilsVisitor { @Override diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingTest.java index 0c8e436c0ec16c760bc761a54f02b0fb57d36fde..d5e23ce6ecc2122567c8e80c769dcbb07b718ba8 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingTest.java @@ -24,7 +24,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -32,9 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import de.hft.stuttgart.citydoctor2.utils.visitors.ClearCheckResultsVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.GmlGeometryRebuilder; -import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor; import org.citygml4j.core.model.construction.WallSurface; import org.citygml4j.core.model.core.AbstractSpaceBoundaryProperty; import org.citygml4j.core.util.geometry.GeometryFactory; @@ -43,7 +40,7 @@ import org.mockito.Mockito; import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty; import org.xmlobjects.gml.model.geometry.primitives.SolidProperty; -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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -62,7 +59,7 @@ public class AbstractBuildingTest { AtomicInteger abCounter = new AtomicInteger(0); AtomicInteger bsCounter = new AtomicInteger(0); AtomicInteger biCounter = new AtomicInteger(0); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { @Override public void check(AbstractBuilding ab) { @@ -79,7 +76,7 @@ public class AbstractBuildingTest { assertEquals(1, bsCounter.intValue()); assertEquals(0, biCounter.intValue()); - AbstractCheck c2 = new AbstractCheck() { + CheckableUtilsVisitor c2 = new CheckableUtilsVisitor() { @Override public void check(Installation bi) { @@ -109,7 +106,7 @@ public class AbstractBuildingTest { ab.addBoundarySurface(mockBSurface); ab.addGeometry(mockGeometry); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; ab.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoomTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoomTest.java index 5f57517990b8e7c32b7058537e26f7e0d0a9436c..dcab6ed3c68faade8e20f40d91620cd056f476ca 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoomTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoomTest.java @@ -1,6 +1,6 @@ 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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -50,7 +50,7 @@ public class AbstractRoomTest { abRoom.addBoundarySurface(mockBoundarySurface); abRoom.addGeometry(geometry); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; abRoom.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnelTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnelTest.java index ee3f289a6d0146777404dbbf2c883f73de947933..4deedb3685f55268f34756eee71f1ff82d0b020f 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnelTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnelTest.java @@ -1,6 +1,6 @@ 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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -52,7 +52,7 @@ public class AbstractTunnelTest { at.addBoundarySurface(mockBoundarySurface); at.addGeometry(mockGeometry); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; at.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurfaceTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurfaceTest.java index 458739aceb847430e8251d4f68d508d1bde9e0a7..b414511d599387a61024b80f582eba45478c0232 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurfaceTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurfaceTest.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import de.hft.stuttgart.citydoctor2.utils.visitors.ClearCheckResultsVisitor; +import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor; import de.hft.stuttgart.citydoctor2.utils.visitors.GmlGeometryRebuilder; import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor; import org.citygml4j.core.model.construction.AbstractConstructionSurface; @@ -41,7 +41,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty; -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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -58,7 +58,7 @@ public class BoundarySurfaceTest { Opening oMock = Mockito.mock(Opening.class); bs.addOpening(oMock); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; bs.accept(c); @@ -71,7 +71,7 @@ public class BoundarySurfaceTest { Opening oMock = Mockito.mock(Opening.class); bs.addOpening(oMock); AtomicInteger bsCounter = new AtomicInteger(0); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { @Override public void check(BoundarySurface bs) { @@ -89,7 +89,7 @@ public class BoundarySurfaceTest { Opening oMock = Mockito.mock(Opening.class); bs.addOpening(oMock); AtomicInteger bsCounter = new AtomicInteger(0); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { @Override public void check(BridgeObject bo) { @@ -142,7 +142,7 @@ public class BoundarySurfaceTest { assertFalse(bs.getAllCheckResults().isEmpty()); bs.addOpening(oMock); bs.clearAllContainedCheckResults(); - verify(oMock).accept(any(ClearCheckResultsVisitor.class)); + verify(oMock).accept(any(ClearVisitorResultsVisitor.class)); assertTrue(bs.getAllCheckResults().isEmpty()); } diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObjectTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObjectTest.java index d8e23400532ed5969f96628e190560d0523129c2..57d27a174295daac42ecc5ac9a919ba2134ecdb9 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObjectTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObjectTest.java @@ -39,7 +39,7 @@ import org.citygml4j.core.util.geometry.GeometryFactory; import org.citygml4j.core.visitor.ObjectVisitor; import org.junit.Test; -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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -58,7 +58,7 @@ public class BridgeObjectTest { bo.addBoundarySurface(new BoundarySurface(null)); AtomicInteger boCounter = new AtomicInteger(0); AtomicInteger bsCounter = new AtomicInteger(0); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { @Override public void check(BridgeObject bo) { @@ -75,7 +75,7 @@ public class BridgeObjectTest { assertEquals(1, bsCounter.intValue()); AtomicInteger boCounter2 = new AtomicInteger(0); - c = new AbstractCheck() { + c = new CheckableUtilsVisitor() { }; bo.accept(c); assertEquals(0, boCounter2.intValue()); @@ -101,7 +101,7 @@ public class BridgeObjectTest { bo.addBoundarySurface(bsMock); bo.addGeometry(geomMock); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; bo.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingTest.java index 458556544609cc00fdb4686df6baddd47b69a0d7..7a49987423442046085d16b69a824268f6cc26bf 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import org.citygml4j.core.model.construction.RoofSurface; import org.junit.Test; import org.mockito.Mockito; @@ -151,7 +151,7 @@ public class BuildingTest { bp.addStorey(mockStorey); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; b.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/CityObjectTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/CityObjectTest.java index e0d7dae4b27ef39ea6a8ff9dc327e6aa3df9e1b8..b1ec552f2490921315326765b8406193b25b39f6 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/CityObjectTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/CityObjectTest.java @@ -1,6 +1,6 @@ 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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -31,7 +31,7 @@ public class CityObjectTest { Geometry mockGeometry = mock(Geometry.class); co.addGeometry(mockGeometry); - AbstractCheck check = new AbstractCheck() { + CheckableUtilsVisitor check = new CheckableUtilsVisitor() { }; co.accept(check); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObjectTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObjectTest.java index 00aab2b1d32e8c11ddc9d531a26d153c5865b373..bca67f1c3018651b117ebf3005120a5ade8f26b1 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObjectTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObjectTest.java @@ -1,6 +1,6 @@ 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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -30,7 +30,7 @@ public class GenericCityObjectTest { gco.addBoundarySurface(mockSurface); gco.addGeometry(mockGeometry); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; gco.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GeometryTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GeometryTest.java index dde2b7df269065fe4b061a234367965cca175434..fadaa5cbe7ca386c139bf7dbc31a081e79bdf6b2 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GeometryTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/GeometryTest.java @@ -32,8 +32,8 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; -import de.hft.stuttgart.citydoctor2.utils.visitors.ClearCheckResultsVisitor; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; +import de.hft.stuttgart.citydoctor2.utils.visitors.ClearVisitorResultsVisitor; import org.citygml4j.core.model.construction.AbstractConstructionSurface; import org.citygml4j.core.model.construction.WallSurface; import org.citygml4j.core.util.geometry.GeometryFactory; @@ -63,7 +63,7 @@ public class GeometryTest { geom.addPolygon(mockPolygon); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; geom.accept(c); @@ -300,7 +300,7 @@ public class GeometryTest { Polygon p = mock(Polygon.class); geom.addPolygon(p); geom.clearAllContainedCheckResults(); - verify(p).accept(any(ClearCheckResultsVisitor.class)); + verify(p).accept(any(ClearVisitorResultsVisitor.class)); assertFalse(geom.containsError(CheckId.C_GE_P_HOLE_OUTSIDE)); } diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryTest.java index 6050b20f2eeefa625c188222c8e8e05c003e7b97..42d0f073594d0a797d0ba189759d6462cfc80113 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryTest.java @@ -1,6 +1,6 @@ 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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -150,7 +150,7 @@ public class ImplicitGeometryTest { AtomicInteger loCounter = new AtomicInteger(0); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { @Override public void check(Polygon lo) { loCounter.incrementAndGet(); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObjectTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObjectTest.java index d97059d14bf13cdb82b34e0cc4246d59856b0d48..806564603296c0f4fb1ca862b1e6b48829fd25b5 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObjectTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObjectTest.java @@ -1,6 +1,6 @@ package de.hft.stuttgart.citydoctor2.datastructure; -import de.hft.stuttgart.citydoctor2.check.AbstractCheck; +import de.hft.stuttgart.citydoctor2.check.CheckableUtilsVisitor; import org.citygml4j.core.model.relief.ReliefFeature; import org.junit.Test; @@ -16,7 +16,7 @@ public class ReliefObjectTest { TinObject mockTin = mock(TinObject.class); relief.addComponent(mockTin); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; relief.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TinObjectTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TinObjectTest.java index b635e2a660a11bf0cf9d526e4f05e533b0a9116b..a93e87b95f2333e59c13941ff73eb18a2e390b33 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TinObjectTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TinObjectTest.java @@ -1,6 +1,6 @@ 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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -32,7 +32,7 @@ public class TinObjectTest { tin.addGeometry(mockGeometry); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; tin.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeatureTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeatureTest.java index 0f3a157249f8f2e3285716e70f0f97ebe4633e48..f5bd5b8e416cb6d1d66bc6160007109a11c15a7e 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeatureTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeatureTest.java @@ -1,6 +1,6 @@ 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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -54,7 +54,7 @@ public class TopLevelTransportFeatureTest { top.addSection(mockSection); top.addIntersection(mockIntersection); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; top.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceTest.java index bb6c592e7319ad73529432513cf48fd0937a1c47..42759031ebce3b99c84e96fd47add0c8db4e6e7b 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TrafficSpaceTest.java @@ -1,12 +1,12 @@ 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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; import de.hft.stuttgart.citydoctor2.check.ResultStatus; 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.AbstractUnoccupiedSpace; import org.citygml4j.core.model.deprecated.core.DeprecatedPropertiesOfAbstractCityObject; @@ -37,7 +37,7 @@ public class TrafficSpaceTest { TrafficAreaObject areaMock = mock(TrafficAreaObject.class); tso.addTrafficArea(areaMock); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; tso.accept(c); @@ -91,7 +91,7 @@ public class TrafficSpaceTest { tso.clearAllContainedCheckResults(); assertFalse(tso.containsError(CheckId.C_GE_P_HOLE_OUTSIDE)); - verify(taMock).accept(any(ClearCheckResultsVisitor.class)); + verify(taMock).accept(any(ClearVisitorResultsVisitor.class)); } @Test diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationSpaceTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationSpaceTest.java index e30557c26b54d64880dc3a7ba2dcf0b0d600fbdc..827f9896c48fa728cfe7f8d54a5f8af75a046e67 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationSpaceTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/TransportationSpaceTest.java @@ -1,6 +1,6 @@ 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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -32,7 +32,7 @@ public class TransportationSpaceTest { space.addTrafficSpace(mockSpace); space.addAuxTrafficSpace(auxMockSpace); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; space.accept(c); diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/WaterTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/WaterTest.java index b028922870fc2224361d6752f89bbdd3ea0a2904..3dd2077d0977bf6086675098fe2507d9d6f60f4e 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/WaterTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/WaterTest.java @@ -1,6 +1,6 @@ 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.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; @@ -33,7 +33,7 @@ public class WaterTest { water.addBoundarySurface(bsMock); water.addBoundarySurface(bsMock2); - AbstractCheck c = new AbstractCheck() { + CheckableUtilsVisitor c = new CheckableUtilsVisitor() { }; water.accept(c); diff --git a/CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healer/Healer.java b/CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healer/Healer.java index 544a6856d9a6f0d3a410c8b0509dfdc6bc2bf657..98a7c8835c0644e8b5f8c578f31b3f5900634a7c 100644 --- a/CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healer/Healer.java +++ b/CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healer/Healer.java @@ -26,7 +26,7 @@ import org.citygml4j.xml.writer.CityGMLWriteException; import org.citygml4j.xml.writer.CityGMLWriter; 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.Checker; import de.hft.stuttgart.citydoctor2.check.HealingMethod; @@ -353,7 +353,7 @@ public class Healer { private void filterOutDuplicateVertices(CityObject co) { Map map = new HashMap<>(); - co.accept(new AbstractCheck() { + co.accept(new CheckableUtilsVisitor() { @Override public void check(LinearRing ring) { for (int i = 0; i < ring.getVertices().size(); i++) { diff --git a/CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healing/HealMissingSolid.java b/CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healing/HealMissingSolid.java index 301d639b7772ea8faa29541cea4e243383a08a27..090e7f73d6d62f05bdf7e0b7d2202f3f3cb8eb04 100644 --- a/CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healing/HealMissingSolid.java +++ b/CityDoctorParent/Extensions/CityDoctorHealer/src/main/java/de/hft/stuttgart/citydoctor2/healing/HealMissingSolid.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.logging.log4j.LogManager; 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.HealingMethod; import de.hft.stuttgart.citydoctor2.check.ModificationListener; @@ -103,7 +103,7 @@ public class HealMissingSolid implements HealingMethod { private List collectPolygons(CityObject co) { List polygons = new ArrayList<>(); - AbstractCheck polygonCheck = new AbstractCheck() { + CheckableUtilsVisitor polygonCheck = new CheckableUtilsVisitor() { @Override public void check(Polygon p) { if (!p.isLink()) { diff --git a/CityDoctorParent/Extensions/CityDoctorHealerGenetic/src/test/java/de/hft/stuttgart/citydoctor2/healer/genetic/NonPlanarGenetic.java b/CityDoctorParent/Extensions/CityDoctorHealerGenetic/src/test/java/de/hft/stuttgart/citydoctor2/healer/genetic/NonPlanarGenetic.java index aad5053da4b1e852a02cc5035e74529ebb3d7a40..f4711cc36c82224f19beb8c0743639b55db01014 100644 --- a/CityDoctorParent/Extensions/CityDoctorHealerGenetic/src/test/java/de/hft/stuttgart/citydoctor2/healer/genetic/NonPlanarGenetic.java +++ b/CityDoctorParent/Extensions/CityDoctorHealerGenetic/src/test/java/de/hft/stuttgart/citydoctor2/healer/genetic/NonPlanarGenetic.java @@ -36,10 +36,8 @@ import java.util.Map.Entry; import java.util.Random; import java.util.Set; -import org.junit.Test; - 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.Checker; import de.hft.stuttgart.citydoctor2.check.ValidationConfiguration; @@ -448,7 +446,7 @@ public class NonPlanarGenetic { private Polygon findPolygonInFeature(CityObject copy, Polygon polygon) { Polygon[] result = new Polygon[1]; - copy.accept(new AbstractCheck() { + copy.accept(new CheckableUtilsVisitor() { @Override public void check(Polygon p) {