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/01/17 01:11:49 UTC
[isis] 13/36: ISIS-2264: isis.value.format["datetime"] ->
isis.value-types.joda.local-date-time.format
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c61f6a8174d651bd31c9c6b2569266697b424fb9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 16 23:33:57 2020 +0100
ISIS-2264: isis.value.format["datetime"] -> isis.value-types.joda.local-date-time.format
---
.../components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc | 4 ++++
.../main/java/org/apache/isis/core/config/IsisConfiguration.java | 8 +++++---
.../JodaLocalDateTimeValueSemanticsProvider.java | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc b/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
index bf2af81..9f1da5b 100644
--- a/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
+++ b/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
@@ -652,6 +652,10 @@ isis.value-types. +
|isis.legacy.value-types. +
{nbsp}{nbsp}percentage.format
+|isis.value.format["datetime"]
+|isis.value-types. +
+{nbsp}{nbsp}joda.local-date-time.format
+
|
|
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 2d35f48..6269d8e 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -1251,7 +1251,11 @@ public class IsisConfiguration {
private final Joda joda = new Joda();
@Data
public static class Joda {
-
+ private final LocalDateTime localDateTime = new LocalDateTime();
+ @Data
+ public static class LocalDateTime {
+ private String format = "medium";
+ }
}
}
@@ -1300,8 +1304,6 @@ public class IsisConfiguration {
DATE,
TIMESTAMP,
TIME,
-
- PERCENTAGE
}
public String getFormatOrElse(FormatIdentifier formatIdentifier, String defaultFormat) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
index 909a922..77bd9b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
@@ -133,7 +133,7 @@ implements JodaLocalDateTimeValueFacet {
super(type(), holder, LocalDateTime.class, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE);
String configuredNameOrPattern = getConfiguration()
- .getValue().getFormatOrElse(FormatIdentifier.DATETIME, "medium");
+ .getValueTypes().getJoda().getLocalDateTime().getFormat();
updateTitleStringFormatter(configuredNameOrPattern);
}