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/RingNotClosedError.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;
+
 /**
  * If the first and last point of a linear ring are not the same, this error is
  * created.
@@ -37,9 +39,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
  */
 public class RingNotClosedError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 2554099996830579201L;
 	
-	private LinearRing ring;
+	private final LinearRing ring;
 
 	public RingNotClosedError(LinearRing ring) {
 		this.ring = ring;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/RingTooFewPointsError.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;
+
 /**
  * If a linear ring has less than 4 distinct points, it is has too few points.
  * 
@@ -36,9 +38,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.LinearRing;
  */
 public class RingTooFewPointsError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 7207518573842743261L;
 	
-	private LinearRing lr;
+	private final LinearRing lr;
 
 	public RingTooFewPointsError(LinearRing lr) {
 		this.lr = lr;

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

@@ -27,14 +27,17 @@ import de.hft.stuttgart.citydoctor2.check.HealingMethod;
 import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 
+import java.io.Serial;
+
 public class SchematronError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -2964084500589868928L;
 
-	private String errorId;
-	private String gmlId;
-	private String childId;
-	private String nameOfAttribute;
+	private final String errorId;
+	private final String gmlId;
+	private final String childId;
+	private final String nameOfAttribute;
 
 	public SchematronError(String errorId, String gmlId, String childId, String nameOfAttribute) {
 		this.errorId = errorId;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/SolidNotClosedError.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.GmlElement;
  */
 public class SolidNotClosedError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 8256385219885788891L;
 	
-	private List<Edge> errorEdges;
-	private Geometry g;
+	private final List<Edge> errorEdges;
+	private final Geometry g;
 
 	public SolidNotClosedError(Geometry g, List<Edge> errorEdges) {
 		this.errorEdges = errorEdges;

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/error/SolidSelfIntError.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,11 +40,12 @@ import de.hft.stuttgart.citydoctor2.utils.PolygonIntersection;
  */
 public class SolidSelfIntError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = -4479936555545861422L;
 	
-	private Geometry g;
+	private final Geometry g;
 	
-	private List<PolygonIntersection> intersections;
+	private final List<PolygonIntersection> intersections;
 
 	public SolidSelfIntError(Geometry g, List<PolygonIntersection> intersections) {
 		this.g = g;

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

@@ -28,6 +28,8 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 
+import java.io.Serial;
+
 /**
  * Container object for an unfragmented error
  * 
@@ -36,10 +38,11 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
  */
 public class SurfaceUnfragmentedError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 3146243879393474196L;
 	
-	private BoundarySurface bs;
-	private double angleDeviation;
+	private final BoundarySurface bs;
+	private final double angleDeviation;
 
 	public SurfaceUnfragmentedError(BoundarySurface bs, double angleDerivation) {
 		this.bs = bs;

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

@@ -28,6 +28,8 @@ import de.hft.stuttgart.citydoctor2.check.ModificationListener;
 import de.hft.stuttgart.citydoctor2.datastructure.Geometry;
 import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
 
+import java.io.Serial;
+
 /**
  * When a geometry has less than 4 polygons, it cannot form a valid solid.
  * 
@@ -36,9 +38,10 @@ import de.hft.stuttgart.citydoctor2.datastructure.GmlElement;
  */
 public class TooFewPolygonsError implements CheckError {
 
+	@Serial
 	private static final long serialVersionUID = 5800732409355221678L;
 	
-	private Geometry g;
+	private final Geometry g;
 
 	public TooFewPolygonsError(Geometry g) {
 		this.g = g;

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

@@ -21,8 +21,11 @@ package de.hft.stuttgart.citydoctor2.datastructure;
 import de.hft.stuttgart.citydoctor2.utils.CopyHandler;
 import de.hft.stuttgart.citydoctor2.utils.Copyable;
 
+import java.io.Serial;
+
 public class BuildingPart extends AbstractBuilding {
 	
+	@Serial
 	private static final long serialVersionUID = 8200322261958679163L;
 	
 	private Building parent;