Refactor: Move Util-Visitors to own package

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Checkable.java

@@ -25,8 +25,9 @@ import java.util.List;
 import java.util.Map;
 
 import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound;
-import de.hft.stuttgart.citydoctor2.utils.ContainsAnyErrorVisitor;
-import de.hft.stuttgart.citydoctor2.utils.ContainsErrorVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsAnyErrorVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.ContainsErrorVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.PrepareForCheckingVisitor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -86,7 +87,7 @@ public abstract class Checkable implements Serializable {
 	 * @return the GML-ID
 	 */
 	public abstract GmlId getGmlId();
-	
+
 	/**
 	 * This should be called before executing a check if low memory consumption
 	 * method has been enabled. This should create edges and additional meta
@@ -112,7 +113,7 @@ public abstract class Checkable implements Serializable {
 	 */
 	public boolean containsError(CheckId checkIdentifier) {
 		try {
-			ContainsErrorVisitor.checkCityObject(this, checkIdentifier);
+			ContainsErrorVisitor.checkObject(this, checkIdentifier);
 		} catch (CheckErrorFound c) {
 			return true;
 		}

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityObject.java

@@ -23,7 +23,7 @@ import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
 import de.hft.stuttgart.citydoctor2.utils.Copyable;
-import de.hft.stuttgart.citydoctor2.utils.UnsetGeometriesVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor;
 import javafx.scene.paint.Color;
 import org.citygml4j.core.model.core.AbstractCityObject;
 import org.citygml4j.core.util.geometry.GeometryFactory;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/CityObjectCollector.java → CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/CityObjectCollector.java

-package de.hft.stuttgart.citydoctor2.utils;
+package de.hft.stuttgart.citydoctor2.utils.visitors;
 
 import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/ContainsAnyErrorVisitor.java → CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsAnyErrorVisitor.java

-package de.hft.stuttgart.citydoctor2.utils;
+package de.hft.stuttgart.citydoctor2.utils.visitors;
 
 import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
+import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound;
+import de.hft.stuttgart.citydoctor2.utils.ThrowUtils;
 
 public class ContainsAnyErrorVisitor extends AbstractCheck {
 
-
     public static void checkObject(Checkable checkable) throws CheckErrorFound {
         checkable.accept(new ContainsAnyErrorVisitor());
     }

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/ContainsErrorVisitor.java → CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/ContainsErrorVisitor.java

-package de.hft.stuttgart.citydoctor2.utils;
+package de.hft.stuttgart.citydoctor2.utils.visitors;
 
 import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
 import de.hft.stuttgart.citydoctor2.check.CheckId;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
-import de.hft.stuttgart.citydoctor2.datastructure.CityObject;
+import de.hft.stuttgart.citydoctor2.utils.CheckErrorFound;
+import de.hft.stuttgart.citydoctor2.utils.ThrowUtils;
 
 public class ContainsErrorVisitor extends AbstractCheck {
 
     private CheckId checkId;
 
-    public static void checkCityObject(Checkable checkable, CheckId checkIdentifier) throws CheckErrorFound {
+    public static void checkObject(Checkable checkable, CheckId checkIdentifier) throws CheckErrorFound {
         checkable.accept(new ContainsErrorVisitor(checkIdentifier));
     }
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/UnsetGeometriesVisitor.java → CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/visitors/UnsetGeometriesVisitor.java

-package de.hft.stuttgart.citydoctor2.utils;
+package de.hft.stuttgart.citydoctor2.utils.visitors;
 
 import de.hft.stuttgart.citydoctor2.check.AbstractCheck;
 import de.hft.stuttgart.citydoctor2.datastructure.CityObject;

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/check/CheckableTest.java

@@ -48,11 +48,6 @@ public class CheckableTest {
 				return null;
 			}
 
-			@Override
-			public void prepareForChecking() {
-
-			}
-
 			@Override
 			public void clearMetaInformation() {
 

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingTest.java

@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import de.hft.stuttgart.citydoctor2.utils.UnsetGeometriesVisitor;
+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;

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurfaceTest.java

@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import de.hft.stuttgart.citydoctor2.utils.UnsetGeometriesVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor;
 import org.citygml4j.core.model.construction.AbstractConstructionSurface;
 import org.citygml4j.core.model.construction.WallSurface;
 import org.citygml4j.core.model.core.AbstractThematicSurface;

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObjectTest.java

@@ -31,7 +31,7 @@ import static org.mockito.Mockito.when;
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import de.hft.stuttgart.citydoctor2.utils.UnsetGeometriesVisitor;
+import de.hft.stuttgart.citydoctor2.utils.visitors.UnsetGeometriesVisitor;
 import org.citygml4j.core.model.bridge.AbstractBridge;
 import org.citygml4j.core.model.bridge.Bridge;
 import org.citygml4j.core.model.deprecated.bridge.DeprecatedPropertiesOfAbstractBridge;

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/Renderer.java

@@ -2,7 +2,7 @@ package de.hft.stuttgart.citydoctor2.gui;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
 import de.hft.stuttgart.citydoctor2.check.Checkable;
-import de.hft.stuttgart.citydoctor2.utils.CityObjectCollector;
+import de.hft.stuttgart.citydoctor2.utils.visitors.CityObjectCollector;
 import de.hft.stuttgart.citydoctor2.datastructure.*;
 import de.hft.stuttgart.citydoctor2.gui.filter.ViewFilter;
 import de.hft.stuttgart.citydoctor2.gui.tree.*;

CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/TriangulatedGeometry.java

 package de.hft.stuttgart.citydoctor2.gui;
 
-import de.hft.stuttgart.citydoctor2.utils.CityObjectCollector;
+import de.hft.stuttgart.citydoctor2.utils.visitors.CityObjectCollector;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.datastructure.*;
 import de.hft.stuttgart.citydoctor2.gui.filter.ViewFilter;