You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/09/02 22:00:14 UTC
[isis] 14/17: ISIS-2222: fixes jaxb view models for joda time
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2222
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6b07f83ac598600e50a937c00b7c285cfe9665fd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Aug 30 15:54:44 2020 +0100
ISIS-2222: fixes jaxb view models for joda time
---
.../dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java | 9 +++++----
.../dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java | 9 +++++----
.../types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java | 9 +++++----
.../demo/domain/src/main/resources/static/css/application.css | 3 +++
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java
index 4ddcda2..9865357 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java
@@ -33,6 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters;
+import org.apache.isis.applib.jaxb.JodaTimeJaxbAdapters;
import lombok.Getter;
import lombok.Setter;
@@ -62,26 +63,26 @@ public class JodaDateTimeVm
@Title(prepend = "org.joda.time.DateTime view model: ")
@MemberOrder(name = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class) // <.>
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.DateTimeToStringAdapter.class) // <.>
@Getter @Setter
private org.joda.time.DateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
@MemberOrder(name = "editable-properties", sequence = "1")
@XmlElement(required = true)
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.DateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.DateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
@MemberOrder(name = "optional-properties", sequence = "1")
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.DateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.DateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@MemberOrder(name = "optional-properties", sequence = "2")
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.DateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.DateTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java
index b31ae20..0f7bd07 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java
@@ -33,6 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters;
+import org.apache.isis.applib.jaxb.JodaTimeJaxbAdapters;
import lombok.Getter;
import lombok.Setter;
@@ -62,26 +63,26 @@ public class JodaLocalDateVm
@Title(prepend = "org.joda.time.LocalDate view model: ")
@MemberOrder(name = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class) // <.>
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class) // <.>
@Getter @Setter
private org.joda.time.LocalDate readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
@MemberOrder(name = "editable-properties", sequence = "1")
@XmlElement(required = true)
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDate readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
@MemberOrder(name = "optional-properties", sequence = "1")
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDate readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@MemberOrder(name = "optional-properties", sequence = "2")
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDate readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java
index 0883f15..2729453 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java
@@ -33,6 +33,7 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters;
+import org.apache.isis.applib.jaxb.JodaTimeJaxbAdapters;
import lombok.Getter;
import lombok.Setter;
@@ -62,26 +63,26 @@ public class JodaLocalDateTimeVm
@Title(prepend = "org.joda.time.LocalDateTime view model: ")
@MemberOrder(name = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class) // <.>
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class) // <.>
@Getter @Setter
private org.joda.time.LocalDateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
@MemberOrder(name = "editable-properties", sequence = "1")
@XmlElement(required = true)
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
@MemberOrder(name = "optional-properties", sequence = "1")
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@MemberOrder(name = "optional-properties", sequence = "2")
- @XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
+ @XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDateTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/resources/static/css/application.css b/examples/demo/domain/src/main/resources/static/css/application.css
index 71f3d23..d5ba37a 100644
--- a/examples/demo/domain/src/main/resources/static/css/application.css
+++ b/examples/demo/domain/src/main/resources/static/css/application.css
@@ -255,3 +255,6 @@ table.tableblock.grid-all td.tableblock {
padding: 5px;
}
+div.exceptionStackTracePanel div.errorInfo h2.mainMessage {
+ margin-left: -32px;
+}
\ No newline at end of file