diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java index ad5dc1d6136702f5a160b7fbd35036d8578e73b2..2f2c756e792d4e865598822dc7cc1d014cdac067 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java @@ -26,6 +26,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; @@ -35,13 +42,6 @@ import org.xml.sax.InputSource; import de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportParseException; import de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportWriteException; import de.hft.stuttgart.citydoctor2.checkresult.utility.IndentationXmlStreamWriter; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "error_report") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgeReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgeReport.java index 4da45d7ae5bf195bfde7700063b8997af23ea013..f8a1e4a6c483e302452b69a72f781f62264fdccd 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgeReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgeReport.java @@ -18,10 +18,10 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class EdgeReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgesReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgesReport.java index 9c2e70b76addc1c167257a91778b122aa4a1c66a..8cd2c64fd8ead8e86df8918de97857896138bc0e 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgesReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgesReport.java @@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class EdgesReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Environment.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Environment.java index 39cb5046d8ba21ec6eaca1332bf6e467a19de952..df4cc0cbde5188c86de074fac28ee9a08bc24f31 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Environment.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Environment.java @@ -18,9 +18,9 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class Environment { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorDetails.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorDetails.java index 6ee8fde86811f1b216dbf6b440ec2f209e17b349..2f63103a18936cc504f697a79e46ebd20e3f1139 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorDetails.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorDetails.java @@ -21,9 +21,9 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class ErrorDetails { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorReport.java index 13b337ce2610e738deab91df30cd0a051d122a26..fa6e111f5dfb32726b61f6dad16c797dd807bcd4 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorReport.java @@ -18,10 +18,10 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class ErrorReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorStatistic.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorStatistic.java index a8b7e60cd7132fe227dd83d2552ffd96f7ba2a69..c97f4df61361fc6202257bcf704873fba0f454fd 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorStatistic.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorStatistic.java @@ -18,10 +18,10 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlValue; @XmlAccessorType(XmlAccessType.FIELD) public class ErrorStatistic { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Feature.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Feature.java index c8818ae34857d504650b50458acf6dccb8ac4e9d..a4210b1c6f05321f0f99faf5080d949a9705fb0b 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Feature.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Feature.java @@ -18,9 +18,9 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; @XmlAccessorType(XmlAccessType.FIELD) public class Feature { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/FeatureReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/FeatureReport.java index d4db8b56bd732d1e7fa9465d9fc9b400aa1f566f..39db02a969f4db3f7786bf431cf226212b4c0234 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/FeatureReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/FeatureReport.java @@ -21,11 +21,11 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; @XmlAccessorType(XmlAccessType.FIELD) public class FeatureReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GeometryReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GeometryReport.java index 538483e7f1a480bdded903e88d835a05a35e36dd..fc22d62884c15da76589838fc03d33422576f6a7 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GeometryReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GeometryReport.java @@ -18,10 +18,10 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class GeometryReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalErrorStatistics.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalErrorStatistics.java index 1d01b21cf8a01ede3f2c40cfabb39aafc3744839..74054be4c4390b529af9b665d1bd4ac342252016 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalErrorStatistics.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalErrorStatistics.java @@ -18,9 +18,9 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class GlobalErrorStatistics { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalStatistics.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalStatistics.java index f2b3bcbe04b8ad6ccd807db580bf3b238e953edf..6f080617479db14b3eb44453f0de66525165f4f2 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalStatistics.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalStatistics.java @@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; @XmlAccessorType(XmlAccessType.FIELD) public class GlobalStatistics { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Header.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Header.java index ee944dc67328de2ce496592ef96511de570f6b79..478e211b9297fc0b7ef12e6e409f2895038a2e0a 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Header.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Header.java @@ -20,11 +20,12 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.time.ZonedDateTime; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import de.hft.stuttgart.citydoctor2.marshaller.ZonedDateTimeAdapter; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @XmlAccessorType(XmlAccessType.FIELD) public class Header { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ModelStatistics.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ModelStatistics.java index 34f180a4de9249d712c45b4ef5ffc69610ecea12..7e9d5338bbce352946747b74fa9a69f8339c7c72 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ModelStatistics.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ModelStatistics.java @@ -18,9 +18,9 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class ModelStatistics { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParameterReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParameterReport.java index f1b281b9ebfd6c305932ce296cb95c39d523704c..c5762fdd738e06a25ffa101c63b66811e1a55bd3 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParameterReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParameterReport.java @@ -18,10 +18,10 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlValue; @XmlAccessorType(XmlAccessType.FIELD) public class ParameterReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParentReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParentReport.java index 1834151e61ce67ed49209a67e8981dc4adc83124..c95035422b52f84e6f6e6be6af1f092bbcf85eda 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParentReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParentReport.java @@ -18,9 +18,9 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; @XmlAccessorType(XmlAccessType.FIELD) public class ParentReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanCheck.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanCheck.java index 2e85ef95988c6a459b20d7c93d6830e9dfbb391a..75fa0eba2c8d89b99fac6ab4c18776f4d05eaed4 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanCheck.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanCheck.java @@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class PlanCheck { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanParameter.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanParameter.java index 7b8618815727ad0a047deb10c16449bd73d72eaf..51cb838c6d2dd083fbbda5e2225f9a55e4bae6c2 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanParameter.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanParameter.java @@ -18,10 +18,10 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlValue; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlValue; @XmlAccessorType(XmlAccessType.FIELD) public class PlanParameter { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonReport.java index 8d2e2e30134d80c58e95643a099a76a50a1c1d64..0db08ce6b942cb4d6b153a5a28543e999f302075 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonReport.java @@ -21,11 +21,11 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; @XmlAccessorType(XmlAccessType.FIELD) public class PolygonReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonsReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonsReport.java index 39ebaf154414b00b1eb657842f1ada8ca8372231..2bac574f0e502c761270067b8db4e225d8ff2624 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonsReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonsReport.java @@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class PolygonsReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/RingReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/RingReport.java index 11a9c8a4403f0fb716bcd306f0b21060348201ac..e4f18297a0ea8c29b6a398c4a67d2048ae2d5dd9 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/RingReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/RingReport.java @@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class RingReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Statistics.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Statistics.java index 3ada3925d73f6503f27231cb9e2c76b273602835..1aa375cce17280a315e93773d28637d51e6dba02 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Statistics.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Statistics.java @@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; @XmlAccessorType(XmlAccessType.FIELD) public class Statistics { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/SurfaceReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/SurfaceReport.java index 8fc8844b4b12fffdc5d19ae2e5e20d568b5b13cf..38e1f63a6f2ca8027d398511a6096cbb878ab606 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/SurfaceReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/SurfaceReport.java @@ -18,9 +18,9 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; @XmlAccessorType(XmlAccessType.FIELD) public class SurfaceReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationPlan.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationPlan.java index 4b032809f7d78935486d9018c8e2a8e5426c7057..3de6eb422b9c713069f1fe142cb989d54cdfa100 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationPlan.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationPlan.java @@ -21,9 +21,9 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; @XmlAccessorType(XmlAccessType.FIELD) public class ValidationPlan { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationResults.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationResults.java index f8a091f57e7465d2dcf9735e5cc527f8ce6d627e..403d65137748af5141a20e0a58962bd1288da2cf 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationResults.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationResults.java @@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; import java.util.ArrayList; import java.util.List; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; @XmlAccessorType(XmlAccessType.FIELD) public class ValidationResults { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/VertexReport.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/VertexReport.java index 972f48593ade6670236fff8498f1a8762694e037..c2ab875f24a537f99d8af1d84210f621ad8bd0e1 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/VertexReport.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/VertexReport.java @@ -18,9 +18,9 @@ */ package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; @XmlAccessorType(XmlAccessType.FIELD) public class VertexReport { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/package-info.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/package-info.java index 1a2f3e48b7e73b45806c434c6450908514e18273..6a761e19a72e34b057e7f367157d02a5ba18b005 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/package-info.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/package-info.java @@ -21,6 +21,6 @@ }) package de.hft.stuttgart.citydoctor2.checkresult; -import jakarta.xml.bind.annotation.XmlNs; -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlSchema; \ No newline at end of file +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlSchema; \ No newline at end of file diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/marshaller/DoubleAdapter.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/marshaller/DoubleAdapter.java index c5e4291b25d307a217be3fac8f2ac6ece1eee6d7..9dd1964bb87e831b447afeafe5f7dbdcc17d36a9 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/marshaller/DoubleAdapter.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/marshaller/DoubleAdapter.java @@ -18,7 +18,7 @@ */ package de.hft.stuttgart.citydoctor2.marshaller; -import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import javax.xml.bind.annotation.adapters.XmlAdapter; public class DoubleAdapter extends XmlAdapter<String, Double> { diff --git a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/marshaller/ZonedDateTimeAdapter.java b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/marshaller/ZonedDateTimeAdapter.java index 4982d8107e5b1881ebc75a3f9bb57052571c2169..ab999675ea26217e5507949acc8b3cbed64c462d 100644 --- a/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/marshaller/ZonedDateTimeAdapter.java +++ b/CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/marshaller/ZonedDateTimeAdapter.java @@ -21,7 +21,7 @@ package de.hft.stuttgart.citydoctor2.marshaller; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import javax.xml.bind.annotation.adapters.XmlAdapter; public class ZonedDateTimeAdapter extends XmlAdapter<String, ZonedDateTime> { diff --git a/CityDoctorParent/pom.xml b/CityDoctorParent/pom.xml index be1a362429bebe7e6e8d136fe44141f2a9198ab2..7bb8d70472907c9f5d0bcf0cb25050a73a2ff3cf 100644 --- a/CityDoctorParent/pom.xml +++ b/CityDoctorParent/pom.xml @@ -148,12 +148,12 @@ <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> - <version>3.0.0</version> + <version>2.3.3</version> </dependency> <dependency> <groupId>jakarta.xml.bind</groupId> <artifactId>jakarta.xml.bind-api</artifactId> - <version>3.0.0</version> + <version>2.3.3</version> </dependency> </dependencies> </dependencyManagement>