Merge branch 'dev_gui_features_zip_loading' into 'dev'

Add ZIP-archive support See merge request !26

Merge branch 'dev_gui_features_zip_loading' into 'dev'
Add ZIP-archive support See merge request !26
2459496d · Riegel · ca7fe768 · b75c2602 · 2459496d · 2459496d
Commit 2459496d authored Feb 20, 2025 by Riegel
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/implicit/Implicit2.gml
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/implicit/Implicit2.gml
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/implicit/Main_model.gml
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/implicit/Main_model.gml
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/implicit/subdir/Implicit3.gml
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/implicit/subdir/Implicit3.gml
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive.zip
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive.zip
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive/mock1.gml
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive/mock1.gml
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive/mock2.gml
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive/mock2.gml
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive/mock3.gml
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive/mock3.gml
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive/mock4.gml
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive/mock4.gml
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive/mock5.gml
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/mock_archive/mock5.gml
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/validate.zip
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/validate.zip
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/validate/valCorrect.gml
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/validate/valCorrect.gml
--- a/CityDoctorParent/CityDoctorModel/src/test/resources/zip/validate/valFaulty.gml
+++ b/CityDoctorParent/CityDoctorModel/src/test/resources/zip/validate/valFaulty.gml
--- a/CityDoctorParent/CityDoctorValidation/pom.xml
+++ b/CityDoctorParent/CityDoctorValidation/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.hft.stuttgart</groupId>
 		<artifactId>CityDoctorParent</artifactId>
-		<version>3.16.0</version>
+		<version>3.17.0</version>
 	</parent>
 	<artifactId>CityDoctorValidation</artifactId>
 	<name>CityDoctorValidation</name>

--- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java
+++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidation.java
--- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidationCLI.java
+++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/CityDoctorValidationCLI.java
--- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java
+++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java
--- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/StreamCityGmlConsumer.java
+++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/StreamCityGmlConsumer.java
--- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/XmlStreamReporter.java
+++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/XmlStreamReporter.java
--- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/XmlValidationReporter.java
+++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/XmlValidationReporter.java
--- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/PdfStreamReporter.java
+++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/reporting/pdf/PdfStreamReporter.java