Skip to content
GitLab
Commit b0bdd91b authored by Matthias Betz's avatar Matthias Betz
Browse files

revert to old javax imports because of citygml4j

parent 0d3d43e0
master 107-opengl-view dev dev_bht dev_cpp_code_conversion dev_gui_features dev_gui_features_zip_loading dev_visitor_rework 3.17.1 3.17.0 3.16.0 3.15.0 3.14.1 3.14.0 3.13.1 3.13.0 3.12.0 3.11.0 3.10.4 3.10.3 3.10.2 3.10.1 3.10.0 3.9.0 3.8.0 3.7.1 3.7.0 archive/dev_gui_features_zip_loading archive/dev_citygml3 archive/dev_GUI archive/darmstadt
No related merge requests found
Pipeline #1892 passed with stage
in 3 minutes and 6 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 80 additions and 79 deletions
+80 -79
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/CheckReport.java
+ 7
- 7
View file @ b0bdd91b
...@@ -26,6 +26,13 @@ import java.util.HashMap; ...@@ -26,6 +26,13 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; 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.XMLOutputFactory;
import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter; import javax.xml.stream.XMLStreamWriter;
...@@ -35,13 +42,6 @@ import org.xml.sax.InputSource; ...@@ -35,13 +42,6 @@ import org.xml.sax.InputSource;
import de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportParseException; import de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportParseException;
import de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportWriteException; import de.hft.stuttgart.citydoctor2.checkresult.utility.CheckReportWriteException;
import de.hft.stuttgart.citydoctor2.checkresult.utility.IndentationXmlStreamWriter; 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") @XmlRootElement(name = "error_report")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgeReport.java
+ 4
- 4
View file @ b0bdd91b
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class EdgeReport { public class EdgeReport {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/EdgesReport.java
+ 4
- 4
View file @ b0bdd91b
...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class EdgesReport { public class EdgesReport {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Environment.java
+ 3
- 3
View file @ b0bdd91b
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class Environment { public class Environment {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorDetails.java
+ 3
- 3
View file @ b0bdd91b
...@@ -21,9 +21,9 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,9 +21,9 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ErrorDetails { public class ErrorDetails {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorReport.java
+ 4
- 4
View file @ b0bdd91b
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ErrorReport { public class ErrorReport {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ErrorStatistic.java
+ 4
- 4
View file @ b0bdd91b
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.XmlValue;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ErrorStatistic { public class ErrorStatistic {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Feature.java
+ 3
- 3
View file @ b0bdd91b
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class Feature { public class Feature {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/FeatureReport.java
+ 5
- 5
View file @ b0bdd91b
...@@ -21,11 +21,11 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,11 +21,11 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElementWrapper;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class FeatureReport { public class FeatureReport {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GeometryReport.java
+ 4
- 4
View file @ b0bdd91b
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class GeometryReport { public class GeometryReport {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalErrorStatistics.java
+ 3
- 3
View file @ b0bdd91b
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class GlobalErrorStatistics { public class GlobalErrorStatistics {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/GlobalStatistics.java
+ 4
- 4
View file @ b0bdd91b
...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElementWrapper;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class GlobalStatistics { public class GlobalStatistics {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Header.java
+ 5
- 4
View file @ b0bdd91b
...@@ -20,11 +20,12 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -20,11 +20,12 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.time.ZonedDateTime; 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 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) @XmlAccessorType(XmlAccessType.FIELD)
public class Header { public class Header {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ModelStatistics.java
+ 3
- 3
View file @ b0bdd91b
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ModelStatistics { public class ModelStatistics {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParameterReport.java
+ 4
- 4
View file @ b0bdd91b
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.XmlValue;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ParameterReport { public class ParameterReport {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ParentReport.java
+ 3
- 3
View file @ b0bdd91b
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class ParentReport { public class ParentReport {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanCheck.java
+ 4
- 4
View file @ b0bdd91b
...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class PlanCheck { public class PlanCheck {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PlanParameter.java
+ 4
- 4
View file @ b0bdd91b
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
*/ */
package de.hft.stuttgart.citydoctor2.checkresult; package de.hft.stuttgart.citydoctor2.checkresult;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.XmlValue;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class PlanParameter { public class PlanParameter {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonReport.java
+ 5
- 5
View file @ b0bdd91b
...@@ -21,11 +21,11 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,11 +21,11 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElementWrapper;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class PolygonReport { public class PolygonReport {
......
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/PolygonsReport.java
+ 4
- 4
View file @ b0bdd91b
...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult; ...@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import jakarta.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class PolygonsReport { public class PolygonsReport {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal