Merge branch 'dev_GUI' into 'dev'

Open source release of CityDoctorGUI and other extensions.

See merge request !6

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

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check.error;
 
+import java.io.Serial;
 import java.util.List;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
@@ -40,10 +41,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class MultipleConnectedComponentsError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 2152069835068857036L;
 	
-	private Geometry geom;
-	private List<List<Polygon>> components;
+	private final Geometry geom;
+	private final List<List<Polygon>> components;
 
 	public MultipleConnectedComponentsError(Geometry geom, List<List<Polygon>> components) {
 		this.geom = geom;

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

@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 /**
  * If an inner ring is with in the boundaries of another, this error is created.
  * 
@@ -37,11 +39,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class NestedRingError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -3396113374745830193L;
 	
-	private Polygon p;
-	private LinearRing innerRing;
-	private LinearRing withinRing;
+	private final Polygon p;
+	private final LinearRing innerRing;
+	private final LinearRing withinRing;
 
 	public NestedRingError(Polygon p, LinearRing innerRing, LinearRing withinRing) {
 		this.p = p;

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

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check.error;
 
+import java.io.Serial;
 import java.util.List;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
@@ -39,10 +40,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
  */
 public class NonManifoldEdgeError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -6742948557014332402L;
 	
-	private List<Edge> edges;
-	private Geometry geom;
+	private final List<Edge> edges;
+	private final Geometry geom;
 
 	public NonManifoldEdgeError(Geometry geom, List<Edge> edges) {
 		this.edges = edges;

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

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check.error;
 
+import java.io.Serial;
 import java.util.List;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
@@ -41,11 +42,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
  */
 public class NonManifoldVertexError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -3915669943428175777L;
 	
-	private List<List<Polygon>> components;
-	private Geometry geom;
-	private Vertex v;
+	private final List<List<Polygon>> components;
+	private final Geometry geom;
+	private final Vertex v;
 
 	public NonManifoldVertexError(Geometry geom, List<List<Polygon>> components, Vertex v) {
 		this.geom = geom;

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

@@ -31,6 +31,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 import de.hft.stuttgart.citydoctor2.math.Plane;
 import de.hft.stuttgart.citydoctor2.utils.Localization;
 
+import java.io.Serial;
+
 /**
  * Error object for planarity errors containing the polygon, the regression
  * plane and the distance to the plane.
@@ -40,12 +42,13 @@ import de.hft.stuttgart.citydoctor2.utils.Localization;
  */
 public class NonPlanarPolygonDistancePlaneError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -3504364055236383519L;
 	
-	private Polygon p;
-	private double distance;
-	private Vertex v;
-	private Plane plane;
+	private final Polygon p;
+	private final double distance;
+	private final Vertex v;
+	private final Plane plane;
 
 	public NonPlanarPolygonDistancePlaneError(Polygon p, double distance, Vertex v, Plane plane) {
 		this.p = p;

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

@@ -28,6 +28,8 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 /**
  * When the normal of the triangles created from the triangulation of the
  * polygon have a too large angle between them, this error is created.
@@ -37,10 +39,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class NonPlanarPolygonNormalsDeviation implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 69073161885265794L;
 	
-	private Polygon p;
-	private double deviation;
+	private final Polygon p;
+	private final double deviation;
 
 	public NonPlanarPolygonNormalsDeviation(Polygon p, double deviation) {
 		this.p = p;

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

@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 /**
  * If a boundary surface is infact not a ceiling even though it was defined as
  * one.
@@ -38,10 +40,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class NotCeilingError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 6725904270389419696L;
-	
-	private BoundarySurface surface;
-	private Polygon p;
+	private final BoundarySurface surface;
+	private final Polygon p;
 
 	public NotCeilingError(BoundarySurface bs, Polygon p) {
 		surface = bs;

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

@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 /**
  * When a boundary surface is not a floor even though it was defined as one.
  * 
@@ -37,10 +39,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class NotFloorError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -3193557053834977449L;
 	
-	private BoundarySurface surface;
-	private Polygon p;
+	private final BoundarySurface surface;
+	private final Polygon p;
 
 	public NotFloorError(BoundarySurface bs, Polygon p) {
 		surface = bs;

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

@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 /**
  * If a boundary surface is not a ground surface even though it was defined as
  * one.
@@ -38,10 +40,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class NotGroundError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 8793224454858861221L;
 	
-	private BoundarySurface surface;
-	private Polygon p;
+	private final BoundarySurface surface;
+	private final Polygon p;
 
 	public NotGroundError(BoundarySurface bs, Polygon p) {
 		surface = bs;

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

@@ -30,6 +30,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 
+import java.io.Serial;
+
 /**
  * if a boundary surface is not a wall even though it was defined as one.
  * 
@@ -38,11 +40,12 @@ import de.hft.stuttgart.citydoctor2.math.Vector3d;
  */
 public class NotWallError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 406429139625558232L;
 	
-	private BoundarySurface surface;
-	private Polygon p;
-	private Vector3d normal;
+	private final BoundarySurface surface;
+	private final Polygon p;
+	private final Vector3d normal;
 
 	public NotWallError(BoundarySurface bs, Polygon p, Vector3d normal) {
 		surface = bs;

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

@@ -28,6 +28,8 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 
+import java.io.Serial;
+
 /**
  * When a linear ring has a near zero area this error is created.
  * 
@@ -36,9 +38,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
  */
 public class NullAreaError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 1358910429039553687L;
 	
-	private LinearRing lr;
+	private final LinearRing lr;
 
 	public NullAreaError(LinearRing lr) {
 		this.lr = lr;

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

@@ -30,6 +30,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 
+import java.io.Serial;
+
 /**
  * If a point of a linear ring touches an edge of the same ring it is considered
  * self intersecting and this error object is created.
@@ -39,11 +41,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
  */
 public class PointTouchesEdgeError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 3277456707271748954L;
 	
-	private LinearRing lr;
-	private Edge e;
-	private Vertex v;
+	private final LinearRing lr;
+	private final Edge e;
+	private final Vertex v;
 
 	public PointTouchesEdgeError(LinearRing lr, Edge e, Vertex v) {
 		this.lr = lr;

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

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check.error;
 
+import java.io.Serial;
 import java.util.List;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
@@ -40,10 +41,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class PolygonHoleOutsideError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -4522153084655775231L;
 	
-	private List<LinearRing> holesOutside;
-	private Polygon p;
+	private final List<LinearRing> holesOutside;
+	private final Polygon p;
 
 	public PolygonHoleOutsideError(Polygon p, List<LinearRing> holesOutside) {
 		this.p = p;

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

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check.error;
 
+import java.io.Serial;
 import java.util.List;
 
 import de.hft.stuttgart.citydoctor2.check.CheckError;
@@ -40,10 +41,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class PolygonInteriorDisconnectedError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 511849016699842395L;
 	
-	private Polygon p;
-	private List<LinearRing> connectedRings;
+	private final Polygon p;
+	private final List<LinearRing> connectedRings;
 
 	public PolygonInteriorDisconnectedError(Polygon p, List<LinearRing> connectedRings) {
 		this.p = p;

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

@@ -30,6 +30,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 import de.hft.stuttgart.citydoctor2.utils.SerializablePair;
 
+import java.io.Serial;
+
 /**
  * If the exterior ring and interior rings are intersecting each other, it
  * results in a polygon self intersection and this error is created.
@@ -39,10 +41,11 @@ import de.hft.stuttgart.citydoctor2.utils.SerializablePair;
  */
 public class PolygonIntersectingRingsError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -7043521697085991901L;
 	
-	private Polygon p;
-	private SerializablePair<LinearRing, LinearRing> intersectingRings;
+	private final Polygon p;
+	private final SerializablePair<LinearRing, LinearRing> intersectingRings;
 
 	public PolygonIntersectingRingsError(Polygon p, SerializablePair<LinearRing, LinearRing> intersectingRings) {
 		this.p = p;

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

@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 /**
  * If the interior rings have the same orientation as the exterior ring, this
  * error is created.
@@ -38,10 +40,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class PolygonSameOrientationError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -6192337889977667459L;
 	
-	private Polygon p;
-	private LinearRing innerRing;
+	private final Polygon p;
+	private final LinearRing innerRing;
 
 	public PolygonSameOrientationError(Polygon p, LinearRing inner) {
 		this.p = p;

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

@@ -10,11 +10,14 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
 
+import java.io.Serial;
+
 public class PolygonWithoutSurfaceError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 2676579487514583105L;
 	
-	private Polygon p;
+	private final Polygon p;
 
 
 	public PolygonWithoutSurfaceError(Polygon polygon) {

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

@@ -18,6 +18,7 @@
  */
 package de.hft.stuttgart.citydoctor2.check.error;
 
+import java.io.Serial;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -44,10 +45,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.Polygon;
  */
 public class PolygonWrongOrientationError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -3006643655816847097L;
 	
-	private List<Edge> edges;
-	private Geometry g;
+	private final List<Edge> edges;
+	private final Geometry g;
 
 	public PolygonWrongOrientationError(Geometry g, List<Edge> edges) {
 		this.edges = edges;

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

@@ -29,6 +29,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 
+import java.io.Serial;
+
 /**
  * When a point is repeated in a linear ring, but is not consecutive. This
  * results in a self intersection of the ring and this error object is created.
@@ -38,11 +40,12 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
  */
 public class RingDuplicatePointError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 7208982075173209953L;
 	
-	private LinearRing r;
-	private Vertex v1;
-	private Vertex v2;
+	private final LinearRing r;
+	private final Vertex v1;
+	private final Vertex v2;
 
 	public RingDuplicatePointError(LinearRing r, Vertex v1, Vertex v2) {
 		this.r = r;

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

@@ -30,6 +30,8 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 
+import java.io.Serial;
+
 /**
  * When two edges of the same linear ring are intersecting with each other this
  * error object is created.
@@ -39,12 +41,13 @@ import de.hft.stuttgart.citydoctor2.math.Vector3d;
  */
 public class RingEdgeIntersectionError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 4923311259469198172L;
 
-	private Edge e1;
-	private Edge e2;
-	private Vector3d intersection;
-	private LinearRing lr;
+	private final Edge e1;
+	private final Edge e2;
+	private final Vector3d intersection;
+	private final LinearRing lr;
 
 	public RingEdgeIntersectionError(LinearRing lr, Edge e1, Edge e2, Vector3d intersection) {
 		if (e1 == null || e2 == null || lr == null || intersection == null) {