Code cleaning Ref #69

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/MeshSurfaceUtils.java

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.edge;
 
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -26,7 +27,7 @@ public class MeshSurfaceUtils {
 	
 	public static List<PolygonPolygonIntersection> selfIntersects(MeshSurface ms, double epsilon, double angleEpsilon) {
 		Objects.requireNonNull(ms);
-		List<CDPolygonNs> polygons = ms.getPolygons();
+		List<CDPolygonNs> polygons = ms.polygons();
 		List<PolygonPolygonIntersection> intersections = new ArrayList<>();
 		for (int i = 0; i < polygons.size() - 1; i++) {
 			EdgePolygon p1 = polygons.get(i);

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Point2d.java

@@ -20,8 +20,8 @@ package de.hft.stuttgart.citydoctor2.edge;
 
 public class Point2d {
 
-	private double x;
-	private double y;
+	private final double x;
+	private final double y;
 
 	public Point2d(double x, double y) {
 		this.x = x;

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Point3d.java

@@ -18,11 +18,12 @@
  */
 package de.hft.stuttgart.citydoctor2.edge;
 
+
 public class Point3d {
 
-	private double x;
-	private double y;
-	private double z;
+	private final double x;
+	private final double y;
+	private final double z;
 
 	public Point3d(double x, double y, double z) {
 		this.x = x;

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/PolyLine2d.java

@@ -23,7 +23,7 @@ import java.util.List;
 
 public class PolyLine2d extends BaseEntity {
 
-	private PolyLineSegment2d mpFirst;
+	private final PolyLineSegment2d mpFirst;
 	private PolyLineSegment2d mpLast;
 
 	public PolyLine2d(PolyLineSegment2d pStart) {

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/PolyLineSegment.java

@@ -25,8 +25,8 @@ public class PolyLineSegment extends BaseEntity {
 
 	private static final Logger logger = LogManager.getLogger(PolyLineSegment.class);
 
-	private Coordinate3d mpStart;
-	private Coordinate3d mpEnd;
+	private final Coordinate3d mpStart;
+	private final Coordinate3d mpEnd;
 
 	private PolyLineSegment mpNext;
 

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Polygon2d.java

@@ -104,16 +104,14 @@ public class Polygon2d extends BaseEntity {
 
 			point = halfEdge.getStart().getPoint();
 
-			lowerU = (point.getX() < lowerU) ? point.getX() : lowerU;
-			lowerV = (point.getY() < lowerV) ? point.getY() : lowerV;
+			lowerU = Math.min(point.getX(), lowerU);
+			lowerV = Math.min(point.getY(), lowerV);
 
-			upperU = (point.getX() > upperU) ? point.getX() : upperU;
-			upperV = (point.getY() > upperV) ? point.getY() : upperV;
+			upperU = Math.max(point.getX(), upperU);
+			upperV = Math.max(point.getY(), upperV);
 		}
 
-		Box2d box = new Box2d(new Point2d(lowerU, lowerV), new Point2d(upperU, upperV));
-
-		return box;
+        return new Box2d(new Point2d(lowerU, lowerV), new Point2d(upperU, upperV));
 	}
 
 	public static void connectHalfEdges(List<HalfEdge2d> rHalfEdges) {

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Polygon2dPolygon2dInt.java

@@ -18,12 +18,13 @@
  */
 package de.hft.stuttgart.citydoctor2.edge;
 
+
 public class Polygon2dPolygon2dInt {
 	
-	private Polygon2d mcpPolygon1;
-	private Polygon2d mcpPolygon2;
-	private PolyLine2d line;
-	private IntersectionType intType;
+	private final Polygon2d mcpPolygon1;
+	private final Polygon2d mcpPolygon2;
+	private final PolyLine2d line;
+	private final IntersectionType intType;
 
 	public Polygon2dPolygon2dInt(Polygon2d mcpPolygon1, Polygon2d mcpPolygon2, PolyLine2d line,
 			IntersectionType intType) {

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/PolygonPolygonIntersection.java

@@ -18,12 +18,13 @@
  */
 package de.hft.stuttgart.citydoctor2.edge;
 
+
 public class PolygonPolygonIntersection {
 	
-	private EdgePolygon p1;
-	private EdgePolygon p2;
-	private PolyLine polyLine;
-	private IntersectionType type;
+	private final EdgePolygon p1;
+	private final EdgePolygon p2;
+	private final PolyLine polyLine;
+	private final IntersectionType type;
 
 	public PolygonPolygonIntersection(EdgePolygon p1, EdgePolygon p2, PolyLine polyLine, IntersectionType type) {
 		this.p1 = p1;

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/ProjectedPoint3d.java

@@ -18,10 +18,11 @@
  */
 package de.hft.stuttgart.citydoctor2.edge;
 
+
 public class ProjectedPoint3d {
 	
-	private Point3d point;
-	private double parameter;
+	private final Point3d point;
+	private final double parameter;
 
 	public ProjectedPoint3d(Point3d point, double d) {
 		this.point = point;

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/UnitVector3d.java

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.edge;
 
+
 public class UnitVector3d extends Vector3d {
 
 	public static UnitVector3d of(Vector3d vec) {
@@ -37,13 +38,7 @@ public class UnitVector3d extends Vector3d {
 	
 	public double dot(UnitVector3d other) {
 		double scalar = getX() * other.getX() + getY() * other.getY() + getZ() * other.getZ();
-		if (scalar > 1.0) {
-			return 1.0;
-		}
-		if (scalar < -1.0) {
-			return -1.0;
-		}
-		return scalar;
+        return (scalar >= 0) ? Math.min(scalar, 1.0) : Math.max(scalar, -1.0);
     }
 
 

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Vector2d.java

@@ -18,16 +18,18 @@
  */
 package de.hft.stuttgart.citydoctor2.edge;
 
+
 public class Vector2d {
 
-	private double x;
-	private double y;
+	private final double x;
+	private final double y;
 
 	public Vector2d(double x, double y) {
 		this.x = x;
 		this.y = y;
 	}
 
+	@SuppressWarnings("SuspiciousNameCombination")
     public Vector2d getPerpendicularVector() {
 		return new Vector2d(y, -x);
 	}

CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Vector3d.java

@@ -18,11 +18,12 @@
  */
 package de.hft.stuttgart.citydoctor2.edge;
 
+
 import java.util.Arrays;
 
 public class Vector3d {
 
-	private double[] val = new double[3];
+	private final double[] val = new double[3];
 
 	public Vector3d(double x, double y, double z) {
 		val[0] = x;
@@ -46,9 +47,9 @@ public class Vector3d {
 			val[1] = 0;
 			val[2] = 0;
 		} else {
-			val[0] = val[0] /= length;
-			val[1] = val[1] /= length;
-			val[2] = val[2] /= length;
+			val[0] /= length;
+			val[1] /= length;
+			val[2] /= length;
 		}
 	}
 

CityDoctorParent/CityDoctorEdge/src/test/java/de/hft/stuttgart/citydoctor2/edge/IntersectionErrorsTest.java

@@ -103,11 +103,11 @@ public class IntersectionErrorsTest {
 		}
 		
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 		
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 		
 		
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1, edgePoly2, 0.000001, 0.001);

CityDoctorParent/CityDoctorEdge/src/test/java/de/hft/stuttgart/citydoctor2/edge/MeshSurfaceUtilsTest.java

@@ -77,7 +77,7 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v1);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 		CDPolygonNs edgePoly1 = polygons.get(0);
 		List<Coordinate3d> coordinates = edgePoly1.getCoordinates();
@@ -147,7 +147,7 @@ public class MeshSurfaceUtilsTest {
 		List<Coordinate3d> coordChildren = firstHalfEdge.getChildren(Coordinate3d.class);
 		assertEquals(2, coordChildren.size());
 
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
 		assertNotNull(intersectPolygons);
@@ -195,11 +195,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
 		assertNotNull(intersectPolygons);
@@ -248,11 +248,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -311,11 +311,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v2);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -375,11 +375,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -429,11 +429,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -482,11 +482,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 		
 		DebugUtils.printGeoknechtPolygon(edgePoly1, edgePoly2);
 
@@ -543,11 +543,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -596,11 +596,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v4);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		DebugUtils.printGeoknechtPolygon(edgePoly1, edgePoly2);
 
@@ -652,11 +652,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -706,11 +706,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -760,11 +760,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -810,11 +810,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -866,11 +866,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -922,11 +922,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -978,11 +978,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v6);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -1049,11 +1049,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v5);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -1110,11 +1110,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v11);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -1173,11 +1173,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v11);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);
@@ -1238,11 +1238,11 @@ public class MeshSurfaceUtilsTest {
 		ext.addVertex(v5);
 
 		MeshSurface meshSurface = MeshSurface.of(geom);
-		List<CDPolygonNs> polygons = meshSurface.getPolygons();
+		List<CDPolygonNs> polygons = meshSurface.polygons();
 		assertEquals(2, polygons.size());
 
-		CDPolygonNs edgePoly1 = meshSurface.getPolygons().get(0);
-		CDPolygonNs edgePoly2 = meshSurface.getPolygons().get(1);
+		CDPolygonNs edgePoly1 = meshSurface.polygons().get(0);
+		CDPolygonNs edgePoly2 = meshSurface.polygons().get(1);
 
 		List<PolygonPolygonIntersection> intersectPolygons = IntersectPlanarPolygons.intersectPolygons(edgePoly1,
 				edgePoly2, 0.000001, 0.001);

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

@@ -67,7 +67,7 @@ import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
  */
 public abstract class Check {
 
-	private List<Class<Checkable>> applicableToClasses = new ArrayList<>(2);
+	private final List<Class<Checkable>> applicableToClasses = new ArrayList<>(2);
 
 	@SuppressWarnings("unchecked")
 	protected Check() {

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

@@ -79,7 +79,7 @@ public interface CheckError extends Serializable {
 	 * implementor of the error decides which information is written into the report
 	 * or shown on the GUI.
 	 * 
-	 * @param report
+	 * @param report the ErrorReport.
 	 */
 	public void report(ErrorReport report);
 

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

@@ -18,10 +18,12 @@
  */
 package de.hft.stuttgart.citydoctor2.check;
 
+import java.io.Serial;
 import java.io.Serializable;
 
-public class CheckId implements Serializable {
+public record CheckId(String name) implements Serializable {
 
+	@Serial
 	private static final long serialVersionUID = -6267337828874296004L;
 
 	public static final CheckId C_GE_R_TOO_FEW_POINTS = new CheckId("C_GE_R_TOO_FEW_POINTS");
@@ -55,23 +57,6 @@ public class CheckId implements Serializable {
 	public static final CheckId C_GE_P_ORIENTATION_RINGS_SAME = new CheckId("C_GE_P_ORIENTATION_RINGS_SAME");
 	public static final CheckId C_SE_POLYGON_WITHOUT_SURFACE = new CheckId("C_SE_POLYGON_WITHOUT_SURFACE");
 
-	private String name;
-
-	public CheckId(String name) {
-		this.name = name;
-	}
-	
-	public String getName() {
-		return name;
-	}
-	
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		return result;
-	}
 
 	@Override
 	public boolean equals(Object obj) {

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

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 /**
@@ -29,6 +30,7 @@ import java.io.Serializable;
  */
 public class CheckResult implements Serializable {
 
+	@Serial
 	private static final long serialVersionUID = -8775678793477525693L;
 	
 	private final CheckId id;
@@ -38,7 +40,7 @@ public class CheckResult implements Serializable {
 	/**
 	 * Constructor for this container
 	 * 
-	 * @param c   the check which produced this result
+	 * @param id   the check which produced this result
 	 * @param s   the status of the result
 	 * @param err an optional error object
 	 */
@@ -66,15 +68,7 @@ public class CheckResult implements Serializable {
 
 	@Override
 	public String toString() {
-		StringBuilder builder = new StringBuilder();
-		builder.append("CheckResult [id=");
-		builder.append(id);
-		builder.append(", status=");
-		builder.append(status);
-		builder.append(", error=");
-		builder.append(err);
-		builder.append("]");
-		return builder.toString();
+        return String.format("CheckResult [id=%s, status=%s, error=%s]", id, status, err);
 	}
 
 }

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

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
@@ -36,11 +37,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
  */
 public abstract class Checkable implements Serializable {
 
+	@Serial
 	private static final long serialVersionUID = -1707871839265057882L;
 
 	private static final Logger logger = LogManager.getLogger(Checkable.class);
 
-	private Map<CheckId, CheckResult> checkResults = new HashMap<>();
+	private final Map<CheckId, CheckResult> checkResults = new HashMap<>();
 	private boolean isValidated = false;
 
 	protected void setValidated(boolean validated) {

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

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 /**
@@ -30,11 +31,12 @@ import java.io.Serializable;
  */
 public class DefaultParameter implements Serializable {
 
+	@Serial
 	private static final long serialVersionUID = -4587211298078974066L;
 	
-	private String name;
-	private String value;
-	private Unit unitType;
+	private final String name;
+	private final String value;
+	private final Unit unitType;
 
 	public DefaultParameter(String name, String defaultValue, Unit unitType) {
 		this.name = name;