You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/08 19:09:37 UTC
[isis] branch master updated: ISIS-2602: rename
@PropertyLayout(fieldSet->fieldSetId)
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 44e9bb5 ISIS-2602: rename @PropertyLayout(fieldSet->fieldSetId)
44e9bb5 is described below
commit 44e9bb51b180e13df1b4693fa83ec2b5378d7357
Author: ahuber@apache.org <ah...@luna>
AuthorDate: Thu Apr 8 21:09:19 2021 +0200
ISIS-2602: rename @PropertyLayout(fieldSet->fieldSetId)
also introduce @PropertyLayout(fieldSetName)
also refine the fieldSet java-doc details
---
.../isis/applib/annotation/ActionLayout.java | 30 ++++++--
.../isis/applib/annotation/PropertyLayout.java | 80 ++++++++++++----------
.../mixins/metamodel/Object_objectIdentifier.java | 2 +-
.../applib/mixins/metamodel/Object_objectType.java | 2 +-
.../applib/mixins/system/DomainChangeRecord.java | 18 ++---
.../members/layout/group/LayoutGroupFacet.java | 4 +-
...youtGroupFacetFromPropertyLayoutAnnotation.java | 2 +-
.../HasAsciiDocDescription_description.java | 2 +-
.../HasAsciiDocDescription_sources.java | 2 +-
.../associateWith/ActionAssociateWithVm.java | 4 +-
.../child/ActionAssociateWithChildVm.java | 2 +-
.../ActionCommandPublishingJdo.java | 8 +--
.../Action/domainEvent/ActionDomainEventVm.java | 2 +-
.../ActionDomainEventVm_controlUpdateText.java | 2 +-
.../ActionExecutionPublishingJdo.java | 6 +-
.../actions/Action/hidden/ActionHiddenVm.java | 4 +-
.../Action/restrictTo/ActionRestrictToVm.java | 10 +--
.../Action/semantics/ActionSemanticsVm.java | 18 ++---
.../Action/typeOf/child/ActionTypeOfChildVm.java | 8 +--
.../position/ActionLayoutPositionVm.java | 4 +-
.../promptStyle/ActionLayoutPromptStyleVm.java | 10 +--
.../child/CollectionDomainEventChildVm.java | 2 +-
.../CollectionDomainEventVm_controlChildren.java | 2 +-
.../DomainObjectEntityChangePublishingJdo.java | 4 +-
.../other/mixins/CountHolder_explanation.java | 2 +-
.../PropertyCommandPublishingJdo.java | 8 +--
.../domainEvent/PropertyDomainEventVm.java | 2 +-
.../PropertyDomainEventVm_controlText.java | 2 +-
.../Property/editing/PropertyEditingVm.java | 6 +-
.../PropertyExecutionPublishingJdo.java | 6 +-
.../Property/fileAccept/PropertyFileAcceptVm.java | 8 +--
.../Property/hidden/PropertyHiddenVm.java | 10 +--
...tyHiddenVm_mixinPropertyWithMetaAnnotation.java | 2 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 2 +-
.../hidden/child/PropertyHiddenChildVm.java | 18 ++---
.../child/PropertyHiddenChildVm_mixinProperty.java | 2 +-
.../Property/maxLength/PropertyMaxLengthVm.java | 6 +-
.../mustSatisfy/PropertyMustSatisfyVm.java | 6 +-
.../optionality/PropertyOptionalityVm.java | 8 +--
.../Property/projecting/PropertyProjectingVm.java | 2 +-
.../child/PropertyProjectingChildVm.java | 2 +-
.../projecting/jdo/PropertyProjectingChildJdo.java | 2 +-
.../regexPattern/PropertyRegexPatternVm.java | 6 +-
.../Property/snapshot/PropertySnapshotVm.java | 12 ++--
.../cssClass/PropertyLayoutCssClassVm.java | 8 +--
.../PropertyLayoutCssClassVm_mixinProperty.java | 2 +-
...CssClassVm_mixinPropertyWithMetaAnnotation.java | 2 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 2 +-
.../describedAs/PropertyLayoutDescribedAsVm.java | 8 +--
.../PropertyLayoutDescribedAsVm_mixinProperty.java | 2 +-
...cribedAsVm_mixinPropertyWithMetaAnnotation.java | 2 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 2 +-
.../hidden/PropertyLayoutHiddenVm.java | 12 ++--
...utHiddenVm_mixinPropertyWithMetaAnnotation.java | 2 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 2 +-
.../hidden/child/PropertyLayoutHiddenChildVm.java | 18 ++---
.../PropertyLayoutHiddenChildVm_mixinProperty.java | 2 +-
.../PropertyLayoutLabelPositionVm.java | 22 +++---
...ropertyLayoutLabelPositionVm_mixinProperty.java | 2 +-
...PositionVm_mixinPropertyWithMetaAnnotation.java | 2 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 2 +-
.../multiLine/PropertyLayoutMultiLineVm.java | 10 +--
.../PropertyLayoutMultiLineVm_mixinProperty.java | 2 +-
...ultiLineVm_mixinPropertyWithMetaAnnotation.java | 2 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 2 +-
.../named/PropertyLayoutNamedVm.java | 12 ++--
.../named/PropertyLayoutNamedVm_mixinProperty.java | 2 +-
...outNamedVm_mixinPropertyWithMetaAnnotation.java | 2 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 2 +-
.../PropertyLayout/navigable/FileNodeVm.java | 8 +--
.../renderDay/PropertyLayoutRenderDayVm.java | 12 ++--
...RenderDayVm_mixinEndDateWithMetaAnnotation.java | 2 +-
...m_mixinEndDateWithMetaAnnotationOverridden.java | 2 +-
...RenderDayVm_mixinEndDateWithPropertyLayout.java | 2 +-
.../repainting/PropertyLayoutRepaintingVm.java | 10 +--
.../PropertyLayoutRepaintingVm_mixinProperty.java | 2 +-
...paintingVm_mixinPropertyWithMetaAnnotation.java | 2 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 2 +-
.../PropertyLayoutTypicalLengthVm.java | 8 +--
...ropertyLayoutTypicalLengthVm_mixinProperty.java | 2 +-
...alLengthVm_mixinPropertyWithMetaAnnotation.java | 2 +-
..._mixinPropertyWithMetaAnnotationOverridden.java | 2 +-
.../core/wrapperFactory/WrapperFactoryJdo.java | 4 +-
.../xmlSnapshotService/XmlSnapshotParentVm.java | 4 +-
.../child/XmlSnapshotChildVm.java | 2 +-
.../xmlSnapshotService/peer/XmlSnapshotPeerVm.java | 2 +-
.../peer/child/XmlSnapshotPeerChildVm.java | 2 +-
.../secman/apptenancy/entities/TenantedJdo.java | 2 +-
.../types/isis/blobs/holder/IsisBlobHolder2.java | 8 +--
.../blobs/holder/IsisBlobHolder_mixinProperty.java | 2 +-
.../dom/types/isis/blobs/jdo/IsisBlobJdo.java | 8 +--
.../dom/types/isis/blobs/vm/IsisBlobVm.java | 8 +--
.../types/isis/clobs/holder/IsisClobHolder2.java | 8 +--
.../clobs/holder/IsisClobHolder_mixinProperty.java | 2 +-
.../dom/types/isis/clobs/jdo/IsisClobJdo.java | 8 +--
.../dom/types/isis/clobs/vm/IsisClobVm.java | 8 +--
.../holder/IsisLocalResourcePathHolder2.java | 8 +--
.../IsisLocalResourcePathHolder_mixinProperty.java | 2 +-
.../jdo/IsisLocalResourcePathJdo.java | 8 +--
.../vm/IsisLocalResourcePathVm.java | 8 +--
.../isis/markups/holder/IsisMarkupHolder2.java | 8 +--
.../holder/IsisMarkupHolder_mixinProperty.java | 2 +-
.../dom/types/isis/markups/jdo/IsisMarkupJdo.java | 8 +--
.../dom/types/isis/markups/vm/IsisMarkupVm.java | 8 +--
.../isis/passwords/holder/IsisPasswordHolder2.java | 8 +--
.../holder/IsisPasswordHolder_mixinProperty.java | 2 +-
.../types/isis/passwords/jdo/IsisPasswordJdo.java | 8 +--
.../types/isis/passwords/vm/IsisPasswordVm.java | 8 +--
.../asciidocs/holder/IsisAsciiDocHolder2.java | 8 +--
.../holder/IsisAsciiDocHolder_mixinProperty.java | 2 +-
.../isisext/asciidocs/jdo/IsisAsciiDocJdo.java | 8 +--
.../types/isisext/asciidocs/vm/IsisAsciiDocVm.java | 8 +--
.../markdowns/holder/IsisMarkdownHolder2.java | 8 +--
.../holder/IsisMarkdownHolder_mixinProperty.java | 2 +-
.../isisext/markdowns/jdo/IsisMarkdownJdo.java | 8 +--
.../types/isisext/markdowns/vm/IsisMarkdownVm.java | 8 +--
.../javaawt/images/holder/JavaAwtImageHolder2.java | 8 +--
.../holder/JavaAwtImageHolder_mixinProperty.java | 2 +-
.../types/javaawt/images/jdo/JavaAwtImageJdo.java | 4 +-
.../types/javaawt/images/vm/JavaAwtImageVm.java | 4 +-
.../booleans/holder/WrapperBooleanHolder2.java | 8 +--
.../holder/WrapperBooleanHolder_mixinProperty.java | 2 +-
.../javalang/booleans/jdo/WrapperBooleanJdo.java | 8 +--
.../javalang/booleans/vm/WrapperBooleanVm.java | 8 +--
.../javalang/bytes/holder/WrapperByteHolder2.java | 8 +--
.../holder/WrapperByteHolder_mixinProperty.java | 2 +-
.../types/javalang/bytes/jdo/WrapperByteJdo.java | 8 +--
.../dom/types/javalang/bytes/vm/WrapperByteVm.java | 8 +--
.../characters/holder/WrapperCharacterHolder2.java | 8 +--
.../WrapperCharacterHolder_mixinProperty.java | 2 +-
.../characters/jdo/WrapperCharacterJdo.java | 8 +--
.../javalang/characters/vm/WrapperCharacterVm.java | 8 +--
.../doubles/holder/WrapperDoubleHolder2.java | 8 +--
.../holder/WrapperDoubleHolder_mixinProperty.java | 2 +-
.../javalang/doubles/jdo/WrapperDoubleJdo.java | 8 +--
.../types/javalang/doubles/vm/WrapperDoubleVm.java | 8 +--
.../floats/holder/WrapperFloatHolder2.java | 8 +--
.../holder/WrapperFloatHolder_mixinProperty.java | 2 +-
.../types/javalang/floats/jdo/WrapperFloatJdo.java | 8 +--
.../types/javalang/floats/vm/WrapperFloatVm.java | 8 +--
.../integers/holder/WrapperIntegerHolder2.java | 8 +--
.../holder/WrapperIntegerHolder_mixinProperty.java | 2 +-
.../javalang/integers/jdo/WrapperIntegerJdo.java | 8 +--
.../javalang/integers/vm/WrapperIntegerVm.java | 8 +--
.../javalang/longs/holder/WrapperLongHolder2.java | 8 +--
.../holder/WrapperLongHolder_mixinProperty.java | 2 +-
.../types/javalang/longs/jdo/WrapperLongJdo.java | 8 +--
.../dom/types/javalang/longs/vm/WrapperLongVm.java | 8 +--
.../shorts/holder/WrapperShortHolder2.java | 8 +--
.../holder/WrapperShortHolder_mixinProperty.java | 2 +-
.../types/javalang/shorts/jdo/WrapperShortJdo.java | 8 +--
.../types/javalang/shorts/vm/WrapperShortVm.java | 8 +--
.../strings/holder/JavaLangStringHolder2.java | 8 +--
.../holder/JavaLangStringHolder_mixinProperty.java | 4 +-
.../javalang/strings/jdo/JavaLangStringJdo.java | 8 +--
.../javalang/strings/vm/JavaLangStringVm.java | 8 +--
.../holder/JavaMathBigDecimalHolder2.java | 8 +--
.../JavaMathBigDecimalHolder_mixinProperty.java | 2 +-
.../bigdecimals/jdo/JavaMathBigDecimalJdo.java | 8 +--
.../bigdecimals/vm/JavaMathBigDecimalVm.java | 8 +--
.../holder/JavaMathBigIntegerHolder2.java | 8 +--
.../JavaMathBigIntegerHolder_mixinProperty.java | 2 +-
.../bigintegers/jdo/JavaMathBigIntegerJdo.java | 8 +--
.../bigintegers/vm/JavaMathBigIntegerVm.java | 8 +--
.../javanet/urls/holder/JavaNetUrlHolder2.java | 8 +--
.../holder/JavaNetUrlHolder_mixinProperty.java | 2 +-
.../dom/types/javanet/urls/jdo/JavaNetUrlJdo.java | 8 +--
.../dom/types/javanet/urls/vm/JavaNetUrlVm.java | 8 +--
.../javasqldate/holder/JavaSqlDateHolder2.java | 8 +--
.../javasqldate/holder/JavaSqlDateHolder3.java | 6 +-
.../holder/JavaSqlDateHolder_mixinProperty.java | 2 +-
.../javasql/javasqldate/jdo/JavaSqlDateJdo.java | 8 +--
.../javasql/javasqldate/vm/JavaSqlDateVm.java | 8 +--
.../holder/JavaSqlTimestampHolder2.java | 8 +--
.../holder/JavaSqlTimestampHolder3.java | 6 +-
.../JavaSqlTimestampHolder_mixinProperty.java | 2 +-
.../javasqltimestamp/jdo/JavaSqlTimestampJdo.java | 8 +--
.../javasqltimestamp/vm/JavaSqlTimestampVm.java | 8 +--
.../holder/JavaTimeLocalDateHolder2.java | 8 +--
.../holder/JavaTimeLocalDateHolder3.java | 6 +-
.../JavaTimeLocalDateHolder_mixinProperty.java | 2 +-
.../jdo/JavaTimeLocalDateJdo.java | 8 +--
.../javatimelocaldate/vm/JavaTimeLocalDateVm.java | 8 +--
.../holder/JavaTimeLocalDateTimeHolder2.java | 8 +--
.../holder/JavaTimeLocalDateTimeHolder3.java | 6 +-
.../JavaTimeLocalDateTimeHolder_mixinProperty.java | 2 +-
.../jdo/JavaTimeLocalDateTimeJdo.java | 8 +--
.../vm/JavaTimeLocalDateTimeVm.java | 8 +--
.../holder/JavaTimeOffsetDateTimeHolder2.java | 8 +--
.../holder/JavaTimeOffsetDateTimeHolder3.java | 6 +-
...JavaTimeOffsetDateTimeHolder_mixinProperty.java | 2 +-
.../jdo/JavaTimeOffsetDateTimeJdo.java | 8 +--
.../vm/JavaTimeOffsetDateTimeVm.java | 8 +--
.../holder/JavaTimeOffsetTimeHolder2.java | 8 +--
.../holder/JavaTimeOffsetTimeHolder3.java | 6 +-
.../JavaTimeOffsetTimeHolder_mixinProperty.java | 2 +-
.../jdo/JavaTimeOffsetTimeJdo.java | 8 +--
.../vm/JavaTimeOffsetTimeVm.java | 8 +--
.../holder/JavaTimeZonedDateTimeHolder2.java | 8 +--
.../holder/JavaTimeZonedDateTimeHolder3.java | 6 +-
.../JavaTimeZonedDateTimeHolder_mixinProperty.java | 2 +-
.../jdo/JavaTimeZonedDateTimeJdo.java | 8 +--
.../vm/JavaTimeZonedDateTimeVm.java | 8 +--
.../javautildate/holder/JavaUtilDateHolder2.java | 8 +--
.../javautildate/holder/JavaUtilDateHolder3.java | 6 +-
.../holder/JavaUtilDateHolder_mixinProperty.java | 2 +-
.../javautil/javautildate/jdo/JavaUtilDateJdo.java | 8 +--
.../javautil/javautildate/vm/JavaUtilDateVm.java | 8 +--
.../javautil/uuids/holder/JavaUtilUuidHolder2.java | 8 +--
.../holder/JavaUtilUuidHolder_mixinProperty.java | 2 +-
.../types/javautil/uuids/jdo/JavaUtilUuidJdo.java | 8 +--
.../types/javautil/uuids/vm/JavaUtilUuidVm.java | 8 +--
.../jodadatetime/holder/JodaDateTimeHolder2.java | 8 +--
.../jodadatetime/holder/JodaDateTimeHolder3.java | 6 +-
.../holder/JodaDateTimeHolder_mixinProperty.java | 2 +-
.../jodatime/jodadatetime/jdo/JodaDateTimeJdo.java | 8 +--
.../jodatime/jodadatetime/vm/JodaDateTimeVm.java | 8 +--
.../jodalocaldate/holder/JodaLocalDateHolder2.java | 8 +--
.../jodalocaldate/holder/JodaLocalDateHolder3.java | 6 +-
.../holder/JodaLocalDateHolder_mixinProperty.java | 2 +-
.../jodalocaldate/jdo/JodaLocalDateJdo.java | 8 +--
.../jodatime/jodalocaldate/vm/JodaLocalDateVm.java | 8 +--
.../holder/JodaLocalDateTimeHolder2.java | 8 +--
.../holder/JodaLocalDateTimeHolder3.java | 6 +-
.../JodaLocalDateTimeHolder_mixinProperty.java | 2 +-
.../jdo/JodaLocalDateTimeJdo.java | 8 +--
.../jodalocaldatetime/vm/JodaLocalDateTimeVm.java | 8 +--
.../booleans/holder/PrimitiveBooleanHolder.java | 4 +-
.../booleans/holder/PrimitiveBooleanHolder2.java | 8 +--
.../PrimitiveBooleanHolder_mixinProperty.java | 2 +-
.../booleans/jdo/PrimitiveBooleanJdo.java | 4 +-
.../primitive/booleans/vm/PrimitiveBooleanVm.java | 4 +-
.../bytes/holder/PrimitiveByteHolder2.java | 8 +--
.../holder/PrimitiveByteHolder_mixinProperty.java | 2 +-
.../primitive/bytes/jdo/PrimitiveByteJdo.java | 4 +-
.../types/primitive/bytes/vm/PrimitiveByteVm.java | 4 +-
.../chars/holder/PrimitiveCharHolder2.java | 8 +--
.../holder/PrimitiveCharHolder_mixinProperty.java | 2 +-
.../primitive/chars/jdo/PrimitiveCharJdo.java | 4 +-
.../types/primitive/chars/vm/PrimitiveCharVm.java | 4 +-
.../doubles/holder/PrimitiveDoubleHolder2.java | 8 +--
.../PrimitiveDoubleHolder_mixinProperty.java | 2 +-
.../primitive/doubles/jdo/PrimitiveDoubleJdo.java | 4 +-
.../primitive/doubles/vm/PrimitiveDoubleVm.java | 4 +-
.../floats/holder/PrimitiveFloatHolder2.java | 8 +--
.../holder/PrimitiveFloatHolder_mixinProperty.java | 2 +-
.../primitive/floats/jdo/PrimitiveFloatJdo.java | 4 +-
.../primitive/floats/vm/PrimitiveFloatVm.java | 4 +-
.../primitive/ints/holder/PrimitiveIntHolder2.java | 8 +--
.../holder/PrimitiveIntHolder_mixinProperty.java | 2 +-
.../types/primitive/ints/jdo/PrimitiveIntJdo.java | 4 +-
.../types/primitive/ints/vm/PrimitiveIntVm.java | 4 +-
.../longs/holder/PrimitiveLongHolder2.java | 8 +--
.../holder/PrimitiveLongHolder_mixinProperty.java | 2 +-
.../primitive/longs/jdo/PrimitiveLongJdo.java | 4 +-
.../types/primitive/longs/vm/PrimitiveLongVm.java | 4 +-
.../shorts/holder/PrimitiveShortHolder2.java | 8 +--
.../holder/PrimitiveShortHolder_mixinProperty.java | 2 +-
.../primitive/shorts/jdo/PrimitiveShortJdo.java | 4 +-
.../primitive/shorts/vm/PrimitiveShortVm.java | 4 +-
.../api/permission/ApplicationPermission.java | 10 +--
.../dom/feature/ApplicationFeatureViewModel.java | 8 +--
.../model/dom/feature/ApplicationTypeAction.java | 4 +-
.../dom/feature/ApplicationTypeCollection.java | 4 +-
.../model/dom/feature/ApplicationTypeMember.java | 2 +-
.../model/dom/feature/ApplicationTypeProperty.java | 8 +--
.../permission/ApplicationPermission_feature.java | 2 +-
.../model/dom/user/UserPermissionViewModel.java | 10 +--
.../secman/jdo/dom/user/ApplicationUser.java | 24 +++----
.../secman/jpa/dom/user/ApplicationUser.java | 24 +++----
.../mixins/Persistable_datanucleusIdLong.java | 2 +-
.../mixins/Persistable_datanucleusVersionLong.java | 2 +-
.../Persistable_datanucleusVersionTimestamp.java | 2 +-
273 files changed, 855 insertions(+), 825 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
index 474a67b..b246ecc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/ActionLayout.java
@@ -111,8 +111,10 @@ public @interface ActionLayout {
default "";
/**
- * Associates this <i>Action</i> with a <i>FieldSet</i> either by <b>id</b>, <b>friendly-name</b>
- * or both. For a more in depth description see {@link PropertyLayout#fieldSet()}.
+ * Specifies the <b>id</b> of associated <i>FieldSet</i>.
+ * <p>
+ * For a more in depth description see the analogous {@link PropertyLayout#fieldSetId()}.
+ * </p>
*
* @apiNote An <i>Action</i> can be associated with with a <i>Property</i> or <i>Collection</i>
* its so called <i>peer</i>.
@@ -122,10 +124,28 @@ public @interface ActionLayout {
* this default placement is overruled.
*
* @see Action#associateWith()
- * @see PropertyLayout#fieldSet()
+ * @see ActionLayout#fieldSetName()
+ * @see PropertyLayout#fieldSetId()
+ * @see PropertyLayout#fieldSetName()
+ * @see PropertyLayout#sequence()
*/
- String fieldSet()
- default "";
+ String fieldSetId()
+ default "__infer";
+
+ /**
+ * Specifies the <b>friendly-name</b> of associated <i>FieldSet</i>.
+ * <p>
+ * For a more in depth description see the analogous {@link PropertyLayout#fieldSetId()};
+ * </p>
+ *
+ * @see Action#associateWith()
+ * @see ActionLayout#fieldSetId()
+ * @see PropertyLayout#fieldSetId()
+ * @see PropertyLayout#fieldSetName()
+ * @see PropertyLayout#sequence()
+ */
+ String fieldSetName()
+ default "__infer";
/**
* Indicates where in the UI the action should <i>not</i>not be visible.
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
index cb4e31f..84bac19 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/PropertyLayout.java
@@ -67,62 +67,72 @@ public @interface PropertyLayout {
/**
- * Associates this <i>Property</i> with a <i>FieldSet</i> either by <b>id</b>, <b>friendly-name</b>
- * or both.
+ * Specifies the <b>id</b> of associated <i>FieldSet</i>.
+ *
* <p>
* A <i>FieldSet</i> is a layout component for property grouping, that can either be specified via
* a <code>Xxx.layout.xml</code> file (with <code>Xxx</code> the domain object name) or is
- * inferred by the framework via annotations (aka the programming model).
+ * inferred by the framework via annotations (aka the programming model).
+ * <i>FieldSet</i>s are represented in-memory and requires a framework internal unique id per domain
+ * object type.
+ * </p>
+ * <p>
+ * Following 2 scenarios have slightly different behavior:
* </p>
- *
- * We discuss those 2 scenarios in more detail, as these have different behavior.
*
* <h1>XML layout is present</h1>
* <p>
- * When a XML layout is present, every <i>FieldSet</i> requires a framework internal (in-memory) <b>id</b>,
- * which is either explicitly specified in the file or may be inferred from a non-empty <b>name</b>.
- * If the <b>name</b> is empty "" or missing, then the <b>id</b> is mandatory with the file.
+ * When a XML layout is present, every <i>FieldSet</i> <b>id</b> is either explicitly specified in
+ * the file or may be inferred from a non-empty <b>name</b>.
+ * If the <b>name</b> is empty "" or missing, then the <b>id</b> within the file is mandatory.
* </p><p>
- * If not already explicitly listed within the XML layout, the framework interprets
- * {@code @PropertyLayout(fieldSet=...)}
- * as an <b>id</b> first, and falls back as a <b>friendly-name</b> to associate this <i>Property</i>
- * with its designated <i>FieldSet</i>.
+ * If this <i>Property</i> is not already explicitly listed within the XML layout, we lookup the
+ * associated <i>FieldSet</i> in the XML layout file first matching by <b>id</b>
+ * using {@code @PropertyLayout(fieldSetId=...)} if any, then falling back to matching by (friendly)
+ * <b>name</b> using @PropertyLayout(fieldSetName=...)} if any.
* </p>
*
* <h1>XML layout is absent</h1>
- *
* <p>
- * Whereas, when a XML layout is absent, {@code @PropertyLayout(fieldSet=...)} is used to infer a
- * <i>FieldSet</i>'s <b>id</b> and <b>friendly-name</b>.
- * </p><p>
- * The framework interprets {@code @PropertyLayout(fieldSet=...)}
- * as a <b>friendly-name</b> and infers an <b>id</b> from it, to associate this <i>Property</i>
- * with its designated <i>FieldSet</i>. However, to provide more control, special syntax is
- * available to provide both <b>id</b> and <b>friendly-name</b>. (See section Special syntax below.)
+ * We reify (in-memory) the associated <i>FieldSet</i> using {@code @PropertyLayout(fieldSetId=...)}
+ * (if present) as its <b>id</b> and using {@code @PropertyLayout(fieldSetId=...)} as its (friendly)
+ * <b>name</b>.
+ * While if no <b>id</b> is provided an <b>id</b> is inferred from the (friendly) <b>name</b>, in which
+ * case the (friendly) <b>name</b> must not be empty.
+ * Whereas if no (friendly) <b>name</b> is provided a (friendly) <b>name</b> is inferred from the
+ * (<b>id</b>.
* </p><p>
* With {@code @PropertyLayout(sequence=...)} the relative position within that <i>FieldSet</i> can be
* specified.
* </p>
- *
- * <h1>Special syntax</h1>
+ *
+ * @see Action#associateWith()
+ * @see ActionLayout#fieldSetId()
+ * @see ActionLayout#fieldSetName()
+ * @see PropertyLayout#fieldSetName()
+ * @see PropertyLayout#sequence()
+ */
+ String fieldSetId()
+ default "__infer";
+
+ /**
+ * Specifies the <b>friendly-name</b> of associated <i>FieldSet</i>.
* <p>
- * Special syntax is picked up by the framework interpreting both <b>id</b> and
- * <b>friendly-name</b> when separated by a delimiter {@literal ::}.
- * (That behavior was specifically introduced for the case when no XML layout is present.)
- * <h2>Examples</h2>
- * <p>
- * {@code @PropertyLayout(fieldSet="sales::Sales Department")} would identify
- * {@code id: sales} and {@code friendly-name: Sales Department}.
- * </p><p>
- * Or similar {@code @PropertyLayout(fieldSet="sales::")} allows to suppress the <i>FieldSet</i>'s
- * <b>friendly-name</b> from rendering.
+ * Explicitly specifying an empty "" <b>friendly-name</b> will suppress the <i>FieldSet</i>'s label
+ * from being rendered.
+ * </p>
+ * <p>
+ * For a more in depth description see {@link PropertyLayout#fieldSetId()}.
+ * </p>
*
* @see Action#associateWith()
- * @see ActionLayout#fieldSet()
+ * @see ActionLayout#fieldSetId()
+ * @see ActionLayout#fieldSetName()
+ * @see PropertyLayout#fieldSetId()
* @see PropertyLayout#sequence()
*/
- String fieldSet()
- default "";
+ String fieldSetName()
+ default "__infer";
/**
* Indicates where in the UI the property
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
index 84300b9..6ebb883 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
@@ -51,7 +51,7 @@ import lombok.val;
* @since 1.x {@index}
*/
@Property
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "700.2")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "700.2")
@RequiredArgsConstructor
public class Object_objectIdentifier {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java
index b5f1e00..aa00a59 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectType.java
@@ -48,7 +48,7 @@ import lombok.val;
* @since 1.x {@index}
*/
@Property
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "700.1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "700.1")
@RequiredArgsConstructor
public class Object_objectType {
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java
index 1c1065a..0997f3e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/mixins/system/DomainChangeRecord.java
@@ -59,7 +59,7 @@ public interface DomainChangeRecord extends HasInteractionId, HasUsername {
@Property
@PropertyLayout(
hidden = Where.ALL_EXCEPT_STANDALONE_TABLES,
- fieldSet="Identifiers",
+ fieldSetId="Identifiers",
sequence = "1")
ChangeType getType();
@@ -70,7 +70,7 @@ public interface DomainChangeRecord extends HasInteractionId, HasUsername {
* this change occurred.
*/
@Property
- @PropertyLayout(fieldSet="Identifiers",sequence = "50")
+ @PropertyLayout(fieldSetId="Identifiers",sequence = "50")
UUID getInteractionId();
@@ -78,7 +78,7 @@ public interface DomainChangeRecord extends HasInteractionId, HasUsername {
* The user that caused the change.
*/
@Property
- @PropertyLayout(fieldSet="Identifiers", sequence = "10")
+ @PropertyLayout(fieldSetId="Identifiers", sequence = "10")
String getUsername();
@@ -86,7 +86,7 @@ public interface DomainChangeRecord extends HasInteractionId, HasUsername {
* The time that the change occurred.
*/
@Property
- @PropertyLayout(fieldSet="Identifiers", sequence = "20")
+ @PropertyLayout(fieldSetId="Identifiers", sequence = "20")
Timestamp getTimestamp();
@@ -96,7 +96,7 @@ public interface DomainChangeRecord extends HasInteractionId, HasUsername {
@Property
@PropertyLayout(
named="Object Type",
- fieldSet="Target",
+ fieldSetId="Target",
sequence = "10")
default String getTargetObjectType() {
return getTarget().getObjectType();
@@ -110,7 +110,7 @@ public interface DomainChangeRecord extends HasInteractionId, HasUsername {
@Property
@PropertyLayout(
named="Object",
- fieldSet="Target",
+ fieldSetId="Target",
sequence="30")
Bookmark getTarget();
@@ -123,7 +123,7 @@ public interface DomainChangeRecord extends HasInteractionId, HasUsername {
* </p>
*/
@Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(named="Member", hidden = Where.ALL_EXCEPT_STANDALONE_TABLES, fieldSet="Target", sequence = "20")
+ @PropertyLayout(named="Member", hidden = Where.ALL_EXCEPT_STANDALONE_TABLES, fieldSetId="Target", sequence = "20")
String getTargetMember();
@@ -135,7 +135,7 @@ public interface DomainChangeRecord extends HasInteractionId, HasUsername {
* </p>
*/
@Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_EXCEPT_STANDALONE_TABLES, fieldSet="Detail",sequence = "6")
+ @PropertyLayout(hidden = Where.ALL_EXCEPT_STANDALONE_TABLES, fieldSetId="Detail",sequence = "6")
String getPreValue();
@@ -147,7 +147,7 @@ public interface DomainChangeRecord extends HasInteractionId, HasUsername {
* </p>
*/
@Property(optionality = Optionality.MANDATORY)
- @PropertyLayout(hidden = Where.ALL_EXCEPT_STANDALONE_TABLES, fieldSet="Detail",
+ @PropertyLayout(hidden = Where.ALL_EXCEPT_STANDALONE_TABLES, fieldSetId="Detail",
sequence = "7")
String getPostValue();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java
index 64d5397..e2e26ac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacet.java
@@ -24,7 +24,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
/**
* In the framework's default programming model corresponds to annotations
- * {@link Action#associateWith()} and {@link PropertyLayout#fieldSet()}.
+ * {@link Action#associateWith()} and {@link PropertyLayout#fieldSetId()}.
* <br>
* Collections don't support grouping.
* <p>
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
* </p>
*
* @see Action#associateWith()
- * @see PropertyLayout#fieldSet()
+ * @see PropertyLayout#fieldSetId()
*
* @since 2.0
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromPropertyLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromPropertyLayoutAnnotation.java
index ecd03dd..bb774c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromPropertyLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetFromPropertyLayoutAnnotation.java
@@ -31,7 +31,7 @@ extends LayoutGroupFacetAbstract {
final FacetHolder holder) {
return actionIfAny
- .map(PropertyLayout::fieldSet)
+ .map(PropertyLayout::fieldSetId)
.map(group -> new LayoutGroupFacetFromPropertyLayoutAnnotation(group, holder))
.orElse(null);
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
index 05db740..eaf3d6f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_description.java
@@ -37,7 +37,7 @@ public class HasAsciiDocDescription_description {
private final HasAsciiDocDescription hasAsciiDocDescription;
@PropertyLayout(labelPosition = LabelPosition.NONE, hidden = Where.ALL_TABLES,
- fieldSet = "description", sequence = "1")
+ fieldSetId = "description", sequence = "1")
public AsciiDoc prop() {
return asciiDocReaderService.readFor(hasAsciiDocDescription, "description");
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
index 9144a3e..657e373 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/asciidocdesc/HasAsciiDocDescription_sources.java
@@ -38,7 +38,7 @@ public class HasAsciiDocDescription_sources {
private final HasAsciiDocDescription hasAsciiDocDescription;
@PropertyLayout(labelPosition = LabelPosition.NONE, hidden = Where.ALL_TABLES,
- fieldSet = "sources", sequence = "1")
+ fieldSetId = "sources", sequence = "1")
public AsciiDoc prop() {
val packageName = hasAsciiDocDescription.getClass().getPackage().getName();
val sourceLocation = packageName.replace('.', '/');
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm.java
index 36fb139..96a5536 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/ActionAssociateWithVm.java
@@ -71,13 +71,13 @@ public class ActionAssociateWithVm implements HasAsciiDocDescription {
//tag::class-properties[]
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String text;
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "2")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "2")
@XmlElement(required = true)
@Getter @Setter
private String otherProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.java
index f1bb06e..1dcd292 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithChildVm.java
@@ -55,7 +55,7 @@ public class ActionAssociateWithChildVm implements HasAsciiDocDescription {
}
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String value;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingJdo.java
index b5dfb75..239eae5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/ActionCommandPublishingJdo.java
@@ -64,22 +64,22 @@ public class ActionCommandPublishingJdo
//tag::property[]
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "1")
@Getter @Setter
private String property;
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "2")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "2")
@Getter @Setter
private String propertyCommandDisabled;
@Property()
- @PropertyLayout(fieldSet = "meta-annotated", sequence = "1")
+ @PropertyLayout(fieldSetId = "meta-annotated", sequence = "1")
@Getter @Setter
private String propertyMetaAnnotated;
@Property()
- @PropertyLayout(fieldSet = "meta-annotated-overridden", sequence = "1")
+ @PropertyLayout(fieldSetId = "meta-annotated-overridden", sequence = "1")
@Getter @Setter
private String propertyMetaAnnotatedOverridden;
//end::property[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.java
index dfa9c1e..4038ed1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventVm.java
@@ -60,7 +60,7 @@ public class ActionDomainEventVm implements HasAsciiDocDescription {
}
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String text;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateText.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateText.java
index e0e7f23..52e493b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateText.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/subscribers/ActionDomainEventVm_controlUpdateText.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(fieldSet = "contributed", sequence = "1")
+@PropertyLayout(fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class ActionDomainEventVm_controlUpdateText {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingJdo.java
index 1e80df4..80d5db4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/ActionExecutionPublishingJdo.java
@@ -63,17 +63,17 @@ public class ActionExecutionPublishingJdo
//tag::property[]
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "1")
@Getter @Setter
private String property;
@Property()
- @PropertyLayout(fieldSet = "meta-annotated", sequence = "1")
+ @PropertyLayout(fieldSetId = "meta-annotated", sequence = "1")
@Getter @Setter
private String propertyMetaAnnotated;
@Property()
- @PropertyLayout(fieldSet = "meta-annotated-overridden", sequence = "1")
+ @PropertyLayout(fieldSetId = "meta-annotated-overridden", sequence = "1")
@Getter @Setter
private String propertyMetaAnnotatedOverridden;
//end::property[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.java
index df2046d..1de6e40 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/hidden/ActionHiddenVm.java
@@ -61,13 +61,13 @@ public class ActionHiddenVm implements HasAsciiDocDescription {
}
@Property()
- @PropertyLayout(fieldSet = "properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String text;
@Property()
- @PropertyLayout(fieldSet = "properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "properties", sequence = "2")
@XmlElement(required = true)
@Getter @Setter
private String otherText;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.java
index 86a3ee9..7730e70 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/restrictTo/ActionRestrictToVm.java
@@ -64,31 +64,31 @@ public class ActionRestrictToVm implements HasAsciiDocDescription {
}
@Property()
- @PropertyLayout(fieldSet = "not-annotated", sequence = "1")
+ @PropertyLayout(fieldSetId = "not-annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyNoAnnotation;
@Property()
- @PropertyLayout(fieldSet = "annotated", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyForPrototyping;
@Property()
- @PropertyLayout(fieldSet = "annotated", sequence = "2")
+ @PropertyLayout(fieldSetId = "annotated", sequence = "2")
@XmlElement(required = true)
@Getter @Setter
private String propertyForNoRestrictions;
@Property()
- @PropertyLayout(fieldSet = "meta-annotated", sequence = "1")
+ @PropertyLayout(fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyForMetaAnnotations;
@Property()
- @PropertyLayout(fieldSet = "meta-annotated-overridden", sequence = "1")
+ @PropertyLayout(fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyForMetaAnnotationsOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java
index 191b201..0a0a246 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/semantics/ActionSemanticsVm.java
@@ -80,56 +80,56 @@ public class ActionSemanticsVm implements HasAsciiDocDescription {
}
@Property()
- @PropertyLayout(fieldSet = "not-annotated", sequence = "1")
+ @PropertyLayout(fieldSetId = "not-annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private int propertyNoAnnotation;
@Property()
- @PropertyLayout(fieldSet = "annotated-safe", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotated-safe", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private int propertyForSafe;
@Property()
- @PropertyLayout(fieldSet = "annotated-safe", sequence = "2")
+ @PropertyLayout(fieldSetId = "annotated-safe", sequence = "2")
@XmlElement(required = true)
@Getter @Setter
private int propertyForSafeAndRequestCacheable;
@Property()
- @PropertyLayout(fieldSet = "annotated-idempotent", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotated-idempotent", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private int propertyForIdempotent;
@Property()
- @PropertyLayout(fieldSet = "annotated-idempotent", sequence = "2")
+ @PropertyLayout(fieldSetId = "annotated-idempotent", sequence = "2")
@XmlElement(required = true)
@Getter @Setter
private int propertyForIdempotentAreYouSure;
@Property()
- @PropertyLayout(fieldSet = "annotated-non-idempotent", sequence = "5")
+ @PropertyLayout(fieldSetId = "annotated-non-idempotent", sequence = "5")
@XmlElement(required = true)
@Getter @Setter
private int propertyForNonIdempotent;
@Property()
- @PropertyLayout(fieldSet = "annotated-non-idempotent", sequence = "6")
+ @PropertyLayout(fieldSetId = "annotated-non-idempotent", sequence = "6")
@XmlElement(required = true)
@Getter @Setter
private int propertyForNonIdempotentAreYouSure;
@Property()
- @PropertyLayout(fieldSet = "meta-annotated", sequence = "1")
+ @PropertyLayout(fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private int propertyForMetaAnnotations;
@Property()
- @PropertyLayout(fieldSet = "meta-annotated-overridden", sequence = "1")
+ @PropertyLayout(fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private int propertyForMetaAnnotationsOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
index 8c8efb5..5467cee 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/child/ActionTypeOfChildVm.java
@@ -57,25 +57,25 @@ public class ActionTypeOfChildVm implements HasAsciiDocDescription {
}
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String value;
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "2")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "2")
@XmlElement(required = false)
@Getter @Setter
private String valueUpper;
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "3")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "3")
@XmlElement(required = false)
@Getter @Setter
private String valueLower;
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "4")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "4")
@XmlElement(required = false)
@Getter @Setter
private String valueReversed;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.java
index 5d299bc..2276110 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/position/ActionLayoutPositionVm.java
@@ -49,13 +49,13 @@ public class ActionLayoutPositionVm implements HasAsciiDocDescription {
}
@Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "annotated", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String readOnlyProperty1;
@Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "layout", sequence = "1")
+ @PropertyLayout(fieldSetId = "layout", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String readOnlyProperty2;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
index b4524cc..60c9b16 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
@@ -52,13 +52,13 @@ public class ActionLayoutPromptStyleVm implements HasAsciiDocDescription {
@Title
@Property(editing = Editing.DISABLED)
- @PropertyLayout(fieldSet = "general", sequence = "1")
+ @PropertyLayout(fieldSetId = "general", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String title;
@Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "annotated", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String readOnlyProperty1;
@@ -66,14 +66,14 @@ public class ActionLayoutPromptStyleVm implements HasAsciiDocDescription {
@Property(optionality = Optionality.OPTIONAL)
@PropertyLayout(
describedAs = "has associated action with promptStyle=INLINE_AS_IF_EDIT",
- fieldSet = "annotated",
+ fieldSetId = "annotated",
sequence = "2")
@XmlElement(required = false)
@Getter @Setter
private String readOnlyProperty2;
@Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "layout", sequence = "1")
+ @PropertyLayout(fieldSetId = "layout", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String readOnlyProperty3;
@@ -81,7 +81,7 @@ public class ActionLayoutPromptStyleVm implements HasAsciiDocDescription {
@Property(optionality = Optionality.OPTIONAL)
@PropertyLayout(
describedAs = "has associated action with promptStyle=INLINE_AS_IF_EDIT",
- fieldSet = "layout",
+ fieldSetId = "layout",
sequence = "2")
@XmlElement(required = false)
@Getter @Setter
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
index e7a25a3..32ded0c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/child/CollectionDomainEventChildVm.java
@@ -54,7 +54,7 @@ public class CollectionDomainEventChildVm implements HasAsciiDocDescription {
//tag::class[]
@Title
@Property()
- @PropertyLayout(fieldSet = "properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String value;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildren.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildren.java
index e058223..ab7d0a5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildren.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/subscribers/CollectionDomainEventVm_controlChildren.java
@@ -34,7 +34,7 @@ public class CollectionDomainEventVm_controlChildren {
private final CollectionDomainEventVm collectionDomainEventVm;
- @PropertyLayout(fieldSet = "contributed", sequence = "1")
+ @PropertyLayout(fieldSetId = "contributed", sequence = "1")
public CollectionDomainEventControlStrategy prop() {
return eventControlService.controlStrategy;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingJdo.java
index e26a9dd..23517bd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingJdo.java
@@ -30,12 +30,12 @@ public interface DomainObjectEntityChangePublishingJdo
extends HasAsciiDocDescription, ExposeCapturedChanges {
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "property", sequence = "1")
+ @PropertyLayout(fieldSetId = "property", sequence = "1")
String getProperty();
void setProperty(String value);
@Property(editing = Editing.DISABLED)
- @PropertyLayout(fieldSet = "action", sequence = "1")
+ @PropertyLayout(fieldSetId = "action", sequence = "1")
String getPropertyUpdatedByAction();
void setPropertyUpdatedByAction(String value);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_explanation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_explanation.java
index d2d78ec..7a81be2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_explanation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_explanation.java
@@ -25,7 +25,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property // <.>
-@PropertyLayout(fieldSet = "properties", sequence = "1")
+@PropertyLayout(fieldSetId = "properties", sequence = "1")
@RequiredArgsConstructor // <.>
public class CountHolder_explanation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingJdo.java
index b74590e..d49908d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/PropertyCommandPublishingJdo.java
@@ -65,7 +65,7 @@ public class PropertyCommandPublishingJdo
)
@PropertyLayout(
describedAs = "@Property(command = ENABLED)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@Getter @Setter
private String property;
//end::annotation[]
@@ -76,7 +76,7 @@ public class PropertyCommandPublishingJdo
)
@PropertyLayout(
describedAs = "@Property(command = DISABLED)",
- fieldSet = "annotation", sequence = "2")
+ fieldSetId = "annotation", sequence = "2")
@Getter @Setter
private String propertyCommandDispatchDisabled;
//end::annotation-2[]
@@ -85,7 +85,7 @@ public class PropertyCommandPublishingJdo
@PropertyCommandPublishingEnabledMetaAnnotation // <.>
@PropertyLayout(
describedAs = "@PropertyCommandEnabledMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@Getter @Setter
private String propertyMetaAnnotated;
//end::meta-annotation[]
@@ -97,7 +97,7 @@ public class PropertyCommandPublishingJdo
describedAs =
"@PropertyCommandDisabledMetaAnnotation " +
"@Property(command = ENABLED)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@Getter @Setter
private String propertyMetaAnnotatedOverridden;
//end::meta-annotation-overridden[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.java
index ac890b1..ac6f678 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventVm.java
@@ -67,7 +67,7 @@ public class PropertyDomainEventVm implements HasAsciiDocDescription {
)
@PropertyLayout(
describedAs = "@Property(domainEvent = TextDomainEvent.class)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String text;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlText.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlText.java
index 9af884e..171dcc2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlText.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/subscribers/PropertyDomainEventVm_controlText.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(fieldSet = "contributed", sequence = "1")
+@PropertyLayout(fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class PropertyDomainEventVm_controlText {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.java
index e4b94cf..2f14c62 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/editing/PropertyEditingVm.java
@@ -57,7 +57,7 @@ public class PropertyEditingVm implements HasAsciiDocDescription {
)
@PropertyLayout(
describedAs = "@Property(editing = ENABLED)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyUsingAnnotation;
@@ -68,7 +68,7 @@ public class PropertyEditingVm implements HasAsciiDocDescription {
@EditingEnabledMetaAnnotation // <.>
@PropertyLayout(
describedAs = "@EditingEnabledMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -83,7 +83,7 @@ public class PropertyEditingVm implements HasAsciiDocDescription {
describedAs =
"@EditingEnabledMetaAnnotation " +
"@PropertyLayout(editing = DISABLED)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingJdo.java
index d364fa1..d4e82bb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingJdo.java
@@ -66,7 +66,7 @@ public class PropertyExecutionPublishingJdo
@PropertyLayout(
describedAs =
"@Property(publishing = ENABLED)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@Getter @Setter
private String propertyUsingAnnotation;
//end::annotation[]
@@ -76,7 +76,7 @@ public class PropertyExecutionPublishingJdo
@Property()
@PropertyLayout(
describedAs = "@PropertyPublishingEnabledMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -91,7 +91,7 @@ public class PropertyExecutionPublishingJdo
describedAs =
"@PropertyPublishingDisabledMetaAnnotation " +
"@Property(publishing = ENABLED)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.java
index 780db5d..eb683a3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/fileAccept/PropertyFileAcceptVm.java
@@ -58,7 +58,7 @@ public class PropertyFileAcceptVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(fileAccept = \".pdf\")",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Blob pdfPropertyUsingAnnotation;
@@ -71,7 +71,7 @@ public class PropertyFileAcceptVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(fileAccept = \".txt\")",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Clob txtPropertyUsingAnnotation;
@@ -82,7 +82,7 @@ public class PropertyFileAcceptVm implements HasAsciiDocDescription {
@FileAcceptPdfMetaAnnotation // <.>
@PropertyLayout(
describedAs = "@FileAcceptPdfMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Blob pdfPropertyUsingMetaAnnotation;
@@ -96,7 +96,7 @@ public class PropertyFileAcceptVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@FileAcceptPdfMetaAnnotation @PropertyLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Blob docxPropertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.java
index 418b781..2c9be8c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm.java
@@ -65,7 +65,7 @@ public class PropertyHiddenVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.NOWHERE)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenNowhereUsingAnnotation;
@@ -78,7 +78,7 @@ public class PropertyHiddenVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.EVERYWHERE)",
- fieldSet = "variants", sequence = "1")
+ fieldSetId = "variants", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyHiddenEverywhere;
@@ -91,7 +91,7 @@ public class PropertyHiddenVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.ANYWHERE)",
- fieldSet = "variants", sequence = "2")
+ fieldSetId = "variants", sequence = "2")
@XmlElement(required = true)
@Getter @Setter
private String propertyHiddenAnywhere;
@@ -110,7 +110,7 @@ public class PropertyHiddenVm implements HasAsciiDocDescription {
@Property()
@PropertyLayout(
describedAs = "@HiddenEverywhereMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -125,7 +125,7 @@ public class PropertyHiddenVm implements HasAsciiDocDescription {
describedAs =
"@HiddenEverywhereMetaAnnotation " +
"@Property(hidden = Where.NOWHERE)",
- fieldSet = "meta-annotated-overridden", sequence = "2")
+ fieldSetId = "meta-annotated-overridden", sequence = "2")
@XmlElement(required = true)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_mixinPropertyWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_mixinPropertyWithMetaAnnotation.java
index 59bb272..1a579ab 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_mixinPropertyWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_mixinPropertyWithMetaAnnotation.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs =
"@HiddenEverywhereMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "2"
+ fieldSetId = "meta-annotated", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyHiddenVm_mixinPropertyWithMetaAnnotation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_mixinPropertyWithMetaAnnotationOverridden.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_mixinPropertyWithMetaAnnotationOverridden.java
index 03ae5d1..ddf8c7e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_mixinPropertyWithMetaAnnotationOverridden.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/PropertyHiddenVm_mixinPropertyWithMetaAnnotationOverridden.java
@@ -33,7 +33,7 @@ import lombok.RequiredArgsConstructor;
describedAs =
"@HiddenEverywhereMetaAnnotation " +
"@Property(hidden = NOWHERE)",
- fieldSet = "meta-annotated-overridden", sequence = "2"
+ fieldSetId = "meta-annotated-overridden", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyHiddenVm_mixinPropertyWithMetaAnnotationOverridden {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java
index 1aea5b3..424b840 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm.java
@@ -74,7 +74,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.NOWHERE)",
- fieldSet = "variants", sequence = "1")
+ fieldSetId = "variants", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenNowhere;
@@ -87,7 +87,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.EVERYWHERE)",
- fieldSet = "variants", sequence = "2")
+ fieldSetId = "variants", sequence = "2")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenEverywhere;
@@ -100,7 +100,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.ANYWHERE)",
- fieldSet = "variants", sequence = "2.1")
+ fieldSetId = "variants", sequence = "2.1")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenAnywhere;
@@ -113,7 +113,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.ALL_TABLES)",
- fieldSet = "variants", sequence = "3")
+ fieldSetId = "variants", sequence = "3")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenAllTables;
@@ -126,7 +126,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.OBJECT_FORMS)",
- fieldSet = "variants", sequence = "4")
+ fieldSetId = "variants", sequence = "4")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenObjectForms;
@@ -139,7 +139,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.STANDALONE_TABLES)",
- fieldSet = "variants", sequence = "5")
+ fieldSetId = "variants", sequence = "5")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenStandaloneTables;
@@ -152,7 +152,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.ALL_EXCEPT_STANDALONE_TABLES)",
- fieldSet = "variants", sequence = "6")
+ fieldSetId = "variants", sequence = "6")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenAllExceptStandaloneTables;
@@ -166,7 +166,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.PARENTED_TABLES)",
- fieldSet = "variants", sequence = "7")
+ fieldSetId = "variants", sequence = "7")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenParentedTables;
@@ -179,7 +179,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(hidden = Where.REFERENCES_PARENT)",
- fieldSet = "variants", sequence = "8")
+ fieldSetId = "variants", sequence = "8")
@XmlTransient // to avoid cycles
@Getter @Setter
private PropertyHiddenVm propertyHiddenReferencesParent;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm_mixinProperty.java
index 87a2012..a1380d2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/hidden/child/PropertyHiddenChildVm_mixinProperty.java
@@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor;
hidden = Where.ALL_TABLES // <.>
, describedAs =
"@Property(hidden = ALL_TABLES)",
- fieldSet = "contributed", sequence = "1"
+ fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
public class PropertyHiddenChildVm_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.java
index 6ced787..a8bc422 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/maxLength/PropertyMaxLengthVm.java
@@ -56,7 +56,7 @@ public class PropertyMaxLengthVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(maxLength = 10)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyUsingAnnotation;
@@ -67,7 +67,7 @@ public class PropertyMaxLengthVm implements HasAsciiDocDescription {
@Property()
@PropertyLayout(
describedAs = "@MaxLength10MetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -82,7 +82,7 @@ public class PropertyMaxLengthVm implements HasAsciiDocDescription {
describedAs =
"@MaxLength10MetaAnnotation " +
"@PropertyLayout(maxLength = 3)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.java
index 6fc3d27..2d1c788 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/mustSatisfy/PropertyMustSatisfyVm.java
@@ -56,7 +56,7 @@ public class PropertyMustSatisfyVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"mustSatisfy = OfWorkingAgeSpecification.class",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Integer customerAgePropertyUsingAnnotation;
@@ -67,7 +67,7 @@ public class PropertyMustSatisfyVm implements HasAsciiDocDescription {
@Property()
@PropertyLayout(
describedAs = "@MustSatisfyOfWorkingAgeMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Integer customerAgePropertyUsingMetaAnnotation;
@@ -82,7 +82,7 @@ public class PropertyMustSatisfyVm implements HasAsciiDocDescription {
describedAs =
"@MustSatisfyOfWorkingAgeMetaAnnotation " +
"@PropertyLayout(mustSatisfy = OfRetirementAgeSpecification.class)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Integer customerAgePropertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.java
index ae1bce4..9ee8409 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/optionality/PropertyOptionalityVm.java
@@ -59,7 +59,7 @@ public class PropertyOptionalityVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(optionality = OPTIONAL)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingAnnotation;
@@ -72,7 +72,7 @@ public class PropertyOptionalityVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(optionality = MANDATORY)",
- fieldSet = "annotation", sequence = "2")
+ fieldSetId = "annotation", sequence = "2")
@XmlElement(required = true)
@Getter @Setter
private String mandatoryPropertyUsingAnnotation;
@@ -83,7 +83,7 @@ public class PropertyOptionalityVm implements HasAsciiDocDescription {
@Property()
@PropertyLayout(
describedAs = "@OptionalityOptionalMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -98,7 +98,7 @@ public class PropertyOptionalityVm implements HasAsciiDocDescription {
describedAs =
"@OptionalityOptionalMetaAnnotation " +
"@PropertyLayout(optionality = MANDATORY)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.java
index 59877ea..a3efd0c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/PropertyProjectingVm.java
@@ -57,7 +57,7 @@ public class PropertyProjectingVm implements HasAsciiDocDescription {
}
//tag::property[]
- @PropertyLayout(fieldSet = "properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "properties", sequence = "1")
public PropertyProjectingChildVm getFirstChild() {
return getChildren().get(0);
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/child/PropertyProjectingChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/child/PropertyProjectingChildVm.java
index 3ae4033..d357433 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/child/PropertyProjectingChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/child/PropertyProjectingChildVm.java
@@ -56,7 +56,7 @@ public class PropertyProjectingChildVm implements HasAsciiDocDescription {
//tag::class[]
@Title
- @PropertyLayout(fieldSet = "properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "properties", sequence = "1")
public String getProperty() {
return getBackingEntity().getName();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java
index 7ef0047..494fc49 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/projecting/jdo/PropertyProjectingChildJdo.java
@@ -54,7 +54,7 @@ public class PropertyProjectingChildJdo implements HasAsciiDocDescription {
//tag::class[]
@Title(prepend = "Entity: ")
- @PropertyLayout(fieldSet = "properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "properties", sequence = "1")
@Getter @Setter
private String name;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.java
index c3dbb25..41e7540 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/regexPattern/PropertyRegexPatternVm.java
@@ -60,7 +60,7 @@ public class PropertyRegexPatternVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@Property(regexPattern = \"^\\w+@\\w+[.]com$\"\")",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String emailAddressPropertyUsingAnnotation;
@@ -71,7 +71,7 @@ public class PropertyRegexPatternVm implements HasAsciiDocDescription {
@Property()
@PropertyLayout(
describedAs = "@RegexPatternEmailComMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String emailAddressPropertyUsingMetaAnnotation;
@@ -88,7 +88,7 @@ public class PropertyRegexPatternVm implements HasAsciiDocDescription {
describedAs =
"@RegexPatternEmailComMetaAnnotation " +
"@Property(regexPattern = \"^\\w+@\\w+[.]org$\"\")",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String emailAddressPropertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.java
index f69a92c..3c05bbe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/PropertySnapshotVm.java
@@ -62,7 +62,7 @@ public class PropertySnapshotVm implements HasAsciiDocDescription {
//tag::no-annotation[]
@Property()
- @PropertyLayout(fieldSet = "no-annotations", sequence = "1")
+ @PropertyLayout(fieldSetId = "no-annotations", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String text;
@@ -74,7 +74,7 @@ public class PropertySnapshotVm implements HasAsciiDocDescription {
)
@PropertyLayout(
describedAs = "@Property(snapshot = NOT_SPECIFIED)",
- fieldSet = "annotations", sequence = "1")
+ fieldSetId = "annotations", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String notSpecifiedProperty;
@@ -86,7 +86,7 @@ public class PropertySnapshotVm implements HasAsciiDocDescription {
)
@PropertyLayout(
describedAs = "@Property(snapshot = EXCLUDED)",
- fieldSet = "annotations", sequence = "2")
+ fieldSetId = "annotations", sequence = "2")
@XmlElement(required = true)
@Getter @Setter
private String excludedProperty;
@@ -98,7 +98,7 @@ public class PropertySnapshotVm implements HasAsciiDocDescription {
)
@PropertyLayout(
describedAs = "@Property(snapshot = INCLUDED)",
- fieldSet = "annotations", sequence = "2")
+ fieldSetId = "annotations", sequence = "2")
@XmlElement(required = true)
@Getter @Setter
private String includedProperty;
@@ -109,7 +109,7 @@ public class PropertySnapshotVm implements HasAsciiDocDescription {
@Property()
@PropertyLayout(
describedAs = "@SnapshotExcludedMetaAnnotation ",
- fieldSet = "meta-annotations", sequence = "1")
+ fieldSetId = "meta-annotations", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String metaAnnotatedProperty;
@@ -124,7 +124,7 @@ public class PropertySnapshotVm implements HasAsciiDocDescription {
describedAs =
"@SnapshotIncludedMetaAnnotation "
+ "@Property(snapshot = EXCLUDED)",
- fieldSet = "meta-annotations-overridden", sequence = "1")
+ fieldSetId = "meta-annotations-overridden", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String metaAnnotatedPropertyOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
index 00061ab..89d552e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
@@ -56,7 +56,7 @@ public class PropertyLayoutCssClassVm implements HasAsciiDocDescription {
cssClass = "red" // <.>
, describedAs =
"@PropertyLayout(cssClass = \"red\")",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingAnnotation;
@@ -67,7 +67,7 @@ public class PropertyLayoutCssClassVm implements HasAsciiDocDescription {
@PropertyLayout( // <.>
describedAs =
"<cpt:property id=\"...\" cssClass=\"red\"/>",
- fieldSet = "layout-file", sequence = "1")
+ fieldSetId = "layout-file", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingLayout;
@@ -78,7 +78,7 @@ public class PropertyLayoutCssClassVm implements HasAsciiDocDescription {
@Property(optionality = Optionality.OPTIONAL)
@PropertyLayout(
describedAs = "@CssClassRedMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -91,7 +91,7 @@ public class PropertyLayoutCssClassVm implements HasAsciiDocDescription {
cssClass = "blue" // <.>
, describedAs =
"@CssClassRedMetaAnnotation @PropertyLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinProperty.java
index 3205f63..451e6bb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinProperty.java
@@ -31,7 +31,7 @@ import lombok.RequiredArgsConstructor;
, describedAs =
"@PropertyLayout(cssClass = \"red\")"
, hidden = Where.ALL_TABLES,
- fieldSet = "contributed", sequence = "1"
+ fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
public class PropertyLayoutCssClassVm_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinPropertyWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinPropertyWithMetaAnnotation.java
index b754d25..5813cac 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinPropertyWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinPropertyWithMetaAnnotation.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs =
"@CssClassRedMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "2"
+ fieldSetId = "meta-annotated", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutCssClassVm_mixinPropertyWithMetaAnnotation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinPropertyWithMetaAnnotationOverridden.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinPropertyWithMetaAnnotationOverridden.java
index 406e48a..c17e238 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinPropertyWithMetaAnnotationOverridden.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/cssClass/PropertyLayoutCssClassVm_mixinPropertyWithMetaAnnotationOverridden.java
@@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor;
cssClass = "blue" // <.>
, describedAs =
"@CssClassRedMetaAnnotation @ParameterLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "2"
+ fieldSetId = "meta-annotated-overridden", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutCssClassVm_mixinPropertyWithMetaAnnotationOverridden {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.java
index 96efead..24a45c5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm.java
@@ -55,7 +55,7 @@ public class PropertyLayoutDescribedAsVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs = // <.>
"@PropertyLayout(describedAs= \"...\")",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingAnnotation;
@@ -63,7 +63,7 @@ public class PropertyLayoutDescribedAsVm implements HasAsciiDocDescription {
//tag::layout-file[]
@Property(optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "layout-file", sequence = "1") // <.>
+ @PropertyLayout(fieldSetId = "layout-file", sequence = "1") // <.>
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingLayout;
@@ -74,7 +74,7 @@ public class PropertyLayoutDescribedAsVm implements HasAsciiDocDescription {
@DescribedAsMetaAnnotation // <.>
@PropertyLayout(
describedAs = "@DescribedAsMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -86,7 +86,7 @@ public class PropertyLayoutDescribedAsVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@DescribedAsMetaAnnotation @PropertyLayout(...)", // <.>
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinProperty.java
index edfe7d7..1e3a8b6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinProperty.java
@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs = // <.>
"@PropertyLayout(describedAs = \"...\")",
- fieldSet = "contributed", sequence = "1"
+ fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
public class PropertyLayoutDescribedAsVm_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinPropertyWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinPropertyWithMetaAnnotation.java
index fd29b6d..a096b1a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinPropertyWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinPropertyWithMetaAnnotation.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs =
"@DescribedAsMetaAnnotation)",
- fieldSet = "meta-annotated", sequence = "2"
+ fieldSetId = "meta-annotated", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutDescribedAsVm_mixinPropertyWithMetaAnnotation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinPropertyWithMetaAnnotationOverridden.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinPropertyWithMetaAnnotationOverridden.java
index a228e9e..1a18476 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinPropertyWithMetaAnnotationOverridden.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/describedAs/PropertyLayoutDescribedAsVm_mixinPropertyWithMetaAnnotationOverridden.java
@@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor;
describedAs = // <.>
"@DescribedAsMetaAnnotation " +
"overridden with @PropertyLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "2"
+ fieldSetId = "meta-annotated-overridden", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutDescribedAsVm_mixinPropertyWithMetaAnnotationOverridden {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.java
index 9d4de60..4cf1aa4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm.java
@@ -65,7 +65,7 @@ public class PropertyLayoutHiddenVm implements HasAsciiDocDescription {
hidden = Where.NOWHERE // <.>
, describedAs =
"@PropertyLayout(hidden = Where.NOWHERE)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenNowhereUsingAnnotation;
@@ -76,7 +76,7 @@ public class PropertyLayoutHiddenVm implements HasAsciiDocDescription {
@PropertyLayout( // <.>
describedAs =
"<cpt:property id=\"...\" hidden=\"NOWHERE\"/>",
- fieldSet = "layout-file", sequence = "1")
+ fieldSetId = "layout-file", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenNowhereUsingLayout;
@@ -88,7 +88,7 @@ public class PropertyLayoutHiddenVm implements HasAsciiDocDescription {
hidden = Where.EVERYWHERE // <.>
, describedAs =
"@PropertyLayout(hidden = Where.EVERYWHERE)",
- fieldSet = "variants", sequence = "1")
+ fieldSetId = "variants", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenEverywhere;
@@ -100,7 +100,7 @@ public class PropertyLayoutHiddenVm implements HasAsciiDocDescription {
hidden = Where.ANYWHERE // <.>
, describedAs =
"@PropertyLayout(hidden = Where.ANYWHERE)",
- fieldSet = "variants", sequence = "2")
+ fieldSetId = "variants", sequence = "2")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenAnywhere;
@@ -119,7 +119,7 @@ public class PropertyLayoutHiddenVm implements HasAsciiDocDescription {
@HiddenEverywhereMetaAnnotation // <.>
@PropertyLayout(
describedAs = "@HiddenEverywhereMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -133,7 +133,7 @@ public class PropertyLayoutHiddenVm implements HasAsciiDocDescription {
, describedAs =
"@HiddenEverywhereMetaAnnotation " +
"@PropertyLayout(hidden = Where.NOWHERE)",
- fieldSet = "meta-annotated-overridden", sequence = "2")
+ fieldSetId = "meta-annotated-overridden", sequence = "2")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_mixinPropertyWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_mixinPropertyWithMetaAnnotation.java
index 0a74ea5..cb58438 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_mixinPropertyWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_mixinPropertyWithMetaAnnotation.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs =
"@HiddenEverywhereMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "2"
+ fieldSetId = "meta-annotated", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutHiddenVm_mixinPropertyWithMetaAnnotation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_mixinPropertyWithMetaAnnotationOverridden.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_mixinPropertyWithMetaAnnotationOverridden.java
index 533c2bd..ff95958 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_mixinPropertyWithMetaAnnotationOverridden.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/PropertyLayoutHiddenVm_mixinPropertyWithMetaAnnotationOverridden.java
@@ -32,7 +32,7 @@ import lombok.RequiredArgsConstructor;
, describedAs =
"@HiddenEverywhereMetaAnnotation " +
"@PropertyLayout(hidden = NOWHERE)",
- fieldSet = "meta-annotated-overridden", sequence = "2"
+ fieldSetId = "meta-annotated-overridden", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutHiddenVm_mixinPropertyWithMetaAnnotationOverridden {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java
index 6adbd49..8eba4bb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm.java
@@ -74,7 +74,7 @@ public class PropertyLayoutHiddenChildVm implements HasAsciiDocDescription {
hidden = Where.NOWHERE // <.>
, describedAs =
"@PropertyLayout(hidden = Where.NOWHERE)",
- fieldSet = "variants", sequence = "1")
+ fieldSetId = "variants", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenNowhere;
@@ -86,7 +86,7 @@ public class PropertyLayoutHiddenChildVm implements HasAsciiDocDescription {
hidden = Where.EVERYWHERE // <.>
, describedAs =
"@PropertyLayout(hidden = Where.EVERYWHERE)",
- fieldSet = "variants", sequence = "2")
+ fieldSetId = "variants", sequence = "2")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenEverywhere;
@@ -98,7 +98,7 @@ public class PropertyLayoutHiddenChildVm implements HasAsciiDocDescription {
hidden = Where.ANYWHERE // <.>
, describedAs =
"@PropertyLayout(hidden = Where.ANYWHERE)",
- fieldSet = "variants", sequence = "2.1")
+ fieldSetId = "variants", sequence = "2.1")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenAnywhere;
@@ -110,7 +110,7 @@ public class PropertyLayoutHiddenChildVm implements HasAsciiDocDescription {
hidden = Where.ALL_TABLES // <.>
, describedAs =
"@PropertyLayout(hidden = Where.ALL_TABLES)",
- fieldSet = "variants", sequence = "3")
+ fieldSetId = "variants", sequence = "3")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenAllTables;
@@ -122,7 +122,7 @@ public class PropertyLayoutHiddenChildVm implements HasAsciiDocDescription {
hidden = Where.OBJECT_FORMS // <.>
, describedAs =
"@PropertyLayout(hidden = Where.OBJECT_FORMS)",
- fieldSet = "variants", sequence = "4")
+ fieldSetId = "variants", sequence = "4")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenObjectForms;
@@ -134,7 +134,7 @@ public class PropertyLayoutHiddenChildVm implements HasAsciiDocDescription {
hidden = Where.STANDALONE_TABLES // <.>
, describedAs =
"@PropertyLayout(hidden = Where.STANDALONE_TABLES)",
- fieldSet = "variants", sequence = "5")
+ fieldSetId = "variants", sequence = "5")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenStandaloneTables;
@@ -146,7 +146,7 @@ public class PropertyLayoutHiddenChildVm implements HasAsciiDocDescription {
hidden = Where.ALL_EXCEPT_STANDALONE_TABLES // <.>
, describedAs =
"@PropertyLayout(hidden = Where.ALL_EXCEPT_STANDALONE_TABLES)",
- fieldSet = "variants", sequence = "6")
+ fieldSetId = "variants", sequence = "6")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenAllExceptStandaloneTables;
@@ -159,7 +159,7 @@ public class PropertyLayoutHiddenChildVm implements HasAsciiDocDescription {
hidden = Where.PARENTED_TABLES // <.>
, describedAs =
"@PropertyLayout(hidden = Where.PARENTED_TABLES)",
- fieldSet = "variants", sequence = "7")
+ fieldSetId = "variants", sequence = "7")
@XmlElement(required = false)
@Getter @Setter
private String propertyHiddenParentedTables;
@@ -171,7 +171,7 @@ public class PropertyLayoutHiddenChildVm implements HasAsciiDocDescription {
hidden = Where.REFERENCES_PARENT // <.>
, describedAs =
"@PropertyLayout(hidden = Where.REFERENCES_PARENT)",
- fieldSet = "variants", sequence = "8")
+ fieldSetId = "variants", sequence = "8")
@XmlTransient // to avoid cycles
@Getter @Setter
private PropertyLayoutHiddenVm propertyHiddenReferencesParent;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm_mixinProperty.java
index d1219fc..2a3b8de 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/hidden/child/PropertyLayoutHiddenChildVm_mixinProperty.java
@@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor;
hidden = Where.ALL_TABLES // <.>
, describedAs =
"@PropertyLayout(hidden = ALL_TABLES)",
- fieldSet = "contributed", sequence = "1"
+ fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
public class PropertyLayoutHiddenChildVm_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.java
index f45cd49..0ee7c9f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm.java
@@ -57,7 +57,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
labelPosition = LabelPosition.TOP // <.>
, describedAs =
"@PropertyLayout(labelPosition = TOP)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingAnnotation;
@@ -68,7 +68,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
@PropertyLayout( // <.>
describedAs =
"<cpt:property id=\"...\" labelPosition=\"TOP\"/>",
- fieldSet = "layout-file", sequence = "1")
+ fieldSetId = "layout-file", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingLayout;
@@ -79,7 +79,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
@LabelPositionTopMetaAnnotation // <.>
@PropertyLayout(
describedAs = "@LabelPositionTopMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -92,7 +92,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
labelPosition = LabelPosition.LEFT // <.>
, describedAs =
"@LabelPositionTopMetaAnnotation @PropertyLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
@@ -104,7 +104,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
labelPosition = LabelPosition.TOP // <.>
, describedAs =
"@PropertyLayout(labelPosition = TOP)",
- fieldSet = "variants", sequence = "1")
+ fieldSetId = "variants", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyLabelPositionTop;
@@ -116,7 +116,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
labelPosition = LabelPosition.LEFT // <.>
, describedAs =
"@PropertyLayout(labelPosition = LEFT)",
- fieldSet = "variants", sequence = "2")
+ fieldSetId = "variants", sequence = "2")
@XmlElement(required = false)
@Getter @Setter
private String propertyLabelPositionLeft;
@@ -128,7 +128,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
labelPosition = LabelPosition.RIGHT // <.>
, describedAs =
"@PropertyLayout(labelPosition = RIGHT)",
- fieldSet = "variants", sequence = "3")
+ fieldSetId = "variants", sequence = "3")
@XmlElement(required = false)
@Getter @Setter
private String propertyLabelPositionRight;
@@ -140,7 +140,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
labelPosition = LabelPosition.RIGHT // <.>
, describedAs =
"@PropertyLayout(labelPosition = RIGHT)",
- fieldSet = "variants", sequence = "3.1")
+ fieldSetId = "variants", sequence = "3.1")
@XmlElement(required = false)
@Getter @Setter
private Boolean propertyBooleanLabelPositionRight;
@@ -152,7 +152,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
labelPosition = LabelPosition.NONE // <.>
, describedAs =
"@PropertyLayout(labelPosition = NONE)",
- fieldSet = "variants", sequence = "4")
+ fieldSetId = "variants", sequence = "4")
@XmlElement(required = false)
@Getter @Setter
private String propertyLabelPositionNone;
@@ -165,7 +165,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
, multiLine = 10
, describedAs =
"@PropertyLayout(labelPosition = NONE, multiLine = 10)",
- fieldSet = "variants", sequence = "4.1")
+ fieldSetId = "variants", sequence = "4.1")
@XmlElement(required = false)
@Getter @Setter
private String propertyLabelPositionNoneMultiline;
@@ -177,7 +177,7 @@ public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
labelPosition = LabelPosition.NOT_SPECIFIED // <.>
, describedAs =
"@PropertyLayout(labelPosition = NONE)",
- fieldSet = "variants", sequence = "5")
+ fieldSetId = "variants", sequence = "5")
@XmlElement(required = false)
@Getter @Setter
private String propertyLabelPositionNotSpecified;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinProperty.java
index 32d8b8c..b9bb389 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinProperty.java
@@ -32,7 +32,7 @@ import lombok.RequiredArgsConstructor;
, describedAs =
"@PropertyLayout(labelPosition = TOP)"
, hidden = Where.ALL_TABLES,
- fieldSet = "contributed", sequence = "1"
+ fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
public class PropertyLayoutLabelPositionVm_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinPropertyWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinPropertyWithMetaAnnotation.java
index 3904497..811fc98 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinPropertyWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinPropertyWithMetaAnnotation.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs =
"@LabelPositionTopMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "2"
+ fieldSetId = "meta-annotated", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutLabelPositionVm_mixinPropertyWithMetaAnnotation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinPropertyWithMetaAnnotationOverridden.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinPropertyWithMetaAnnotationOverridden.java
index 78a5fec..f4b7acb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinPropertyWithMetaAnnotationOverridden.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/labelPosition/PropertyLayoutLabelPositionVm_mixinPropertyWithMetaAnnotationOverridden.java
@@ -31,7 +31,7 @@ import lombok.RequiredArgsConstructor;
labelPosition = LabelPosition.LEFT // <.>
, describedAs =
"@LabelPositionTopMetaAnnotation @ParameterLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "2"
+ fieldSetId = "meta-annotated-overridden", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutLabelPositionVm_mixinPropertyWithMetaAnnotationOverridden {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.java
index ffcc178..6b1fb2b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm.java
@@ -56,7 +56,7 @@ public class PropertyLayoutMultiLineVm implements HasAsciiDocDescription {
multiLine = 5 // <.>
, describedAs =
"@PropertyLayout(multiLine = 5)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingAnnotation;
@@ -71,7 +71,7 @@ public class PropertyLayoutMultiLineVm implements HasAsciiDocDescription {
multiLine = 5
, describedAs =
"@PropertyLayout(multiLine = 5)",
- fieldSet = "annotation", sequence = "2")
+ fieldSetId = "annotation", sequence = "2")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingAnnotationReadOnly;
@@ -82,7 +82,7 @@ public class PropertyLayoutMultiLineVm implements HasAsciiDocDescription {
@PropertyLayout( // <.>
describedAs =
"<cpt:property id=\"...\" multiLine=\"5\"/>",
- fieldSet = "layout-file", sequence = "1")
+ fieldSetId = "layout-file", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingLayout;
@@ -93,7 +93,7 @@ public class PropertyLayoutMultiLineVm implements HasAsciiDocDescription {
@Property(optionality = Optionality.OPTIONAL)
@PropertyLayout(
describedAs = "@MultiLine10MetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -107,7 +107,7 @@ public class PropertyLayoutMultiLineVm implements HasAsciiDocDescription {
, describedAs =
"@MultiLine10MetaAnnotation " +
"@PropertyLayout(multiLine = 3)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinProperty.java
index 09111c8..c29eb5c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinProperty.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
multiLine = 5 // <.>
, describedAs =
"@PropertyLayout(multiLine = 5)",
- fieldSet = "contributed", sequence = "1"
+ fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
public class PropertyLayoutMultiLineVm_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinPropertyWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinPropertyWithMetaAnnotation.java
index 58edee0..a9aaef0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinPropertyWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinPropertyWithMetaAnnotation.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs =
"@MultiLine10MetaAnnotation",
- fieldSet = "meta-annotated", sequence = "2"
+ fieldSetId = "meta-annotated", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutMultiLineVm_mixinPropertyWithMetaAnnotation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinPropertyWithMetaAnnotationOverridden.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinPropertyWithMetaAnnotationOverridden.java
index 410d800..8cf9972 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinPropertyWithMetaAnnotationOverridden.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/multiLine/PropertyLayoutMultiLineVm_mixinPropertyWithMetaAnnotationOverridden.java
@@ -31,7 +31,7 @@ import lombok.RequiredArgsConstructor;
, describedAs =
"@MultiLine10MetaAnnotation " +
"@PropertyLayout(multiLine = 3)",
- fieldSet = "meta-annotated-overridden", sequence = "2"
+ fieldSetId = "meta-annotated-overridden", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutMultiLineVm_mixinPropertyWithMetaAnnotationOverridden {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.java
index 6af7e5a..03385c9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm.java
@@ -56,7 +56,7 @@ public class PropertyLayoutNamedVm implements HasAsciiDocDescription {
named = "Named using @PropertyLayout" // <.>
, describedAs =
"@PropertyLayout(named= \"...\")",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingAnnotation;
@@ -69,7 +69,7 @@ public class PropertyLayoutNamedVm implements HasAsciiDocDescription {
"<cpt:property id=\"...\">" +
"<cpt:named>...</cpt:named>" +
"</cpt:property>",
- fieldSet = "layout-file", sequence = "1")
+ fieldSetId = "layout-file", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingLayout;
@@ -80,7 +80,7 @@ public class PropertyLayoutNamedVm implements HasAsciiDocDescription {
@NamedMetaAnnotation // <.>
@PropertyLayout(
describedAs = "@NamedMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -94,7 +94,7 @@ public class PropertyLayoutNamedVm implements HasAsciiDocDescription {
"overrides meta-annotation" // <.>
, describedAs =
"@NamedMetaAnnotation @PropertyLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
@@ -107,7 +107,7 @@ public class PropertyLayoutNamedVm implements HasAsciiDocDescription {
namedEscaped = false // <.>
, describedAs =
"@PropertyLayout(named= \"...\", namedEscaped=false)",
- fieldSet = "markup", sequence = "1")
+ fieldSetId = "markup", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMarkup;
@@ -121,7 +121,7 @@ public class PropertyLayoutNamedVm implements HasAsciiDocDescription {
, describedAs =
"@PropertyLayout(" +
"named = \"...\", namedEscaped=true)",
- fieldSet = "markup", sequence = "2")
+ fieldSetId = "markup", sequence = "2")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingEscapedMarkup;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinProperty.java
index d40172b..ebbf1fb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinProperty.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
named = "Mixin named using @PropertyLayout" // <.>
, describedAs =
"@PropertyLayout(named = \"...\")",
- fieldSet = "contributed", sequence = "1"
+ fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
public class PropertyLayoutNamedVm_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinPropertyWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinPropertyWithMetaAnnotation.java
index 6cc8fab..d67e4fa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinPropertyWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinPropertyWithMetaAnnotation.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs =
"@NamedMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "2"
+ fieldSetId = "meta-annotated", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutNamedVm_mixinPropertyWithMetaAnnotation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinPropertyWithMetaAnnotationOverridden.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinPropertyWithMetaAnnotationOverridden.java
index 9369856..b73798e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinPropertyWithMetaAnnotationOverridden.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/named/PropertyLayoutNamedVm_mixinPropertyWithMetaAnnotationOverridden.java
@@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor;
named = "@PropertyLayout overrides meta-annotation for mixin" // <.>
, describedAs =
"@NamedMetaAnnotation @PropertyLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "2"
+ fieldSetId = "meta-annotated-overridden", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutNamedVm_mixinPropertyWithMetaAnnotationOverridden {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
index 4c99c91..83ddd6c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeVm.java
@@ -72,7 +72,7 @@ public class FileNodeVm implements HasAsciiDocDescription {
//tag::tree[]
@Property
- @PropertyLayout(labelPosition = LabelPosition.NONE, fieldSet = "tree", sequence = "1")
+ @PropertyLayout(labelPosition = LabelPosition.NONE, fieldSetId = "tree", sequence = "1")
public TreeNode<FileNodeVm> getTree() {
return fileTreeNodeService.sessionTree();
}
@@ -80,7 +80,7 @@ public class FileNodeVm implements HasAsciiDocDescription {
//tag::navigable[]
@Property
- @PropertyLayout(navigable=Navigable.PARENT, hidden=Where.EVERYWHERE, fieldSet = "detail", sequence = "1")
+ @PropertyLayout(navigable=Navigable.PARENT, hidden=Where.EVERYWHERE, fieldSetId = "detail", sequence = "1")
public FileNodeVm getParent() {
val parentFile = asFile().getParentFile();
return parentFile != null
@@ -90,12 +90,12 @@ public class FileNodeVm implements HasAsciiDocDescription {
//end::navigable[]
@Property
- @PropertyLayout(labelPosition = LabelPosition.TOP, fieldSet = "detail", sequence = "2")
+ @PropertyLayout(labelPosition = LabelPosition.TOP, fieldSetId = "detail", sequence = "2")
@Getter @Setter
private String path;
@Property
- @PropertyLayout(labelPosition = LabelPosition.TOP, fieldSet = "detail", sequence = "3")
+ @PropertyLayout(labelPosition = LabelPosition.TOP, fieldSetId = "detail", sequence = "3")
@Getter @Setter
private FileNodeType type;
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 a821452..5d7780f 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
@@ -68,7 +68,7 @@ public class PropertyLayoutRenderDayVm implements HasAsciiDocDescription {
renderDay = RenderDay.NOT_SPECIFIED // <.>
, describedAs =
"@PropertyLayout(renderDay = NOT_SPECIFIED)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
@@ -81,7 +81,7 @@ public class PropertyLayoutRenderDayVm implements HasAsciiDocDescription {
renderDay = RenderDay.AS_DAY_BEFORE // <.>
, describedAs =
"@PropertyLayout(renderDay = AS_DAY_BEFORE)",
- fieldSet = "annotation", sequence = "2")
+ fieldSetId = "annotation", sequence = "2")
@XmlElement(required = false)
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
@@ -94,7 +94,7 @@ public class PropertyLayoutRenderDayVm implements HasAsciiDocDescription {
renderDay = RenderDay.AS_DAY // <.>
, describedAs =
"Value of getEndDate(), but @PropertyLayout(renderDay = AS_DAY)",
- fieldSet = "annotation", sequence = "3")
+ fieldSetId = "annotation", sequence = "3")
public LocalDate getEndDateRaw() {
return getEndDate();
}
@@ -106,7 +106,7 @@ public class PropertyLayoutRenderDayVm implements HasAsciiDocDescription {
describedAs =
"<cpt:property id=\"endDateLayoutFile\" " +
"renderedAsDayBefore=\"true\"/>",
- fieldSet = "layout-file", sequence = "1")
+ fieldSetId = "layout-file", sequence = "1")
@XmlElement(required = false)
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
@@ -119,7 +119,7 @@ public class PropertyLayoutRenderDayVm implements HasAsciiDocDescription {
@PropertyLayout(
describedAs =
"@RenderDayMetaAnnotationEndDateExclusive",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
@@ -133,7 +133,7 @@ public class PropertyLayoutRenderDayVm implements HasAsciiDocDescription {
renderDay = RenderDay.AS_DAY_BEFORE
, describedAs =
"@RenderDayMetaAnnotationEndDateExclusive",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = false)
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithMetaAnnotation.java
index 90fd1ee..0223947 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/renderDay/PropertyLayoutRenderDayVm_mixinEndDateWithMetaAnnotation.java
@@ -31,7 +31,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs =
"@RenderDayMetaAnnotationEndDateExclusive",
- fieldSet = "meta-annotated", sequence = "2"
+ fieldSetId = "meta-annotated", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutRenderDayVm_mixinEndDateWithMetaAnnotation {
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 d01b108..bc67788 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
@@ -35,7 +35,7 @@ import lombok.RequiredArgsConstructor;
, describedAs =
"@RenderDayMetaAnnotationStartDateInclusive" +
" @PropertyLayout(renderDay = AS_DAY_BEFORE",
- fieldSet = "meta-annotated-overridden", sequence = "2"
+ fieldSetId = "meta-annotated-overridden", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutRenderDayVm_mixinEndDateWithMetaAnnotationOverridden {
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 770811b..f965bef 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
@@ -32,7 +32,7 @@ import lombok.RequiredArgsConstructor;
renderDay = RenderDay.AS_DAY_BEFORE // <.>
, describedAs =
"@PropertyLayout(renderDay = AS_DAY_BEFORE)",
- fieldSet = "contributed", sequence = "1"
+ fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
public class PropertyLayoutRenderDayVm_mixinEndDateWithPropertyLayout {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java
index c3d5b0f..86ecc2f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java
@@ -57,7 +57,7 @@ public class PropertyLayoutRepaintingVm implements HasAsciiDocDescription {
describedAs =
"Editable property " +
"(PDFs should not repaint if it changes)",
- fieldSet = "edit", sequence = "1")
+ fieldSetId = "edit", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String editMe;
@@ -68,7 +68,7 @@ public class PropertyLayoutRepaintingVm implements HasAsciiDocDescription {
repainting = Repainting.NO_REPAINT // <.>
, describedAs =
"@PropertyLayout(repainting = NO_REPAINT)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = true)
@PdfJsViewer // <.>
@Getter @Setter
@@ -80,7 +80,7 @@ public class PropertyLayoutRepaintingVm implements HasAsciiDocDescription {
@PropertyLayout( // <.>
describedAs =
"<cpt:property id=\"...\" repainting = \"NO_REPAINT\"/>",
- fieldSet = "layout-file", sequence = "1")
+ fieldSetId = "layout-file", sequence = "1")
@XmlElement(required = false)
// @PdfJsViewer
@Getter @Setter
@@ -92,7 +92,7 @@ public class PropertyLayoutRepaintingVm implements HasAsciiDocDescription {
@Property(optionality = Optionality.OPTIONAL)
@PropertyLayout(
describedAs = "@RepaintingNoRepaintMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
// @PdfJsViewer
@Getter @Setter
@@ -106,7 +106,7 @@ public class PropertyLayoutRepaintingVm implements HasAsciiDocDescription {
repainting = Repainting.NO_REPAINT // <.>
, describedAs =
"@RepaintingRepaintMetaAnnotation @PropertyLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = false)
// @PdfJsViewer
@Getter @Setter
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinProperty.java
index 9fa6144..159d257 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinProperty.java
@@ -31,7 +31,7 @@ import lombok.RequiredArgsConstructor;
repainting = Repainting.NO_REPAINT // <.>
, describedAs =
"@PropertyLayout(repainting = NO_REPAINT)",
- fieldSet = "contributed", sequence = "1"
+ fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
public class PropertyLayoutRepaintingVm_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinPropertyWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinPropertyWithMetaAnnotation.java
index d3f346a..f55932e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinPropertyWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinPropertyWithMetaAnnotation.java
@@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs =
"@RepaintingNoRepaintMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "2"
+ fieldSetId = "meta-annotated", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutRepaintingVm_mixinPropertyWithMetaAnnotation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinPropertyWithMetaAnnotationOverridden.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinPropertyWithMetaAnnotationOverridden.java
index 915ab97..91b3bf1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinPropertyWithMetaAnnotationOverridden.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm_mixinPropertyWithMetaAnnotationOverridden.java
@@ -33,7 +33,7 @@ import lombok.RequiredArgsConstructor;
, describedAs =
"@RepaintingRepaintMetaAnnotation " +
"@PropertyLayout(repainting = NO_REPAINT)",
- fieldSet = "meta-annotated-overridden", sequence = "2"
+ fieldSetId = "meta-annotated-overridden", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutRepaintingVm_mixinPropertyWithMetaAnnotationOverridden {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.java
index 63678c0..e0482ad 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm.java
@@ -56,7 +56,7 @@ public class PropertyLayoutTypicalLengthVm implements HasAsciiDocDescription {
typicalLength = 10 // <.>
, describedAs =
"@PropertyLayout(typicalLength = 10)",
- fieldSet = "annotation", sequence = "1")
+ fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingAnnotation;
@@ -67,7 +67,7 @@ public class PropertyLayoutTypicalLengthVm implements HasAsciiDocDescription {
@PropertyLayout( // <.>
describedAs =
"<cpt:property id=\"...\" typicalLength=\"10\"/>",
- fieldSet = "layout-file", sequence = "1")
+ fieldSetId = "layout-file", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingLayout;
@@ -78,7 +78,7 @@ public class PropertyLayoutTypicalLengthVm implements HasAsciiDocDescription {
@Property(optionality = Optionality.OPTIONAL)
@PropertyLayout(
describedAs = "@TypicalLengthMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "1")
+ fieldSetId = "meta-annotated", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotation;
@@ -91,7 +91,7 @@ public class PropertyLayoutTypicalLengthVm implements HasAsciiDocDescription {
typicalLength = 5 // <.>
, describedAs =
"@TypicalLengthMetaAnnotation @PropertyLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "1")
+ fieldSetId = "meta-annotated-overridden", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String propertyUsingMetaAnnotationButOverridden;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinProperty.java
index 8417e54..a4f5078 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinProperty.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
typicalLength = 10 // <.>
, describedAs =
"@PropertyLayout(typicalLength = 10)",
- fieldSet = "contributed", sequence = "1"
+ fieldSetId = "contributed", sequence = "1"
)
@RequiredArgsConstructor
public class PropertyLayoutTypicalLengthVm_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinPropertyWithMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinPropertyWithMetaAnnotation.java
index 4ae5fee..a05992a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinPropertyWithMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinPropertyWithMetaAnnotation.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
describedAs =
"@TypicalLengthMetaAnnotation",
- fieldSet = "meta-annotated", sequence = "2"
+ fieldSetId = "meta-annotated", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutTypicalLengthVm_mixinPropertyWithMetaAnnotation {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinPropertyWithMetaAnnotationOverridden.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinPropertyWithMetaAnnotationOverridden.java
index 273828d..4d7c3d7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinPropertyWithMetaAnnotationOverridden.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/typicalLength/PropertyLayoutTypicalLengthVm_mixinPropertyWithMetaAnnotationOverridden.java
@@ -30,7 +30,7 @@ import lombok.RequiredArgsConstructor;
typicalLength = 3 // <.>
, describedAs =
"@TypicalLengthMetaAnnotation @PropertyLayout(...)",
- fieldSet = "meta-annotated-overridden", sequence = "2"
+ fieldSetId = "meta-annotated-overridden", sequence = "2"
)
@RequiredArgsConstructor
public class PropertyLayoutTypicalLengthVm_mixinPropertyWithMetaAnnotationOverridden {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryJdo.java
index efe2898..c962827 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/WrapperFactoryJdo.java
@@ -70,12 +70,12 @@ public class WrapperFactoryJdo
//tag::property[]
@Property()
- @PropertyLayout(fieldSet = "async", sequence = "1")
+ @PropertyLayout(fieldSetId = "async", sequence = "1")
@Getter @Setter
private String propertyAsync;
@Property()
- @PropertyLayout(fieldSet = "async", sequence = "2")
+ @PropertyLayout(fieldSetId = "async", sequence = "2")
@Getter @Setter
private String propertyAsyncMixin;
//end::property[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java
index 38cb719..1469de0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/XmlSnapshotParentVm.java
@@ -62,13 +62,13 @@ public class XmlSnapshotParentVm implements HasAsciiDocDescription {
}
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String text;
@Property(editing = Editing.DISABLED)
- @PropertyLayout(fieldSet = "properties", sequence = "3")
+ @PropertyLayout(fieldSetId = "properties", sequence = "3")
@XmlElement(required = false)
@Getter @Setter
private XmlSnapshotPeerVm peer;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.java
index aa95267..d0d43f0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/child/XmlSnapshotChildVm.java
@@ -52,7 +52,7 @@ public class XmlSnapshotChildVm implements HasAsciiDocDescription {
@Title
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String value;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java
index 2c5c855..029b553 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java
@@ -59,7 +59,7 @@ public class XmlSnapshotPeerVm implements HasAsciiDocDescription {
@Title
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String value;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java
index aba0a5d..e9753d6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java
@@ -52,7 +52,7 @@ public class XmlSnapshotPeerChildVm implements HasAsciiDocDescription {
@Title
@Property()
- @PropertyLayout(fieldSet = "annotation", sequence = "1")
+ @PropertyLayout(fieldSetId = "annotation", sequence = "1")
@XmlElement(required = false)
@Getter @Setter
private String value;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdo.java
index 8fd9219..598b978 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/entities/TenantedJdo.java
@@ -45,7 +45,7 @@ public class TenantedJdo {
@Title
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "General", sequence = "1")
+ @PropertyLayout(fieldSetId = "General", sequence = "1")
@Getter @Setter
private String name;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder2.java
index d3cb541..46ac7a0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder2.java
@@ -33,7 +33,7 @@ public interface IsisBlobHolder2 extends IsisBlobHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Blob getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface IsisBlobHolder2 extends IsisBlobHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Blob getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface IsisBlobHolder2 extends IsisBlobHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Blob getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -66,7 +66,7 @@ public interface IsisBlobHolder2 extends IsisBlobHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Blob getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_mixinProperty.java
index a04a56d..4e71949 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/holder/IsisBlobHolder_mixinProperty.java
@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class IsisBlobHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdo.java
index baa6f99..efc31ab 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdo.java
@@ -55,7 +55,7 @@ public class IsisBlobJdo // <.>
//tag::class[]
@Title(prepend = "Blob JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Persistent(defaultFetchGroup="false", columns = { // <.>
@Column(name = "readOnlyProperty_name"),
@Column(name = "readOnlyProperty_mimetype"),
@@ -65,7 +65,7 @@ public class IsisBlobJdo // <.>
private Blob readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Persistent(defaultFetchGroup="false", columns = {
@Column(name = "readWriteProperty_name"),
@Column(name = "readWriteProperty_mimetype"),
@@ -75,7 +75,7 @@ public class IsisBlobJdo // <.>
private Blob readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Persistent(defaultFetchGroup="false", columns = {
@Column(name = "readOnlyOptionalProperty_name",
allowsNull = "true"), // <.>
@@ -88,7 +88,7 @@ public class IsisBlobJdo // <.>
private Blob readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Persistent(defaultFetchGroup="false", columns = {
@Column(name = "readWriteOptionalProperty_name",
allowsNull = "true"),
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm.java
index db3ad65..6b91d0b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm.java
@@ -60,24 +60,24 @@ public class IsisBlobVm
return "Blob view model: " +getReadOnlyProperty().getName();
}
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Blob readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Blob readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Blob readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Blob readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder2.java
index c043e8f..ac86c30 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder2.java
@@ -33,7 +33,7 @@ public interface IsisClobHolder2 extends IsisClobHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Clob getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface IsisClobHolder2 extends IsisClobHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Clob getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface IsisClobHolder2 extends IsisClobHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Clob getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -66,7 +66,7 @@ public interface IsisClobHolder2 extends IsisClobHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Clob getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_mixinProperty.java
index f4c768e..3370d49 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/holder/IsisClobHolder_mixinProperty.java
@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class IsisClobHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdo.java
index 9adffab..cfbc999 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdo.java
@@ -55,7 +55,7 @@ public class IsisClobJdo // <.>
//tag::class[]
@Title(prepend = "Clob JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Persistent(defaultFetchGroup="false", columns = { // <.>
@Column(name = "readOnlyProperty_name"),
@Column(name = "readOnlyProperty_mimetype"),
@@ -67,7 +67,7 @@ public class IsisClobJdo // <.>
private Clob readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Persistent(defaultFetchGroup="false", columns = {
@Column(name = "readWriteProperty_name"),
@Column(name = "readWriteProperty_mimetype"),
@@ -79,7 +79,7 @@ public class IsisClobJdo // <.>
private Clob readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Persistent(defaultFetchGroup="false", columns = {
@Column(name = "readOnlyOptionalProperty_name",
allowsNull = "true"), // <.>
@@ -93,7 +93,7 @@ public class IsisClobJdo // <.>
private Clob readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Persistent(defaultFetchGroup="false", columns = {
@Column(name = "readWriteOptionalProperty_name"
, allowsNull = "true"), // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm.java
index 1e2c6f5..2c193ee 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm.java
@@ -58,24 +58,24 @@ public class IsisClobVm
//tag::class[]
@Title(prepend = "Clob view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Clob readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Clob readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Clob readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Clob readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder2.java
index 1cab9f1..4874b90 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder2.java
@@ -33,7 +33,7 @@ public interface IsisLocalResourcePathHolder2 extends IsisLocalResourcePathHolde
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default LocalResourcePath getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface IsisLocalResourcePathHolder2 extends IsisLocalResourcePathHolde
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default LocalResourcePath getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface IsisLocalResourcePathHolder2 extends IsisLocalResourcePathHolde
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default LocalResourcePath getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -66,7 +66,7 @@ public interface IsisLocalResourcePathHolder2 extends IsisLocalResourcePathHolde
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default LocalResourcePath getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_mixinProperty.java
index 83e6cf7..b4ddfd5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/holder/IsisLocalResourcePathHolder_mixinProperty.java
@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class IsisLocalResourcePathHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdo.java
index c324b96..b91ddaf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/jdo/IsisLocalResourcePathJdo.java
@@ -55,25 +55,25 @@ public class IsisLocalResourcePathJdo // <.>
//tag::class[]
@Title(prepend = "LocalResourcePath JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private LocalResourcePath readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private LocalResourcePath readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private LocalResourcePath readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@NotPersistent
// @Column(allowsNull = "true")
@Getter @Setter
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm.java
index 81f493c..39f8e6e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/vm/IsisLocalResourcePathVm.java
@@ -58,24 +58,24 @@ public class IsisLocalResourcePathVm
//tag::class[]
@Title(prepend = "LocalResourcePath view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private LocalResourcePath readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private LocalResourcePath readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private LocalResourcePath readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private LocalResourcePath readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java
index 6e94306..1d34b79 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java
@@ -33,7 +33,7 @@ public interface IsisMarkupHolder2 extends demoapp.dom.types.isis.markups.holder
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Markup getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface IsisMarkupHolder2 extends demoapp.dom.types.isis.markups.holder
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Markup getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface IsisMarkupHolder2 extends demoapp.dom.types.isis.markups.holder
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Markup getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -66,7 +66,7 @@ public interface IsisMarkupHolder2 extends demoapp.dom.types.isis.markups.holder
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Markup getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java
index b89ece2..dad0a1c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java
@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class IsisMarkupHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java
index 7380d66..7b51a89 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java
@@ -60,25 +60,25 @@ public class IsisMarkupJdo // <.>
bookmarkService.bookmarkFor(this).getIdentifier();
}
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false", jdbcType = "CLOB") // <.>
@Getter @Setter
private Markup readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false", jdbcType = "CLOB")
@Getter @Setter
private Markup readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Markup readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Markup readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java
index fdc983a..dddafcf 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java
@@ -61,24 +61,24 @@ public class IsisMarkupVm
return "Markup view model";
}
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Markup readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Markup readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Markup readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Markup readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder2.java
index b09da9d..cb043ae 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder2.java
@@ -33,7 +33,7 @@ public interface IsisPasswordHolder2 extends IsisPasswordHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Password getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface IsisPasswordHolder2 extends IsisPasswordHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Password getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface IsisPasswordHolder2 extends IsisPasswordHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Password getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -66,7 +66,7 @@ public interface IsisPasswordHolder2 extends IsisPasswordHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Password getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_mixinProperty.java
index ebb430e..4bb0b3d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/holder/IsisPasswordHolder_mixinProperty.java
@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class IsisPasswordHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdo.java
index a5f555a..118828e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdo.java
@@ -54,25 +54,25 @@ public class IsisPasswordJdo // <.>
//tag::class[]
@Title(prepend = "Password JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private Password readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private Password readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Password readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Password readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm.java
index c1ba656..9aef174 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/vm/IsisPasswordVm.java
@@ -58,24 +58,24 @@ public class IsisPasswordVm
//tag::class[]
@Title(prepend = "Password view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Password readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Password readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Password readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Password readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder2.java
index 5f1a0dc..ed557d1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder2.java
@@ -33,7 +33,7 @@ public interface IsisAsciiDocHolder2 extends demoapp.dom.types.isisext.asciidocs
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions",
+ fieldSetId = "label-positions",
sequence = "1") // <.>
default AsciiDoc getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
@@ -45,7 +45,7 @@ public interface IsisAsciiDocHolder2 extends demoapp.dom.types.isisext.asciidocs
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions",
+ fieldSetId = "label-positions",
sequence = "2")
default AsciiDoc getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
@@ -57,7 +57,7 @@ public interface IsisAsciiDocHolder2 extends demoapp.dom.types.isisext.asciidocs
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions",
+ fieldSetId = "label-positions",
sequence = "3")
default AsciiDoc getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
@@ -69,7 +69,7 @@ public interface IsisAsciiDocHolder2 extends demoapp.dom.types.isisext.asciidocs
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions",
+ fieldSetId = "label-positions",
sequence = "4")
default AsciiDoc getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java
index 543f61f..132777f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java
@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class IsisAsciiDocHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo.java
index 6d330cb..ab68cbb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo.java
@@ -60,25 +60,25 @@ public class IsisAsciiDocJdo // <.>
bookmarkService.bookmarkFor(this).getIdentifier();
}
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false", jdbcType = "CLOB") // <.>
@Getter @Setter
private AsciiDoc readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false", jdbcType = "CLOB")
@Getter @Setter
private AsciiDoc readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private AsciiDoc readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private AsciiDoc readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.java
index 70c80ef..fab53dc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.java
@@ -61,24 +61,24 @@ public class IsisAsciiDocVm
return "AsciiDoc view model";
}
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private AsciiDoc readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private AsciiDoc readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private AsciiDoc readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private AsciiDoc readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder2.java
index 6a64d0b..d689603 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder2.java
@@ -33,7 +33,7 @@ public interface IsisMarkdownHolder2 extends demoapp.dom.types.isisext.markdowns
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Markdown getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface IsisMarkdownHolder2 extends demoapp.dom.types.isisext.markdowns
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Markdown getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface IsisMarkdownHolder2 extends demoapp.dom.types.isisext.markdowns
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Markdown getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -66,7 +66,7 @@ public interface IsisMarkdownHolder2 extends demoapp.dom.types.isisext.markdowns
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Markdown getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_mixinProperty.java
index bd8bf3a..dbe4625 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_mixinProperty.java
@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class IsisMarkdownHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdo.java
index 3eb9558..293f0c6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdo.java
@@ -60,25 +60,25 @@ public class IsisMarkdownJdo // <.>
bookmarkService.bookmarkFor(this).getIdentifier();
}
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false", jdbcType = "CLOB") // <.>
@Getter @Setter
private Markdown readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false", jdbcType = "CLOB")
@Getter @Setter
private Markdown readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Markdown readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Markdown readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.java
index 992bb32..2f22fcc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.java
@@ -61,24 +61,24 @@ public class IsisMarkdownVm
return "Markdown view model";
}
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Markdown readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(hidden = Where.EVERYWHERE, fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.EVERYWHERE, fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Markdown readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Markdown readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Markdown readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder2.java
index 3cf48fc..f4a0547 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder2.java
@@ -34,7 +34,7 @@ public interface JavaAwtImageHolder2 extends JavaAwtImageHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default BufferedImage getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -45,7 +45,7 @@ public interface JavaAwtImageHolder2 extends JavaAwtImageHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default BufferedImage getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -56,7 +56,7 @@ public interface JavaAwtImageHolder2 extends JavaAwtImageHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default BufferedImage getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -67,7 +67,7 @@ public interface JavaAwtImageHolder2 extends JavaAwtImageHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default BufferedImage getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_mixinProperty.java
index 849e422..d6aa38c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/holder/JavaAwtImageHolder_mixinProperty.java
@@ -29,7 +29,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaAwtImageHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdo.java
index b94810d..6ab1009 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtImageJdo.java
@@ -62,7 +62,7 @@ public class JavaAwtImageJdo // <.>
// @Title(prepend = "Image JDO entity: ") // not yet supported
//tag::class[]
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private BufferedImage readOnlyProperty;
@@ -77,7 +77,7 @@ public class JavaAwtImageJdo // <.>
//tag::class[]
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private BufferedImage readOnlyOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm.java
index 6b5e99a..32a8762 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtImageVm.java
@@ -66,7 +66,7 @@ public class JavaAwtImageVm
// @Title(prepend = "Image view model: ") // not yet supported
//tag::class[]
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private BufferedImage readOnlyProperty;
@@ -81,7 +81,7 @@ public class JavaAwtImageVm
//tag::class[]
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private BufferedImage readOnlyOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder2.java
index fbe9852..2f2d9a9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder2.java
@@ -32,7 +32,7 @@ public interface WrapperBooleanHolder2 extends WrapperBooleanHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Boolean getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface WrapperBooleanHolder2 extends WrapperBooleanHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Boolean getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface WrapperBooleanHolder2 extends WrapperBooleanHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Boolean getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface WrapperBooleanHolder2 extends WrapperBooleanHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Boolean getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_mixinProperty.java
index c745500..736c10b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/holder/WrapperBooleanHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class WrapperBooleanHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java
index 712190b..37ddbdd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/jdo/WrapperBooleanJdo.java
@@ -53,25 +53,25 @@ public class WrapperBooleanJdo // <.>
//tag::class[]
@Title(prepend = "Boolean (wrapper) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private Boolean readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private Boolean readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Boolean readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Boolean readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java
index 21e6ae3..11e71c8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/vm/WrapperBooleanVm.java
@@ -57,24 +57,24 @@ public class WrapperBooleanVm
//tag::class[]
@Title(prepend = "Boolean (wrapper) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Boolean readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Boolean readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Boolean readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Boolean readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder2.java
index 3f3532c..f08b216 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder2.java
@@ -32,7 +32,7 @@ public interface WrapperByteHolder2 extends WrapperByteHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Byte getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface WrapperByteHolder2 extends WrapperByteHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Byte getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface WrapperByteHolder2 extends WrapperByteHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Byte getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface WrapperByteHolder2 extends WrapperByteHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Byte getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_mixinProperty.java
index 45936f8..d7ee0a3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/holder/WrapperByteHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class WrapperByteHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
index 446191e..a447805 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/jdo/WrapperByteJdo.java
@@ -53,25 +53,25 @@ public class WrapperByteJdo // <.>
//tag::class[]
@Title(prepend = "Byte (wrapper) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private Byte readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private Byte readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Byte readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Byte readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
index 555a870..cb8835f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java
@@ -57,24 +57,24 @@ public class WrapperByteVm
//tag::class[]
@Title(prepend = "Byte (wrapper) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Byte readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Byte readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Byte readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Byte readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder2.java
index 0fe1f71..c52b84a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder2.java
@@ -32,7 +32,7 @@ public interface WrapperCharacterHolder2 extends WrapperCharacterHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Character getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface WrapperCharacterHolder2 extends WrapperCharacterHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Character getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface WrapperCharacterHolder2 extends WrapperCharacterHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Character getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface WrapperCharacterHolder2 extends WrapperCharacterHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Character getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_mixinProperty.java
index 6e4bdde..cfb1a4b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/holder/WrapperCharacterHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class WrapperCharacterHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
index e3dafd1..c372cb7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/jdo/WrapperCharacterJdo.java
@@ -53,25 +53,25 @@ public class WrapperCharacterJdo // <.>
//tag::class[]
@Title(prepend = "Character (wrapper) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private Character readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private Character readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Character readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Character readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
index 085edc8..6d17779 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/vm/WrapperCharacterVm.java
@@ -57,24 +57,24 @@ public class WrapperCharacterVm
//tag::class[]
@Title(prepend = "Character (wrapper) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Character readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Character readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Character readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Character readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder2.java
index a35757e..b18230e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder2.java
@@ -32,7 +32,7 @@ public interface WrapperDoubleHolder2 extends WrapperDoubleHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Double getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface WrapperDoubleHolder2 extends WrapperDoubleHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Double getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface WrapperDoubleHolder2 extends WrapperDoubleHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Double getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface WrapperDoubleHolder2 extends WrapperDoubleHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Double getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_mixinProperty.java
index b1f77b5..1d26a50 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/holder/WrapperDoubleHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class WrapperDoubleHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java
index 12f1978..f04c71d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/jdo/WrapperDoubleJdo.java
@@ -53,25 +53,25 @@ public class WrapperDoubleJdo // <.>
//tag::class[]
@Title(prepend = "Double (wrapper) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private Double readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private Double readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Double readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Double readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java
index 07147e8..2d8b054 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/vm/WrapperDoubleVm.java
@@ -57,24 +57,24 @@ public class WrapperDoubleVm
//tag::class[]
@Title(prepend = "Double (wrapper) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Double readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Double readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Double readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Double readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder2.java
index 653259d..1bcc2b6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder2.java
@@ -32,7 +32,7 @@ public interface WrapperFloatHolder2 extends WrapperFloatHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Float getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface WrapperFloatHolder2 extends WrapperFloatHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Float getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface WrapperFloatHolder2 extends WrapperFloatHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Float getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface WrapperFloatHolder2 extends WrapperFloatHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Float getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_mixinProperty.java
index 052c553..7a3bf85 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/holder/WrapperFloatHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class WrapperFloatHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo.java
index b1a6e42..b427472 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/jdo/WrapperFloatJdo.java
@@ -53,25 +53,25 @@ public class WrapperFloatJdo // <.>
//tag::class[]
@Title(prepend = "Float (wrapper) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private Float readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private Float readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Float readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Float readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.java
index 87f373c..02be013 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.java
@@ -57,24 +57,24 @@ public class WrapperFloatVm
//tag::class[]
@Title(prepend = "Float (wrapper) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Float readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Float readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Float readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Float readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder2.java
index 51de664..1379c8b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder2.java
@@ -32,7 +32,7 @@ public interface WrapperIntegerHolder2 extends WrapperIntegerHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Integer getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface WrapperIntegerHolder2 extends WrapperIntegerHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Integer getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface WrapperIntegerHolder2 extends WrapperIntegerHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Integer getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface WrapperIntegerHolder2 extends WrapperIntegerHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Integer getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_mixinProperty.java
index 42895c2..a796ef8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/holder/WrapperIntegerHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class WrapperIntegerHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo.java
index 4e43ccc..7bf9824 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/jdo/WrapperIntegerJdo.java
@@ -53,25 +53,25 @@ public class WrapperIntegerJdo // <.>
//tag::class[]
@Title(prepend = "Integer (wrapper) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private Integer readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private Integer readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Integer readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Integer readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.java
index d5b1176..7069120 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/vm/WrapperIntegerVm.java
@@ -57,24 +57,24 @@ public class WrapperIntegerVm
//tag::class[]
@Title(prepend = "Integer (wrapper) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Integer readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Integer readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Integer readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Integer readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder2.java
index 5ce83fe..73de9d0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder2.java
@@ -32,7 +32,7 @@ public interface WrapperLongHolder2 extends WrapperLongHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Long getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface WrapperLongHolder2 extends WrapperLongHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Long getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface WrapperLongHolder2 extends WrapperLongHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Long getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface WrapperLongHolder2 extends WrapperLongHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Long getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_mixinProperty.java
index 32e8169..6a1a9fe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/holder/WrapperLongHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class WrapperLongHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo.java
index 984f1d8..f8a2f67 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/jdo/WrapperLongJdo.java
@@ -53,25 +53,25 @@ public class WrapperLongJdo // <.>
//tag::class[]
@Title(prepend = "Long (wrapper) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private Long readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private Long readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Long readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Long readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.java
index b80c685..9c29c6d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/vm/WrapperLongVm.java
@@ -57,24 +57,24 @@ public class WrapperLongVm
//tag::class[]
@Title(prepend = "Long (wrapper) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Long readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Long readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Long readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Long readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder2.java
index 5bb5f3b..fa5b423 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder2.java
@@ -32,7 +32,7 @@ public interface WrapperShortHolder2 extends WrapperShortHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default Short getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface WrapperShortHolder2 extends WrapperShortHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default Short getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface WrapperShortHolder2 extends WrapperShortHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default Short getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface WrapperShortHolder2 extends WrapperShortHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default Short getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_mixinProperty.java
index 2f2b37c..6079071 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/holder/WrapperShortHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class WrapperShortHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java
index 31c7617..0227c21 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/jdo/WrapperShortJdo.java
@@ -53,25 +53,25 @@ public class WrapperShortJdo // <.>
//tag::class[]
@Title(prepend = "Short (wrapper) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private Short readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private Short readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private Short readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private Short readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java
index c074dda..168addb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java
@@ -57,24 +57,24 @@ public class WrapperShortVm
//tag::class[]
@Title(prepend = "Short (wrapper) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private Short readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private Short readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private Short readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private Short readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder2.java
index 1867f6b..17d2e30 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder2.java
@@ -32,7 +32,7 @@ public interface JavaLangStringHolder2 extends JavaLangStringHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default String getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaLangStringHolder2 extends JavaLangStringHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default String getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaLangStringHolder2 extends JavaLangStringHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default String getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaLangStringHolder2 extends JavaLangStringHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default String getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_mixinProperty.java
index 27fce6f..0945968 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/holder/JavaLangStringHolder_mixinProperty.java
@@ -27,13 +27,13 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaLangStringHolder_mixinProperty {
private final JavaLangStringHolder holder;
- @PropertyLayout(fieldSet = "contributed", sequence = "1")
+ @PropertyLayout(fieldSetId = "contributed", sequence = "1")
public String prop() {
return holder.getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo.java
index 3053467..916c254 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/jdo/JavaLangStringJdo.java
@@ -53,25 +53,25 @@ public class JavaLangStringJdo
//tag::class[]
@Title(prepend = "StringJDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private String readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private String readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private String readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private String readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.java
index 836ab3a..110c585 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/vm/JavaLangStringVm.java
@@ -57,24 +57,24 @@ public class JavaLangStringVm
//tag::class[]
@Title(prepend = "Stringview model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private String readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private String readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private String readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private String readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder2.java
index eda094d..fc51f9c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder2.java
@@ -32,7 +32,7 @@ public interface JavaMathBigDecimalHolder2 extends JavaMathBigDecimalHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.math.BigDecimal getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaMathBigDecimalHolder2 extends JavaMathBigDecimalHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.math.BigDecimal getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaMathBigDecimalHolder2 extends JavaMathBigDecimalHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.math.BigDecimal getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaMathBigDecimalHolder2 extends JavaMathBigDecimalHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.math.BigDecimal getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_mixinProperty.java
index d194998..13c3ab5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/holder/JavaMathBigDecimalHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaMathBigDecimalHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo.java
index faf6f01..4452d81 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/jdo/JavaMathBigDecimalJdo.java
@@ -53,25 +53,25 @@ public class JavaMathBigDecimalJdo // <
//tag::class[]
@Title(prepend = "java.math.BigDecimalJDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.math.BigDecimal readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.math.BigDecimal readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.math.BigDecimal readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.math.BigDecimal readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.java
index 7ae3ede..8fa23c2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.java
@@ -57,24 +57,24 @@ public class JavaMathBigDecimalVm
//tag::class[]
@Title(prepend = "java.math.BigDecimalview model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private java.math.BigDecimal readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private java.math.BigDecimal readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private java.math.BigDecimal readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private java.math.BigDecimal readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder2.java
index beec574..086b8b7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder2.java
@@ -32,7 +32,7 @@ public interface JavaMathBigIntegerHolder2 extends JavaMathBigIntegerHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.math.BigInteger getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaMathBigIntegerHolder2 extends JavaMathBigIntegerHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.math.BigInteger getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaMathBigIntegerHolder2 extends JavaMathBigIntegerHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.math.BigInteger getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaMathBigIntegerHolder2 extends JavaMathBigIntegerHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.math.BigInteger getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_mixinProperty.java
index 8bf09ca..47ed645 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/holder/JavaMathBigIntegerHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaMathBigIntegerHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo.java
index fe1ff4e..e0a4982 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/jdo/JavaMathBigIntegerJdo.java
@@ -53,25 +53,25 @@ public class JavaMathBigIntegerJdo // <
//tag::class[]
@Title(prepend = "java.math.BigIntegerJDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.math.BigInteger readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.math.BigInteger readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.math.BigInteger readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.math.BigInteger readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.java
index b7025d6..6f9ae48 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/vm/JavaMathBigIntegerVm.java
@@ -57,24 +57,24 @@ public class JavaMathBigIntegerVm
//tag::class[]
@Title(prepend = "java.math.BigIntegerview model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private java.math.BigInteger readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private java.math.BigInteger readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private java.math.BigInteger readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private java.math.BigInteger readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder2.java
index fceb414..8e796ff 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder2.java
@@ -32,7 +32,7 @@ public interface JavaNetUrlHolder2 extends JavaNetUrlHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.net.URL getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaNetUrlHolder2 extends JavaNetUrlHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.net.URL getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaNetUrlHolder2 extends JavaNetUrlHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.net.URL getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaNetUrlHolder2 extends JavaNetUrlHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.net.URL getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_mixinProperty.java
index d264226..62b609c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/holder/JavaNetUrlHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaNetUrlHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo.java
index 06f0bd9..be59b5d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/jdo/JavaNetUrlJdo.java
@@ -53,25 +53,25 @@ public class JavaNetUrlJdo // <.>
//tag::class[]
@Title(prepend = "java.net.URL JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.net.URL readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.net.URL readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.net.URL readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.net.URL readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.java
index bb4e496..7d3d372 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.java
@@ -57,24 +57,24 @@ public class JavaNetUrlVm
//tag::class[]
@Title(prepend = "java.net.URL view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private java.net.URL readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private java.net.URL readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private java.net.URL readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private java.net.URL readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder2.java
index 8ddbfc7..773aa90 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder2.java
@@ -32,7 +32,7 @@ public interface JavaSqlDateHolder2 extends JavaSqlDateHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.sql.Date getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaSqlDateHolder2 extends JavaSqlDateHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.sql.Date getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaSqlDateHolder2 extends JavaSqlDateHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.sql.Date getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaSqlDateHolder2 extends JavaSqlDateHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.sql.Date getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder3.java
index 790b9a9..333b900 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder3.java
@@ -33,7 +33,7 @@ public interface JavaSqlDateHolder3 extends JavaSqlDateHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default java.sql.Date getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JavaSqlDateHolder3 extends JavaSqlDateHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default java.sql.Date getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JavaSqlDateHolder3 extends JavaSqlDateHolder2 {
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default java.sql.Date getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_mixinProperty.java
index a49c278..9ed61c0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/holder/JavaSqlDateHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaSqlDateHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java
index cb8da68..c840642 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/jdo/JavaSqlDateJdo.java
@@ -53,25 +53,25 @@ public class JavaSqlDateJdo // <.>
//tag::class[]
@Title(prepend = "java.sql.Date JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.sql.Date readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.sql.Date readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.sql.Date readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.sql.Date readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java
index fc630de..fd25853 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java
@@ -59,27 +59,27 @@ public class JavaSqlDateVm
//tag::class[]
@Title(prepend = "java.sql.Date view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JavaSqlJaxbAdapters.DateToStringAdapter.class) // <.>
@Getter @Setter
private java.sql.Date readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JavaSqlJaxbAdapters.DateToStringAdapter.class)
@Getter @Setter
private java.sql.Date readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JavaSqlJaxbAdapters.DateToStringAdapter.class)
@Getter @Setter
private java.sql.Date readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@XmlJavaTypeAdapter(JavaSqlJaxbAdapters.DateToStringAdapter.class)
@Getter @Setter
private java.sql.Date readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder2.java
index 2df3074..244d6de 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder2.java
@@ -32,7 +32,7 @@ public interface JavaSqlTimestampHolder2 extends JavaSqlTimestampHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.sql.Timestamp getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaSqlTimestampHolder2 extends JavaSqlTimestampHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.sql.Timestamp getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaSqlTimestampHolder2 extends JavaSqlTimestampHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.sql.Timestamp getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaSqlTimestampHolder2 extends JavaSqlTimestampHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.sql.Timestamp getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder3.java
index e919f8c..73bf1eb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder3.java
@@ -33,7 +33,7 @@ public interface JavaSqlTimestampHolder3 extends JavaSqlTimestampHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default java.sql.Timestamp getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JavaSqlTimestampHolder3 extends JavaSqlTimestampHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default java.sql.Timestamp getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JavaSqlTimestampHolder3 extends JavaSqlTimestampHolder2 {
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default java.sql.Timestamp getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_mixinProperty.java
index d7e100b..0b4491e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/holder/JavaSqlTimestampHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaSqlTimestampHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java
index 8606c89..3932d6a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/jdo/JavaSqlTimestampJdo.java
@@ -53,25 +53,25 @@ public class JavaSqlTimestampJdo // <.>
//tag::class[]
@Title(prepend = "java.sql.Timestamp JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.sql.Timestamp readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.sql.Timestamp readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.sql.Timestamp readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.sql.Timestamp readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java
index a8f89af..6e17e1f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java
@@ -59,27 +59,27 @@ public class JavaSqlTimestampVm
//tag::class[]
@Title(prepend = "java.sql.Timestamp view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JavaSqlJaxbAdapters.TimestampToStringAdapter.class) // <.>
@Getter @Setter
private java.sql.Timestamp readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JavaSqlJaxbAdapters.TimestampToStringAdapter.class)
@Getter @Setter
private java.sql.Timestamp readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JavaSqlJaxbAdapters.TimestampToStringAdapter.class)
@Getter @Setter
private java.sql.Timestamp readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@XmlJavaTypeAdapter(JavaSqlJaxbAdapters.TimestampToStringAdapter.class)
@Getter @Setter
private java.sql.Timestamp readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder2.java
index b00d6d6..da3272a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder2.java
@@ -32,7 +32,7 @@ public interface JavaTimeLocalDateHolder2 extends JavaTimeLocalDateHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.time.LocalDate getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaTimeLocalDateHolder2 extends JavaTimeLocalDateHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.time.LocalDate getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaTimeLocalDateHolder2 extends JavaTimeLocalDateHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.time.LocalDate getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaTimeLocalDateHolder2 extends JavaTimeLocalDateHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.time.LocalDate getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder3.java
index c767175..a7cab09 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder3.java
@@ -33,7 +33,7 @@ public interface JavaTimeLocalDateHolder3 extends JavaTimeLocalDateHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default java.time.LocalDate getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JavaTimeLocalDateHolder3 extends JavaTimeLocalDateHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default java.time.LocalDate getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JavaTimeLocalDateHolder3 extends JavaTimeLocalDateHolder2 {
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default java.time.LocalDate getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_mixinProperty.java
index 1a250ee..2858b94 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/holder/JavaTimeLocalDateHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaTimeLocalDateHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo.java
index a39e615..9c7fb62 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/jdo/JavaTimeLocalDateJdo.java
@@ -53,25 +53,25 @@ public class JavaTimeLocalDateJdo // <.
//tag::class[]
@Title(prepend = "java.time.LocalDate JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.time.LocalDate readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.time.LocalDate readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.time.LocalDate readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.time.LocalDate readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.java
index 714c733..da9b1a8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.java
@@ -59,27 +59,27 @@ public class JavaTimeLocalDateVm
//tag::class[]
@Title(prepend = "java.time.LocalDate view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class) // <.>
@Getter @Setter
private java.time.LocalDate readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
private java.time.LocalDate readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
private java.time.LocalDate readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
private java.time.LocalDate readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder2.java
index cd13c90..e71d0b5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder2.java
@@ -32,7 +32,7 @@ public interface JavaTimeLocalDateTimeHolder2 extends JavaTimeLocalDateTimeHolde
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.time.LocalDateTime getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaTimeLocalDateTimeHolder2 extends JavaTimeLocalDateTimeHolde
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.time.LocalDateTime getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaTimeLocalDateTimeHolder2 extends JavaTimeLocalDateTimeHolde
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.time.LocalDateTime getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaTimeLocalDateTimeHolder2 extends JavaTimeLocalDateTimeHolde
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.time.LocalDateTime getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder3.java
index d7a3fdd..28ba4d9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder3.java
@@ -33,7 +33,7 @@ public interface JavaTimeLocalDateTimeHolder3 extends JavaTimeLocalDateTimeHolde
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default java.time.LocalDateTime getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JavaTimeLocalDateTimeHolder3 extends JavaTimeLocalDateTimeHolde
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default java.time.LocalDateTime getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JavaTimeLocalDateTimeHolder3 extends JavaTimeLocalDateTimeHolde
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default java.time.LocalDateTime getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_mixinProperty.java
index dd60757..fdb5d15 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/holder/JavaTimeLocalDateTimeHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaTimeLocalDateTimeHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo.java
index 5e26e8f..a395414 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/jdo/JavaTimeLocalDateTimeJdo.java
@@ -53,25 +53,25 @@ public class JavaTimeLocalDateTimeJdo /
//tag::class[]
@Title(prepend = "java.time.LocalDateTime JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.time.LocalDateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.time.LocalDateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.time.LocalDateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.time.LocalDateTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.java
index daa1721..7996e7e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.java
@@ -59,27 +59,27 @@ public class JavaTimeLocalDateTimeVm
//tag::class[]
@Title(prepend = "java.time.LocalDateTime view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class) // <.>
@Getter @Setter
private java.time.LocalDateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class)
@Getter @Setter
private java.time.LocalDateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class)
@Getter @Setter
private java.time.LocalDateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class)
@Getter @Setter
private java.time.LocalDateTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder2.java
index 87a44ab..c376ef2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder2.java
@@ -32,7 +32,7 @@ public interface JavaTimeOffsetDateTimeHolder2 extends JavaTimeOffsetDateTimeHol
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.time.OffsetDateTime getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaTimeOffsetDateTimeHolder2 extends JavaTimeOffsetDateTimeHol
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.time.OffsetDateTime getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaTimeOffsetDateTimeHolder2 extends JavaTimeOffsetDateTimeHol
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.time.OffsetDateTime getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaTimeOffsetDateTimeHolder2 extends JavaTimeOffsetDateTimeHol
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.time.OffsetDateTime getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder3.java
index 3b49d3c..ce04555 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder3.java
@@ -33,7 +33,7 @@ public interface JavaTimeOffsetDateTimeHolder3 extends JavaTimeOffsetDateTimeHol
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default java.time.OffsetDateTime getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JavaTimeOffsetDateTimeHolder3 extends JavaTimeOffsetDateTimeHol
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default java.time.OffsetDateTime getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JavaTimeOffsetDateTimeHolder3 extends JavaTimeOffsetDateTimeHol
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default java.time.OffsetDateTime getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_mixinProperty.java
index 0874797..88e135b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/holder/JavaTimeOffsetDateTimeHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaTimeOffsetDateTimeHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo.java
index a41c4b5..288ea05 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/jdo/JavaTimeOffsetDateTimeJdo.java
@@ -53,25 +53,25 @@ public class JavaTimeOffsetDateTimeJdo
//tag::class[]
@Title(prepend = "java.time.OffsetDateTime JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.time.OffsetDateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.time.OffsetDateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.time.OffsetDateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.time.OffsetDateTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.java
index 24e0149..3cd61d2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.java
@@ -59,27 +59,27 @@ public class JavaTimeOffsetDateTimeVm
//tag::class[]
@Title(prepend = "java.time.OffsetDateTime view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.OffsetDateTimeToStringAdapter.class) // <.>
@Getter @Setter
private java.time.OffsetDateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.OffsetDateTimeToStringAdapter.class)
@Getter @Setter
private java.time.OffsetDateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.OffsetDateTimeToStringAdapter.class)
@Getter @Setter
private java.time.OffsetDateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.OffsetDateTimeToStringAdapter.class)
@Getter @Setter
private java.time.OffsetDateTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder2.java
index 9a07e27..eeb6d63 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder2.java
@@ -32,7 +32,7 @@ public interface JavaTimeOffsetTimeHolder2 extends JavaTimeOffsetTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.time.OffsetTime getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaTimeOffsetTimeHolder2 extends JavaTimeOffsetTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.time.OffsetTime getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaTimeOffsetTimeHolder2 extends JavaTimeOffsetTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.time.OffsetTime getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaTimeOffsetTimeHolder2 extends JavaTimeOffsetTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.time.OffsetTime getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder3.java
index 6c92f0a..4c9efb0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder3.java
@@ -33,7 +33,7 @@ public interface JavaTimeOffsetTimeHolder3 extends JavaTimeOffsetTimeHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default java.time.OffsetTime getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JavaTimeOffsetTimeHolder3 extends JavaTimeOffsetTimeHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default java.time.OffsetTime getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JavaTimeOffsetTimeHolder3 extends JavaTimeOffsetTimeHolder2 {
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default java.time.OffsetTime getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_mixinProperty.java
index ee81bab..f877f5f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/holder/JavaTimeOffsetTimeHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaTimeOffsetTimeHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo.java
index e5609d8..cc4c138 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/jdo/JavaTimeOffsetTimeJdo.java
@@ -53,25 +53,25 @@ public class JavaTimeOffsetTimeJdo // <
//tag::class[]
@Title(prepend = "java.time.OffsetTime JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.time.OffsetTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.time.OffsetTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.time.OffsetTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.time.OffsetTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.java
index 358ae61..f422156 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.java
@@ -59,27 +59,27 @@ public class JavaTimeOffsetTimeVm
//tag::class[]
@Title(prepend = "java.time.OffsetTime view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.OffsetTimeAdapter.class) // <.>
@Getter @Setter
private java.time.OffsetTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.OffsetTimeAdapter.class)
@Getter @Setter
private java.time.OffsetTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.OffsetTimeAdapter.class)
@Getter @Setter
private java.time.OffsetTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.OffsetTimeAdapter.class)
@Getter @Setter
private java.time.OffsetTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder2.java
index d317538..2208c45 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder2.java
@@ -32,7 +32,7 @@ public interface JavaTimeZonedDateTimeHolder2 extends demoapp.dom.types.javatime
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.time.ZonedDateTime getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaTimeZonedDateTimeHolder2 extends demoapp.dom.types.javatime
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.time.ZonedDateTime getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaTimeZonedDateTimeHolder2 extends demoapp.dom.types.javatime
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.time.ZonedDateTime getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaTimeZonedDateTimeHolder2 extends demoapp.dom.types.javatime
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.time.ZonedDateTime getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder3.java
index d814723..ff5df49 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder3.java
@@ -33,7 +33,7 @@ public interface JavaTimeZonedDateTimeHolder3 extends JavaTimeZonedDateTimeHolde
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default java.time.ZonedDateTime getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JavaTimeZonedDateTimeHolder3 extends JavaTimeZonedDateTimeHolde
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default java.time.ZonedDateTime getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JavaTimeZonedDateTimeHolder3 extends JavaTimeZonedDateTimeHolde
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default java.time.ZonedDateTime getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_mixinProperty.java
index 71d41af..5068f70 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/holder/JavaTimeZonedDateTimeHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaTimeZonedDateTimeHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo.java
index 18f54d5..4f3c49d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/jdo/JavaTimeZonedDateTimeJdo.java
@@ -53,25 +53,25 @@ public class JavaTimeZonedDateTimeJdo /
//tag::class[]
@Title(prepend = "java.time.ZonedDateTime JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.time.ZonedDateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.time.ZonedDateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.time.ZonedDateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.time.ZonedDateTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.java
index 2097353..9965f9d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.java
@@ -59,27 +59,27 @@ public class JavaTimeZonedDateTimeVm
//tag::class[]
@Title(prepend = "java.time.ZonedDateTime view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.ZonedDateTimeAdapter.class) // <.>
@Getter @Setter
private java.time.ZonedDateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.ZonedDateTimeAdapter.class)
@Getter @Setter
private java.time.ZonedDateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.ZonedDateTimeAdapter.class)
@Getter @Setter
private java.time.ZonedDateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@XmlJavaTypeAdapter(JavaTimeJaxbAdapters.ZonedDateTimeAdapter.class)
@Getter @Setter
private java.time.ZonedDateTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder2.java
index 85a761a..ba545b9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder2.java
@@ -32,7 +32,7 @@ public interface JavaUtilDateHolder2 extends JavaUtilDateHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.util.Date getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaUtilDateHolder2 extends JavaUtilDateHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.util.Date getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaUtilDateHolder2 extends JavaUtilDateHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.util.Date getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaUtilDateHolder2 extends JavaUtilDateHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.util.Date getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder3.java
index 6811334..f26457a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder3.java
@@ -33,7 +33,7 @@ public interface JavaUtilDateHolder3 extends JavaUtilDateHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default java.util.Date getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JavaUtilDateHolder3 extends JavaUtilDateHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default java.util.Date getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JavaUtilDateHolder3 extends JavaUtilDateHolder2 {
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default java.util.Date getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_mixinProperty.java
index 46e5381..52a49a3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/holder/JavaUtilDateHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaUtilDateHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo.java
index 58a4e5d..5b9dcf0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/jdo/JavaUtilDateJdo.java
@@ -53,25 +53,25 @@ public class JavaUtilDateJdo // <.>
//tag::class[]
@Title(prepend = "java.util.Date JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.util.Date readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.util.Date readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.util.Date readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.util.Date readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.java
index 0ba96b3..5998bfa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/vm/JavaUtilDateVm.java
@@ -59,27 +59,27 @@ public class JavaUtilDateVm
//tag::class[]
@Title(prepend = "java.util.Date view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JavaUtilJaxbAdapters.DateToStringAdapter.class) // <.>
@Getter @Setter
private java.util.Date readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JavaUtilJaxbAdapters.DateToStringAdapter.class)
@Getter @Setter
private java.util.Date readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JavaUtilJaxbAdapters.DateToStringAdapter.class)
@Getter @Setter
private java.util.Date readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@XmlJavaTypeAdapter(JavaUtilJaxbAdapters.DateToStringAdapter.class)
@Getter @Setter
private java.util.Date readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java
index c0799a9..61ad5e1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java
@@ -32,7 +32,7 @@ public interface JavaUtilUuidHolder2 extends JavaUtilUuidHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default java.util.UUID getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JavaUtilUuidHolder2 extends JavaUtilUuidHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default java.util.UUID getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JavaUtilUuidHolder2 extends JavaUtilUuidHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default java.util.UUID getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JavaUtilUuidHolder2 extends JavaUtilUuidHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default java.util.UUID getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_mixinProperty.java
index f430107..4ae1b46 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JavaUtilUuidHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo.java
index ed1f65c..f80ffd8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/jdo/JavaUtilUuidJdo.java
@@ -53,25 +53,25 @@ public class JavaUtilUuidJdo // <.>
//tag::class[]
@Title(prepend = "java.util.UUID JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private java.util.UUID readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private java.util.UUID readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private java.util.UUID readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private java.util.UUID readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java
index fd615b5..a8f6681 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java
@@ -57,24 +57,24 @@ public class JavaUtilUuidVm
//tag::class[]
@Title(prepend = "java.util.UUID view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
private java.util.UUID readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
private java.util.UUID readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
private java.util.UUID readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
private java.util.UUID readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder2.java
index 8f0301a..7a779e5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder2.java
@@ -32,7 +32,7 @@ public interface JodaDateTimeHolder2 extends JodaDateTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default org.joda.time.DateTime getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JodaDateTimeHolder2 extends JodaDateTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default org.joda.time.DateTime getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JodaDateTimeHolder2 extends JodaDateTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default org.joda.time.DateTime getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JodaDateTimeHolder2 extends JodaDateTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default org.joda.time.DateTime getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder3.java
index d8d3b25..1550ad5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder3.java
@@ -33,7 +33,7 @@ public interface JodaDateTimeHolder3 extends JodaDateTimeHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default org.joda.time.DateTime getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JodaDateTimeHolder3 extends JodaDateTimeHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default org.joda.time.DateTime getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JodaDateTimeHolder3 extends JodaDateTimeHolder2 {
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default org.joda.time.DateTime getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_mixinProperty.java
index c68dc24..fd100a5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/holder/JodaDateTimeHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JodaDateTimeHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo.java
index 10dde70..f810abb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/jdo/JodaDateTimeJdo.java
@@ -53,25 +53,25 @@ public class JodaDateTimeJdo // <.>
//tag::class[]
@Title(prepend = "org.joda.time.DateTime JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private org.joda.time.DateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private org.joda.time.DateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private org.joda.time.DateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private org.joda.time.DateTime readWriteOptionalProperty;
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 b77b4e9..a5c10be 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
@@ -59,27 +59,27 @@ public class JodaDateTimeVm
//tag::class[]
@Title(prepend = "org.joda.time.DateTime view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.DateTimeToStringAdapter.class) // <.>
@Getter @Setter
private org.joda.time.DateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.DateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.DateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.DateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.DateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@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/holder/JodaLocalDateHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder2.java
index 235b364..86268a9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder2.java
@@ -32,7 +32,7 @@ public interface JodaLocalDateHolder2 extends JodaLocalDateHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default org.joda.time.LocalDate getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JodaLocalDateHolder2 extends JodaLocalDateHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default org.joda.time.LocalDate getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JodaLocalDateHolder2 extends JodaLocalDateHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default org.joda.time.LocalDate getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JodaLocalDateHolder2 extends JodaLocalDateHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default org.joda.time.LocalDate getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder3.java
index ac1b2d8..2e075c2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder3.java
@@ -33,7 +33,7 @@ public interface JodaLocalDateHolder3 extends JodaLocalDateHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default org.joda.time.LocalDate getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JodaLocalDateHolder3 extends JodaLocalDateHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default org.joda.time.LocalDate getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JodaLocalDateHolder3 extends JodaLocalDateHolder2 {
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default org.joda.time.LocalDate getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_mixinProperty.java
index 258680a..d232c69 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/holder/JodaLocalDateHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JodaLocalDateHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo.java
index 19282bd..d35080d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/jdo/JodaLocalDateJdo.java
@@ -53,25 +53,25 @@ public class JodaLocalDateJdo // <.>
//tag::class[]
@Title(prepend = "org.joda.time.LocalDate JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private org.joda.time.LocalDate readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private org.joda.time.LocalDate readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private org.joda.time.LocalDate readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private org.joda.time.LocalDate 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 c24e523..b225aaa 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
@@ -59,27 +59,27 @@ public class JodaLocalDateVm
//tag::class[]
@Title(prepend = "org.joda.time.LocalDate view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class) // <.>
@Getter @Setter
private org.joda.time.LocalDate readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDate readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDate readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@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/holder/JodaLocalDateTimeHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder2.java
index ea83511..33d38ff 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder2.java
@@ -32,7 +32,7 @@ public interface JodaLocalDateTimeHolder2 extends JodaLocalDateTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default org.joda.time.LocalDateTime getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface JodaLocalDateTimeHolder2 extends JodaLocalDateTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default org.joda.time.LocalDateTime getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface JodaLocalDateTimeHolder2 extends JodaLocalDateTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default org.joda.time.LocalDateTime getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface JodaLocalDateTimeHolder2 extends JodaLocalDateTimeHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default org.joda.time.LocalDateTime getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder3.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder3.java
index 290e5b0..2e6b81b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder3.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder3.java
@@ -33,7 +33,7 @@ public interface JodaLocalDateTimeHolder3 extends JodaLocalDateTimeHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY_BEFORE)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "1") // <.>
+ fieldSetId = "render-day", sequence = "1") // <.>
default org.joda.time.LocalDateTime getReadOnlyPropertyDerivedRenderDayAsDayBefore() {
return getReadOnlyProperty();
}
@@ -44,7 +44,7 @@ public interface JodaLocalDateTimeHolder3 extends JodaLocalDateTimeHolder2 {
describedAs = "@PropertyLayout(renderDay=AS_DAY)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "2")
+ fieldSetId = "render-day", sequence = "2")
default org.joda.time.LocalDateTime getReadOnlyPropertyDerivedRenderDayAsDay() {
return getReadOnlyProperty();
}
@@ -55,7 +55,7 @@ public interface JodaLocalDateTimeHolder3 extends JodaLocalDateTimeHolder2 {
describedAs = "@PropertyLayout(renderDay=NOT_SPECIFIED)",
labelPosition = LabelPosition.TOP,
hidden = Where.ALL_TABLES,
- fieldSet = "render-day", sequence = "3")
+ fieldSetId = "render-day", sequence = "3")
default org.joda.time.LocalDateTime getReadOnlyPropertyDerivedRenderDayNotSpecified() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_mixinProperty.java
index 9726f58..210c4c1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/holder/JodaLocalDateTimeHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class JodaLocalDateTimeHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo.java
index 870fa92..9edcf30 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/jdo/JodaLocalDateTimeJdo.java
@@ -53,25 +53,25 @@ public class JodaLocalDateTimeJdo // <.
//tag::class[]
@Title(prepend = "org.joda.time.LocalDateTime JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Column(allowsNull = "false") // <.>
@Getter @Setter
private org.joda.time.LocalDateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Column(allowsNull = "false")
@Getter @Setter
private org.joda.time.LocalDateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Column(allowsNull = "true") // <.>
@Getter @Setter
private org.joda.time.LocalDateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
private org.joda.time.LocalDateTime 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 99812ee..206dae1 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
@@ -59,27 +59,27 @@ public class JodaLocalDateTimeVm
//tag::class[]
@Title(prepend = "org.joda.time.LocalDateTime view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class) // <.>
@Getter @Setter
private org.joda.time.LocalDateTime readOnlyProperty;
@Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDateTime readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(fieldSet = "optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDateTime readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(fieldSet = "optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@XmlJavaTypeAdapter(JodaTimeJaxbAdapters.LocalDateTimeToStringAdapter.class)
@Getter @Setter
private org.joda.time.LocalDateTime readWriteOptionalProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder.java
index ffa3284..ab57087 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder.java
@@ -26,14 +26,14 @@ public interface PrimitiveBooleanHolder {
//end::class[]
@Property
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1") // TODO: doesn't seem to get picked up
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1") // TODO: doesn't seem to get picked up
//tag::class[]
boolean isReadOnlyProperty();
void setReadOnlyProperty(boolean c);
//end::class[]
@Property
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1") // TODO: doesn't seem to get picked up
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1") // TODO: doesn't seem to get picked up
//tag::class[]
boolean isReadWriteProperty();
void setReadWriteProperty(boolean c);
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder2.java
index 5993411..b0e3aa1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder2.java
@@ -32,7 +32,7 @@ public interface PrimitiveBooleanHolder2 extends PrimitiveBooleanHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default boolean isReadOnlyPropertyDerivedLabelPositionLeft() {
return isReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface PrimitiveBooleanHolder2 extends PrimitiveBooleanHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default boolean isReadOnlyPropertyDerivedLabelPositionTop() {
return isReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface PrimitiveBooleanHolder2 extends PrimitiveBooleanHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default boolean isReadOnlyPropertyDerivedLabelPositionRight() {
return isReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface PrimitiveBooleanHolder2 extends PrimitiveBooleanHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default boolean isReadOnlyPropertyDerivedLabelPositionNone() {
return isReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder_mixinProperty.java
index aaec42b..a52e029 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/holder/PrimitiveBooleanHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class PrimitiveBooleanHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jdo/PrimitiveBooleanJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jdo/PrimitiveBooleanJdo.java
index e486d69..c0d1e96 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jdo/PrimitiveBooleanJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/jdo/PrimitiveBooleanJdo.java
@@ -51,12 +51,12 @@ public class PrimitiveBooleanJdo // <.>
//tag::class[]
@Title(prepend = "boolean (primitive) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private boolean readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private boolean readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/vm/PrimitiveBooleanVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/vm/PrimitiveBooleanVm.java
index 5da3171..363b494 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/vm/PrimitiveBooleanVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/vm/PrimitiveBooleanVm.java
@@ -55,12 +55,12 @@ public class PrimitiveBooleanVm
//tag::class[]
@Title(prepend = "boolean (primitive) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private boolean readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private boolean readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder2.java
index 0f4503d..6c98077 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder2.java
@@ -32,7 +32,7 @@ public interface PrimitiveByteHolder2 extends PrimitiveByteHolder{
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default byte getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface PrimitiveByteHolder2 extends PrimitiveByteHolder{
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default byte getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface PrimitiveByteHolder2 extends PrimitiveByteHolder{
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default byte getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface PrimitiveByteHolder2 extends PrimitiveByteHolder{
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default byte getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder_mixinProperty.java
index ad27fe3..bd47dc5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/holder/PrimitiveByteHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class PrimitiveByteHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdo.java
index a66ddc4..7d4c9d3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdo.java
@@ -51,12 +51,12 @@ public class PrimitiveByteJdo // <.>
//tag::class[]
@Title(prepend = "byte (primitive) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private byte readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private byte readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteVm.java
index 4862840..59397d6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteVm.java
@@ -55,12 +55,12 @@ public class PrimitiveByteVm
//tag::class[]
@Title(prepend = "byte (primitive) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private byte readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private byte readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder2.java
index 13a562e..dbf779d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder2.java
@@ -32,7 +32,7 @@ public interface PrimitiveCharHolder2 extends PrimitiveCharHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default char getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface PrimitiveCharHolder2 extends PrimitiveCharHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default char getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface PrimitiveCharHolder2 extends PrimitiveCharHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default char getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface PrimitiveCharHolder2 extends PrimitiveCharHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default char getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_mixinProperty.java
index 262e115..ac59db9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/holder/PrimitiveCharHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class PrimitiveCharHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo.java
index da6aadb..146e175 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdo.java
@@ -51,12 +51,12 @@ public class PrimitiveCharJdo // <.>
//tag::class[]
@Title(prepend = "char (primitive) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private char readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private char readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.java
index 3c1d4ec..35bce5b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.java
@@ -55,12 +55,12 @@ public class PrimitiveCharVm
//tag::class[]
@Title(prepend = "char (primitive) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private char readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private char readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder2.java
index 628ee70..7a17998 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder2.java
@@ -32,7 +32,7 @@ public interface PrimitiveDoubleHolder2 extends PrimitiveDoubleHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default double getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface PrimitiveDoubleHolder2 extends PrimitiveDoubleHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default double getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface PrimitiveDoubleHolder2 extends PrimitiveDoubleHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default double getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface PrimitiveDoubleHolder2 extends PrimitiveDoubleHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default double getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder_mixinProperty.java
index 8b2db0e..31279db 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/holder/PrimitiveDoubleHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class PrimitiveDoubleHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jdo/PrimitiveDoubleJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jdo/PrimitiveDoubleJdo.java
index 8d7a3a7..62b50f9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jdo/PrimitiveDoubleJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/jdo/PrimitiveDoubleJdo.java
@@ -51,12 +51,12 @@ public class PrimitiveDoubleJdo // <.>
//tag::class[]
@Title(prepend = "double (primitive) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private double readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private double readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/vm/PrimitiveDoubleVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/vm/PrimitiveDoubleVm.java
index a1ff564..43fa723 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/vm/PrimitiveDoubleVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/vm/PrimitiveDoubleVm.java
@@ -55,12 +55,12 @@ public class PrimitiveDoubleVm
//tag::class[]
@Title(prepend = "double (primitive) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private double readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private double readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder2.java
index 96ddaa0..ec331d8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder2.java
@@ -32,7 +32,7 @@ public interface PrimitiveFloatHolder2 extends PrimitiveFloatHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default float getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface PrimitiveFloatHolder2 extends PrimitiveFloatHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default float getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface PrimitiveFloatHolder2 extends PrimitiveFloatHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default float getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface PrimitiveFloatHolder2 extends PrimitiveFloatHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default float getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder_mixinProperty.java
index c7d476f..610cd4b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/holder/PrimitiveFloatHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class PrimitiveFloatHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jdo/PrimitiveFloatJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jdo/PrimitiveFloatJdo.java
index 1a533a0..7f19af3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jdo/PrimitiveFloatJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/jdo/PrimitiveFloatJdo.java
@@ -51,12 +51,12 @@ public class PrimitiveFloatJdo // <.>
//tag::class[]
@Title(prepend = "float (primitive) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private float readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private float readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/vm/PrimitiveFloatVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/vm/PrimitiveFloatVm.java
index 3382312..737d86b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/vm/PrimitiveFloatVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/vm/PrimitiveFloatVm.java
@@ -55,12 +55,12 @@ public class PrimitiveFloatVm
//tag::class[]
@Title(prepend = "float (primitive) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private float readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private float readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder2.java
index d9190f8..e5beb20 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder2.java
@@ -32,7 +32,7 @@ public interface PrimitiveIntHolder2 extends PrimitiveIntHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default int getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface PrimitiveIntHolder2 extends PrimitiveIntHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default int getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface PrimitiveIntHolder2 extends PrimitiveIntHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default int getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface PrimitiveIntHolder2 extends PrimitiveIntHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default int getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder_mixinProperty.java
index f0b0fd6..c8cc53a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/holder/PrimitiveIntHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class PrimitiveIntHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jdo/PrimitiveIntJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jdo/PrimitiveIntJdo.java
index d6d6fde..7706cc5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jdo/PrimitiveIntJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/jdo/PrimitiveIntJdo.java
@@ -51,12 +51,12 @@ public class PrimitiveIntJdo // <.>
//tag::class[]
@Title(prepend = "int (primitive) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private int readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private int readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/vm/PrimitiveIntVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/vm/PrimitiveIntVm.java
index ebdbb58..8404e94 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/vm/PrimitiveIntVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/vm/PrimitiveIntVm.java
@@ -55,12 +55,12 @@ public class PrimitiveIntVm
//tag::class[]
@Title(prepend = "int (primitive) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private int readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private int readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder2.java
index c5c80c4..38a04e8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder2.java
@@ -32,7 +32,7 @@ public interface PrimitiveLongHolder2 extends PrimitiveLongHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default long getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface PrimitiveLongHolder2 extends PrimitiveLongHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default long getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface PrimitiveLongHolder2 extends PrimitiveLongHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default long getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface PrimitiveLongHolder2 extends PrimitiveLongHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default long getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder_mixinProperty.java
index 7b6391e..f83be24 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/holder/PrimitiveLongHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class PrimitiveLongHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jdo/PrimitiveLongJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jdo/PrimitiveLongJdo.java
index 1b56273..ead4556 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jdo/PrimitiveLongJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/jdo/PrimitiveLongJdo.java
@@ -51,12 +51,12 @@ public class PrimitiveLongJdo // <.>
//tag::class[]
@Title(prepend = "long (primitive) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private long readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private long readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/vm/PrimitiveLongVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/vm/PrimitiveLongVm.java
index bc8ae1f..2edc92a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/vm/PrimitiveLongVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/vm/PrimitiveLongVm.java
@@ -55,12 +55,12 @@ public class PrimitiveLongVm
//tag::class[]
@Title(prepend = "long (primitive) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private long readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private long readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder2.java
index e8d91fe..cd6f1da 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder2.java
@@ -32,7 +32,7 @@ public interface PrimitiveShortHolder2 extends PrimitiveShortHolder {
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "1") // <.>
+ fieldSetId = "label-positions", sequence = "1") // <.>
default short getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -43,7 +43,7 @@ public interface PrimitiveShortHolder2 extends PrimitiveShortHolder {
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "2")
+ fieldSetId = "label-positions", sequence = "2")
default short getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -54,7 +54,7 @@ public interface PrimitiveShortHolder2 extends PrimitiveShortHolder {
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "3")
+ fieldSetId = "label-positions", sequence = "3")
default short getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -65,7 +65,7 @@ public interface PrimitiveShortHolder2 extends PrimitiveShortHolder {
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSet = "label-positions", sequence = "4")
+ fieldSetId = "label-positions", sequence = "4")
default short getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder_mixinProperty.java
index c198e13..50ef8f3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/holder/PrimitiveShortHolder_mixinProperty.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
//tag::class[]
@Property()
-@PropertyLayout(hidden = Where.ALL_TABLES, fieldSet = "contributed", sequence = "1")
+@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed", sequence = "1")
@RequiredArgsConstructor
public class PrimitiveShortHolder_mixinProperty {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jdo/PrimitiveShortJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jdo/PrimitiveShortJdo.java
index e77d75b..b91962a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jdo/PrimitiveShortJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/jdo/PrimitiveShortJdo.java
@@ -51,12 +51,12 @@ public class PrimitiveShortJdo // <.>
//tag::class[]
@Title(prepend = "short (primitive) JDO entity: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private short readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private short readWriteProperty;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/vm/PrimitiveShortVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/vm/PrimitiveShortVm.java
index 8e1f022..a3d5ea7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/vm/PrimitiveShortVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/vm/PrimitiveShortVm.java
@@ -55,12 +55,12 @@ public class PrimitiveShortVm
//tag::class[]
@Title(prepend = "short (primitive) view model: ")
- @PropertyLayout(fieldSet = "read-only-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@Getter @Setter
private short readOnlyProperty; // <.>
@Property(editing = Editing.ENABLED)
- @PropertyLayout(fieldSet = "editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@Getter @Setter
private short readWriteProperty;
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
index 03da072..823ae5c 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
@@ -130,7 +130,7 @@ public interface ApplicationPermission {
@Property
@PropertyLayout(
hidden=Where.REFERENCES_PARENT,
- fieldSet="Role",
+ fieldSetId="Role",
sequence = "1")
default ApplicationRole getRole() {
throw _Exceptions.unsupportedOperation("please implement me");
@@ -140,7 +140,7 @@ public interface ApplicationPermission {
// -- RULE
@Property
- @PropertyLayout(fieldSet="Permissions", sequence = "2")
+ @PropertyLayout(fieldSetId="Permissions", sequence = "2")
default ApplicationPermissionRule getRule() {
throw _Exceptions.unsupportedOperation("please implement me");
}
@@ -149,7 +149,7 @@ public interface ApplicationPermission {
// -- MODE
@Property
- @PropertyLayout(fieldSet="Permissions", sequence = "3")
+ @PropertyLayout(fieldSetId="Permissions", sequence = "3")
default ApplicationPermissionMode getMode() {
throw _Exceptions.unsupportedOperation("please implement me");
}
@@ -158,7 +158,7 @@ public interface ApplicationPermission {
// -- SORT
@Property
- @PropertyLayout(fieldSet="Feature", sequence = "5")
+ @PropertyLayout(fieldSetId="Feature", sequence = "5")
default String getSort() {
throw _Exceptions.unsupportedOperation("please implement me");
}
@@ -166,7 +166,7 @@ public interface ApplicationPermission {
// -- FQN
@Property
- @PropertyLayout(fieldSet="Feature", sequence = "5.1")
+ @PropertyLayout(fieldSetId="Feature", sequence = "5.1")
default String getFeatureFqn() {
throw _Exceptions.unsupportedOperation("please implement me");
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java
index cb7e816..b327a1f 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java
@@ -182,7 +182,7 @@ public abstract class ApplicationFeatureViewModel implements ViewModel {
)
@PropertyLayout(
typicalLength=ApplicationFeatureConstants.TYPICAL_LENGTH_NAMESPACE,
- fieldSet="Id",
+ fieldSetId="Id",
sequence = "2.2")
public String getNamespaceName() {
return getFeatureId().getNamespace();
@@ -201,7 +201,7 @@ public abstract class ApplicationFeatureViewModel implements ViewModel {
)
@PropertyLayout(
typicalLength=ApplicationFeatureConstants.TYPICAL_LENGTH_TYPE_SIMPLE_NAME,
- fieldSet="Id",
+ fieldSetId="Id",
sequence = "2.3")
public String getTypeSimpleName() {
return getFeatureId().getTypeSimpleName();
@@ -222,7 +222,7 @@ public abstract class ApplicationFeatureViewModel implements ViewModel {
)
@PropertyLayout(
typicalLength=ApplicationFeatureConstants.TYPICAL_LENGTH_MEMBER_NAME,
- fieldSet="Id",
+ fieldSetId="Id",
sequence = "2.4")
public String getMemberName() {
return getFeatureId().getMemberName();
@@ -243,7 +243,7 @@ public abstract class ApplicationFeatureViewModel implements ViewModel {
@PropertyLayout(
navigable = Navigable.PARENT,
hidden = Where.ALL_TABLES,
- fieldSet = "Parent",
+ fieldSetId = "Parent",
sequence = "2.6")
public ApplicationFeatureViewModel getParent() {
final ApplicationFeatureId parentId;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeAction.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeAction.java
index 8f11550..9bc195f 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeAction.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeAction.java
@@ -54,7 +54,7 @@ public class ApplicationTypeAction extends ApplicationTypeMember {
@Property(
domainEvent = ReturnTypeDomainEvent.class
)
- @PropertyLayout(fieldSet="Data Type", sequence = "2.6")
+ @PropertyLayout(fieldSetId="Data Type", sequence = "2.6")
public String getReturnType() {
return getFeature().getActionReturnType()
.map(Class::getSimpleName)
@@ -67,7 +67,7 @@ public class ApplicationTypeAction extends ApplicationTypeMember {
@Property(
domainEvent = ActionSemanticsDomainEvent.class
)
- @PropertyLayout(fieldSet="Detail", sequence = "2.8")
+ @PropertyLayout(fieldSetId="Detail", sequence = "2.8")
public SemanticsOf getActionSemantics() {
return getFeature().getActionSemantics()
.orElse(null);
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeCollection.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeCollection.java
index b708dc9..9e61bd0 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeCollection.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeCollection.java
@@ -51,7 +51,7 @@ public class ApplicationTypeCollection extends ApplicationTypeMember {
@Property(
domainEvent = ElementTypeDomainEvent.class
)
- @PropertyLayout(fieldSet="Data Type", sequence = "2.6")
+ @PropertyLayout(fieldSetId="Data Type", sequence = "2.6")
public String getElementType() {
return getFeature().getActionReturnType()
.map(Class::getSimpleName)
@@ -65,7 +65,7 @@ public class ApplicationTypeCollection extends ApplicationTypeMember {
@Property(
domainEvent = DerivedDomainEvent.class
)
- @PropertyLayout(fieldSet="Detail", sequence = "2.7")
+ @PropertyLayout(fieldSetId="Detail", sequence = "2.7")
public boolean isDerived() {
return getFeature().isPropertyOrCollectionDerived();
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeMember.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeMember.java
index 29d53f1..a9aa8b8 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeMember.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeMember.java
@@ -58,7 +58,7 @@ public abstract class ApplicationTypeMember extends ApplicationFeatureViewModel
@Property(
domainEvent = MemberNameDomainEvent.class
)
- @PropertyLayout(fieldSet="Id", sequence = "2.4")
+ @PropertyLayout(fieldSetId="Id", sequence = "2.4")
public String getMemberName() {
return super.getMemberName();
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeProperty.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeProperty.java
index 30266bb..c86ebb1 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeProperty.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationTypeProperty.java
@@ -57,7 +57,7 @@ public class ApplicationTypeProperty extends ApplicationTypeMember {
@Property(
domainEvent = ReturnTypeDomainEvent.class
)
- @PropertyLayout(fieldSet="Data Type", sequence = "2.6")
+ @PropertyLayout(fieldSetId="Data Type", sequence = "2.6")
public String getReturnType() {
return getFeature().getActionReturnType()
.map(Class::getSimpleName)
@@ -72,7 +72,7 @@ public class ApplicationTypeProperty extends ApplicationTypeMember {
@Property(
domainEvent = DerivedDomainEvent.class
)
- @PropertyLayout(fieldSet="Detail", sequence = "2.7")
+ @PropertyLayout(fieldSetId="Detail", sequence = "2.7")
public boolean isDerived() {
return getFeature().isPropertyOrCollectionDerived();
}
@@ -86,7 +86,7 @@ public class ApplicationTypeProperty extends ApplicationTypeMember {
domainEvent = MaxLengthDomainEvent.class,
optionality = Optionality.OPTIONAL
)
- @PropertyLayout(fieldSet="Detail", sequence = "2.8")
+ @PropertyLayout(fieldSetId="Detail", sequence = "2.8")
public Integer getMaxLength() {
val maxLen = getFeature().getPropertyMaxLength();
return maxLen.isPresent()
@@ -111,7 +111,7 @@ public class ApplicationTypeProperty extends ApplicationTypeMember {
domainEvent = TypicalLengthDomainEvent.class,
optionality = Optionality.OPTIONAL
)
- @PropertyLayout(fieldSet="Detail", sequence = "2.9")
+ @PropertyLayout(fieldSetId="Detail", sequence = "2.9")
public Integer getTypicalLength() {
val maxLen = getFeature().getPropertyTypicalLength();
return maxLen.isPresent()
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermission_feature.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermission_feature.java
index faa6769..440d891 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermission_feature.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/permission/ApplicationPermission_feature.java
@@ -38,7 +38,7 @@ import lombok.RequiredArgsConstructor;
)
@PropertyLayout(
hidden=Where.REFERENCES_PARENT,
- fieldSet="Feature", sequence = "4"
+ fieldSetId="Feature", sequence = "4"
)
@RequiredArgsConstructor
public class ApplicationPermission_feature {
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java
index d361108..7bc6a28 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java
@@ -247,7 +247,7 @@ public class UserPermissionViewModel implements ViewModel {
@Property(
domainEvent = UserDomainEvent.class
)
- @PropertyLayout(hidden=Where.PARENTED_TABLES, fieldSet = "Permission", sequence = "1")
+ @PropertyLayout(hidden=Where.PARENTED_TABLES, fieldSetId = "Permission", sequence = "1")
public ApplicationUser getUser() {
return applicationUserRepository.findOrCreateUserByUsername(getUsername());
}
@@ -272,7 +272,7 @@ public class UserPermissionViewModel implements ViewModel {
domainEvent = VerbDomainEvent.class
)
@PropertyLayout(typicalLength=UserPermissionViewModel.TYPICAL_LENGTH_VERB,
- fieldSet="Permission", sequence = "2")
+ fieldSetId="Permission", sequence = "2")
public String getVerb() {
return changingGranted
? "Can change"
@@ -290,7 +290,7 @@ public class UserPermissionViewModel implements ViewModel {
domainEvent = FeatureDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(hidden=Where.REFERENCES_PARENT, fieldSet = "Permission",sequence = "4")
+ @PropertyLayout(hidden=Where.REFERENCES_PARENT, fieldSetId = "Permission",sequence = "4")
public ApplicationFeatureViewModel getFeature() {
if(getFeatureId() == null) {
return null;
@@ -323,7 +323,7 @@ public class UserPermissionViewModel implements ViewModel {
domainEvent = ViewingPermissionDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(hidden=Where.REFERENCES_PARENT, fieldSet="Cause", sequence = "2.1")
+ @PropertyLayout(hidden=Where.REFERENCES_PARENT, fieldSetId="Cause", sequence = "2.1")
public ApplicationPermission getViewingPermission() {
if(getViewingPermissionValue() == null) {
return null;
@@ -353,7 +353,7 @@ public class UserPermissionViewModel implements ViewModel {
domainEvent = ChangingPermissionDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(hidden=Where.REFERENCES_PARENT, fieldSet="Cause", sequence = "2.2")
+ @PropertyLayout(hidden=Where.REFERENCES_PARENT, fieldSetId="Cause", sequence = "2.2")
public ApplicationPermission getChangingPermission() {
if(getChangingPermissionValue() == null) {
return null;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
index 43a31c1..3b56664 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
@@ -145,7 +145,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.OBJECT_FORMS,
- fieldSet="Id",
+ fieldSetId="Id",
sequence = "1")
public String getName() {
final StringBuilder buf = new StringBuilder();
@@ -177,7 +177,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.PARENTED_TABLES,
- fieldSet="Id",
+ fieldSetId="Id",
sequence = "1")
@Getter @Setter
private String username;
@@ -195,7 +195,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.ALL_TABLES,
- fieldSet="Name",
+ fieldSetId="Name",
sequence = "2.1")
@Getter @Setter
private String familyName;
@@ -213,7 +213,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.ALL_TABLES,
- fieldSet="Name",
+ fieldSetId="Name",
sequence = "2.2")
@Getter @Setter
private String givenName;
@@ -231,7 +231,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.ALL_TABLES,
- fieldSet="Name",
+ fieldSetId="Name",
sequence = "2.3")
@Getter @Setter
private String knownAs;
@@ -246,7 +246,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = EmailAddressDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="Contact Details", sequence = "3.1")
+ @PropertyLayout(fieldSetId="Contact Details", sequence = "3.1")
@Getter @Setter
private String emailAddress;
@@ -261,7 +261,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = PhoneNumberDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="Contact Details", sequence = "3.2")
+ @PropertyLayout(fieldSetId="Contact Details", sequence = "3.2")
@Getter @Setter
private String phoneNumber;
@@ -277,7 +277,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.PARENTED_TABLES,
- fieldSet="Contact Details",
+ fieldSetId="Contact Details",
sequence = "3.3")
@Getter @Setter
private String faxNumber;
@@ -293,7 +293,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = AtPathDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="atPath", sequence = "3.4")
+ @PropertyLayout(fieldSetId="atPath", sequence = "3.4")
@Getter @Setter
private String atPath;
@@ -307,7 +307,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = AccountTypeDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="Status", sequence = "3")
+ @PropertyLayout(fieldSetId="Status", sequence = "3")
@Getter @Setter
private AccountType accountType;
@@ -322,7 +322,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = StatusDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="Status", sequence = "4")
+ @PropertyLayout(fieldSetId="Status", sequence = "4")
@Getter @Setter
private ApplicationUserStatus status;
@@ -348,7 +348,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = HasPasswordDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="Status", sequence = "4")
+ @PropertyLayout(fieldSetId="Status", sequence = "4")
@Override
public boolean isHasPassword() {
return _Strings.isNotEmpty(getEncryptedPassword());
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
index bed1d27..ca82ce2 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
@@ -149,7 +149,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.OBJECT_FORMS,
- fieldSet="Id",
+ fieldSetId="Id",
sequence = "1")
public String getName() {
final StringBuilder buf = new StringBuilder();
@@ -180,7 +180,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.PARENTED_TABLES,
- fieldSet="Id",
+ fieldSetId="Id",
sequence = "1")
@Getter @Setter
private String username;
@@ -197,7 +197,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.ALL_TABLES,
- fieldSet="Name",
+ fieldSetId="Name",
sequence = "2.1")
@Getter @Setter
private String familyName;
@@ -214,7 +214,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.ALL_TABLES,
- fieldSet="Name",
+ fieldSetId="Name",
sequence = "2.2")
@Getter @Setter
private String givenName;
@@ -232,7 +232,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.ALL_TABLES,
- fieldSet="Name",
+ fieldSetId="Name",
sequence = "2.3")
@Getter @Setter
private String knownAs;
@@ -247,7 +247,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = EmailAddressDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="Contact Details", sequence = "3.1")
+ @PropertyLayout(fieldSetId="Contact Details", sequence = "3.1")
@Getter @Setter
private String emailAddress;
@@ -262,7 +262,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = PhoneNumberDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="Contact Details", sequence = "3.2")
+ @PropertyLayout(fieldSetId="Contact Details", sequence = "3.2")
@Getter @Setter
private String phoneNumber;
@@ -278,7 +278,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@PropertyLayout(
hidden=Where.PARENTED_TABLES,
- fieldSet="Contact Details",
+ fieldSetId="Contact Details",
sequence = "3.3")
@Getter @Setter
private String faxNumber;
@@ -294,7 +294,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = AtPathDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="atPath", sequence = "3.4")
+ @PropertyLayout(fieldSetId="atPath", sequence = "3.4")
@Getter @Setter
private String atPath;
@@ -309,7 +309,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = AccountTypeDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="Status", sequence = "3")
+ @PropertyLayout(fieldSetId="Status", sequence = "3")
@Getter @Setter
private AccountType accountType;
@@ -325,7 +325,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = StatusDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="Status", sequence = "4")
+ @PropertyLayout(fieldSetId="Status", sequence = "4")
@Getter @Setter
private ApplicationUserStatus status;
@@ -351,7 +351,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
domainEvent = HasPasswordDomainEvent.class,
editing = Editing.DISABLED
)
- @PropertyLayout(fieldSet="Status", sequence = "4")
+ @PropertyLayout(fieldSetId="Status", sequence = "4")
@Override
public boolean isHasPassword() {
return _Strings.isNotEmpty(getEncryptedPassword());
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.java
index cd45600..cf4826e 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusIdLong.java
@@ -57,7 +57,7 @@ public class Persistable_datanucleusIdLong {
extends org.apache.isis.applib.IsisModuleApplib.PropertyDomainEvent
<Persistable_datanucleusIdLong, Long> {}
- @PropertyLayout(fieldSet = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "800.1")
+ @PropertyLayout(fieldSetId = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "800.1")
public Long prop() {
final Object objectId = JDOHelper.getObjectId(persistable);
if(objectId instanceof DatastoreId) {
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java
index 4ccf6bc..ec56d7f 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java
@@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
named = "Version",
hidden = Where.ALL_TABLES,
- fieldSet = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME,
+ fieldSetId = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME,
sequence = "800.2"
)
@RequiredArgsConstructor
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java
index 3bc08c4..9b83b34 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java
@@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
named = "Version",
hidden = Where.ALL_TABLES,
- fieldSet = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME,
+ fieldSetId = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME,
sequence = "800.2"
)
@RequiredArgsConstructor