Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
b0bdd91b
Commit
b0bdd91b
authored
Jan 25, 2021
by
Matthias Betz
Browse files
revert to old javax imports because of citygml4j
parent
0d3d43e0
Pipeline
#1892
passed with stage
in 3 minutes and 6 seconds
Changes
30
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/RingReport.java
View file @
b0bdd91b
...
...
@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.util.ArrayList
;
import
java.util.List
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
RingReport
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/Statistics.java
View file @
b0bdd91b
...
...
@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.util.ArrayList
;
import
java.util.List
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlElementWrapper
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
vax
.xml.bind.annotation.XmlElementWrapper
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
Statistics
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/SurfaceReport.java
View file @
b0bdd91b
...
...
@@ -18,9 +18,9 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
SurfaceReport
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationPlan.java
View file @
b0bdd91b
...
...
@@ -21,9 +21,9 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.util.ArrayList
;
import
java.util.List
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
ValidationPlan
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/ValidationResults.java
View file @
b0bdd91b
...
...
@@ -21,10 +21,10 @@ package de.hft.stuttgart.citydoctor2.checkresult;
import
java.util.ArrayList
;
import
java.util.List
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlElement
;
import
ja
karta
.xml.bind.annotation.XmlElementWrapper
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlElement
;
import
ja
vax
.xml.bind.annotation.XmlElementWrapper
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
ValidationResults
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/VertexReport.java
View file @
b0bdd91b
...
...
@@ -18,9 +18,9 @@
*/
package
de.hft.stuttgart.citydoctor2.checkresult
;
import
ja
karta
.xml.bind.annotation.XmlAccessType
;
import
ja
karta
.xml.bind.annotation.XmlAccessorType
;
import
ja
karta
.xml.bind.annotation.XmlAttribute
;
import
ja
vax
.xml.bind.annotation.XmlAccessType
;
import
ja
vax
.xml.bind.annotation.XmlAccessorType
;
import
ja
vax
.xml.bind.annotation.XmlAttribute
;
@XmlAccessorType
(
XmlAccessType
.
FIELD
)
public
class
VertexReport
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/checkresult/package-info.java
View file @
b0bdd91b
...
...
@@ -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
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/marshaller/DoubleAdapter.java
View file @
b0bdd91b
...
...
@@ -18,7 +18,7 @@
*/
package
de.hft.stuttgart.citydoctor2.marshaller
;
import
ja
karta
.xml.bind.annotation.adapters.XmlAdapter
;
import
ja
vax
.xml.bind.annotation.adapters.XmlAdapter
;
public
class
DoubleAdapter
extends
XmlAdapter
<
String
,
Double
>
{
...
...
CityDoctorParent/CityDoctorCheckResult/src/main/java/de/hft/stuttgart/citydoctor2/marshaller/ZonedDateTimeAdapter.java
View file @
b0bdd91b
...
...
@@ -21,7 +21,7 @@ package de.hft.stuttgart.citydoctor2.marshaller;
import
java.time.ZonedDateTime
;
import
java.time.format.DateTimeFormatter
;
import
ja
karta
.xml.bind.annotation.adapters.XmlAdapter
;
import
ja
vax
.xml.bind.annotation.adapters.XmlAdapter
;
public
class
ZonedDateTimeAdapter
extends
XmlAdapter
<
String
,
ZonedDateTime
>
{
...
...
CityDoctorParent/pom.xml
View file @
b0bdd91b
...
...
@@ -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>
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment