This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 47e453565c ISIS-3085: somewhat restore semantics for prev. commit
47e453565c is described below
commit 47e453565cc12f6546456347620b587bbb6a53ff
Author: andi-huber <[email protected]>
AuthorDate: Sun Jul 24 16:19:24 2022 +0200
ISIS-3085: somewhat restore semantics for prev. commit
---
.../PropertyLayout/renderDay/PropertyLayoutRenderDayVm.java | 6 +++---
...yLayoutRenderDayVm_mixinEndDateWithMetaAnnotationOverridden.java | 2 +-
.../PropertyLayoutRenderDayVm_mixinEndDateWithPropertyLayout.java | 4 ++--
...LayoutRenderDayVm_updateEndDateWithMetaAnnotationOverridden.java | 4 ++--
.../PropertyLayoutRenderDayVm_updateEndDateWithParameterLayout.java | 4 ++--
.../renderDay/RenderDayMetaAnnotationEndDateExclusive.java | 3 ++-
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm.java
index da339c2ab9..bae290cd3f 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm.java
@@ -76,9 +76,9 @@ public class PropertyLayoutRenderDayVm implements
HasAsciiDocDescription {
//tag::render-as-day-before[]
@Property(optionality = Optionality.OPTIONAL)
- @ValueSemantics(dateRenderAdjustDays = -1) // <.>
+ @ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)
// <.>
@PropertyLayout(describedAs =
- "@ValueSemantics(dateRenderAdjustDays = -1)",
+ "@ValueSemantics(dateRenderAdjustDays =
ValueSemantics.AS_DAY_BEFORE)",
fieldSetId = "annotation", sequence = "2")
@XmlElement(required = false)
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@@ -126,7 +126,7 @@ public class PropertyLayoutRenderDayVm implements
HasAsciiDocDescription {
//tag::meta-annotation-overridden[]
@RenderDayMetaAnnotationStartDateInclusive // <.>
@Property(optionality = Optionality.OPTIONAL)
- @ValueSemantics(dateRenderAdjustDays = -1)
+ @ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)
@PropertyLayout(describedAs =
"@RenderDayMetaAnnotationEndDateExclusive",
fieldSetId = "meta-annotated-overridden", sequence = "1")
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithMetaAnnotationOverridden.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithMetaAnnotationOverridden.java
index 3e35b5b18b..58fbc01b73 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithMetaAnnotationOverridden.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithMetaAnnotationOverridden.java
@@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor;
// deliberately incorrectly annotated
@RenderDayMetaAnnotationStartDateInclusive // <.>
@Property()
-@ValueSemantics(dateRenderAdjustDays = -1) // <.>
+@ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)
// <.>
@PropertyLayout(describedAs =
"@RenderDayMetaAnnotationStartDateInclusive" +
" @PropertyLayout(renderDay = AS_DAY_BEFORE",
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithPropertyLayout.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithPropertyLayout.java
index 20438eb805..3f6e32d5cd 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithPropertyLayout.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithPropertyLayout.java
@@ -28,9 +28,9 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@ValueSemantics(dateRenderAdjustDays = -1) // <.>
+@ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE) //
<.>
@PropertyLayout(describedAs =
- "@ValueSemantics(dateRenderAdjustDays = -1)",
+ "@ValueSemantics(dateRenderAdjustDays = ValueSemantics.AS_DAY_BEFORE)",
fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_updateEndDateWithMetaAnnotationOverridden.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_updateEndDateWithMetaAnnotationOverridden.java
index c99d6c7647..b2804bc77a 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_updateEndDateWithMetaAnnotationOverridden.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_updateEndDateWithMetaAnnotationOverridden.java
@@ -46,10 +46,10 @@ public class
PropertyLayoutRenderDayVm_updateEndDateWithMetaAnnotationOverridden
@MemberSupport public PropertyLayoutRenderDayVm act(
@RenderDayMetaAnnotationStartDateInclusive // <.>
@Parameter(optionality = Optionality.OPTIONAL)
- @ValueSemantics(dateRenderAdjustDays = -1) // <.>
+ @ValueSemantics(dateRenderAdjustDays =
ValueSemantics.AS_DAY_BEFORE) // <.>
@ParameterLayout(describedAs =
"@RenderDayMetaAnnotationStartDateInclusive " +
- "@ValueSemantics(dateRenderAdjustDays = -1)"
+ "@ValueSemantics(dateRenderAdjustDays =
ValueSemantics.AS_DAY_BEFORE)"
)
final LocalDate endDate) {
propertyLayoutRenderDayVm.setEndDateUsingMetaAnnotationButOverridden(endDate);
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_updateEndDateWithParameterLayout.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_updateEndDateWithParameterLayout.java
index 14daaf1094..5aeef9fdd4 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_updateEndDateWithParameterLayout.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_updateEndDateWithParameterLayout.java
@@ -45,9 +45,9 @@ public class
PropertyLayoutRenderDayVm_updateEndDateWithParameterLayout {
//tag::annotation[]
@MemberSupport public PropertyLayoutRenderDayVm act(
@Parameter(optionality = Optionality.OPTIONAL)
- @ValueSemantics(dateRenderAdjustDays = -1) // <.>
+ @ValueSemantics(dateRenderAdjustDays =
ValueSemantics.AS_DAY_BEFORE) // <.>
@ParameterLayout(describedAs =
- "@ValueSemantics(dateRenderAdjustDays = -1)")
+ "@ValueSemantics(dateRenderAdjustDays =
ValueSemantics.AS_DAY_BEFORE)")
final LocalDate endDate) {
propertyLayoutRenderDayVm.setEndDate(endDate);
return propertyLayoutRenderDayVm;
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/RenderDayMetaAnnotationEndDateExclusive.java
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/RenderDayMetaAnnotationEndDateExclusive.java
index 00b74c5940..000e6f0605 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/RenderDayMetaAnnotationEndDateExclusive.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/RenderDayMetaAnnotationEndDateExclusive.java
@@ -27,7 +27,8 @@ import java.lang.annotation.Target;
import org.apache.isis.applib.annotation.ValueSemantics;
//tag::class[]
-@ValueSemantics(dateRenderAdjustDays = -1) // <.>
+@ValueSemantics(dateRenderAdjustDays
+ = ValueSemantics.AS_DAY_BEFORE) // <.>
@Inherited
@Target({
ElementType.METHOD, ElementType.FIELD, // <.>
