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/09/09 18:29:04 UTC
[isis] branch master updated: ISIS-2774: revert logic that would
allow @Title on title() method
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 49545a4 ISIS-2774: revert logic that would allow @Title on title() method
49545a4 is described below
commit 49545a4b9d843ae7854bfc76f387c3acc842453c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 9 20:28:51 2021 +0200
ISIS-2774: revert logic that would allow @Title on title() method
---
.../main/java/org/apache/isis/applib/annotation/Title.java | 1 -
.../java/org/apache/isis/applib/domain/DomainObjectList.java | 5 ++---
.../services/appfeatui/ApplicationFeatureViewModel.java | 3 +--
.../isis/applib/services/confview/ConfigurationViewmodel.java | 5 ++---
.../org/apache/isis/core/metamodel/inspect/model/MMNode.java | 5 ++---
.../asciidocdesc/HasAsciiDocDescription_description.java | 3 ++-
.../_infra/asciidocdesc/HasAsciiDocDescription_sources.java | 3 ++-
.../demoapp/dom/_infra/resources/MarkdownReaderService.java | 3 ++-
.../java/demoapp/dom/_infra/seed/SeedServiceAbstract.java | 2 +-
.../demoapp/dom/domain/_commands/ExposePersistedCommands.java | 2 +-
.../demoapp/dom/domain/_interactions/InteractionDtoVm.java | 5 ++---
.../actions/Action/associateWith/ActionAssociateWithVm.java | 5 ++---
.../associateWith/child/ActionAssociateWithChildVm.java | 5 ++---
.../child/ActionAssociateWithVm_makeFavorite.java | 3 ++-
.../child/ActionAssociateWithVm_noLongerFavorite.java | 3 ++-
.../child/ActionAssociateWithVm_noLongerFavorites.java | 3 ++-
.../commandPublishing/jdo/ActionCommandPublishingJdo.java | 5 ++---
.../commandPublishing/jpa/ActionCommandPublishingJpa.java | 5 ++---
.../actions/Action/domainEvent/ActionDomainEventVm.java | 5 ++---
.../subscribers/ActionDomainEventVm_controlUpdateText.java | 3 ++-
.../executionPublishing/jdo/ActionExecutionPublishingJdo.java | 5 ++---
.../executionPublishing/jpa/ActionExecutionPublishingJpa.java | 5 ++---
.../dom/domain/actions/Action/hidden/ActionHiddenVm.java | 5 ++---
.../domain/actions/Action/restrictTo/ActionRestrictToVm.java | 5 ++---
.../domain/actions/Action/semantics/ActionSemanticsVm.java | 5 ++---
.../dom/domain/actions/Action/typeOf/ActionTypeOfVm.java | 5 ++---
.../actions/Action/typeOf/child/ActionTypeOfChildVm.java | 5 ++---
.../actions/ActionLayout/position/ActionLayoutPositionVm.java | 5 ++---
.../ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java | 6 ++----
.../domain/actions/progmodel/assoc/AssociatedActionDemo.java | 3 ++-
.../demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java | 5 ++---
.../dom/domain/actions/progmodel/depargs/DemoItem.java | 5 ++---
.../demoapp/dom/domain/actions/progmodel/depargs/Parity.java | 5 ++---
.../Collection/domainEvent/CollectionDomainEventVm.java | 5 ++---
.../domainEvent/CollectionDomainEventVm_addChild.java | 5 +++--
.../domainEvent/child/CollectionDomainEventChildVm.java | 3 ++-
.../subscribers/CollectionDomainEventVm_controlChildren.java | 3 ++-
.../DomainObjectEntityChangePublishingVm.java | 5 ++---
.../viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java | 5 ++---
.../nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java | 2 +-
.../nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.java | 4 ++--
.../dom/domain/objects/other/embedded/EmbeddedTypeVm.java | 5 ++---
.../domain/objects/other/embedded/jdo/ComplexNumberJdo.java | 5 ++---
.../domain/objects/other/embedded/jdo/NumberConstantJdo.java | 5 ++---
.../other/embedded/jdo/NumberConstantJdoRepository.java | 3 ++-
.../domain/objects/other/embedded/jpa/ComplexNumberJpa.java | 5 ++---
.../domain/objects/other/embedded/jpa/NumberConstantJpa.java | 5 ++---
.../other/embedded/jpa/NumberConstantJpaRepository.java | 3 ++-
.../dom/domain/objects/other/mixins/FibonacciNumberVm.java | 5 ++---
.../java/demoapp/dom/domain/objects/other/mixins/MixinVm.java | 5 ++---
.../commandPublishing/jdo/PropertyCommandPublishingJdo.java | 5 ++---
.../commandPublishing/jpa/PropertyCommandPublishingJpa.java | 5 ++---
.../Property/domainEvent/PropertyDomainEventVm.java | 5 ++---
.../subscribers/PropertyDomainEventVm_controlText.java | 3 ++-
.../domain/properties/Property/editing/PropertyEditingVm.java | 5 ++---
.../PropertyExecutionPublishingEnabledMetaAnnotation.java | 2 +-
.../jdo/PropertyExecutionPublishingJdo.java | 5 ++---
.../jpa/PropertyExecutionPublishingJpa.java | 5 ++---
.../properties/Property/fileAccept/PropertyFileAcceptVm.java | 5 ++---
.../domain/properties/Property/hidden/PropertyHiddenVm.java | 5 ++---
.../Property/hidden/child/PropertyHiddenChildVm.java | 5 ++---
.../properties/Property/maxLength/PropertyMaxLengthVm.java | 5 ++---
.../Property/mustSatisfy/PropertyMustSatisfyVm.java | 5 ++---
.../Property/optionality/PropertyOptionalityVm.java | 5 ++---
.../properties/Property/projecting/PropertyProjectingVm.java | 5 ++---
.../Property/regexPattern/PropertyRegexPatternVm.java | 5 ++---
.../properties/Property/snapshot/PropertySnapshotVm.java | 5 ++---
.../Property/snapshot/SnapshotExcludedMetaAnnotation.java | 2 +-
.../Property/snapshot/SnapshotIncludedMetaAnnotation.java | 2 +-
.../PropertyLayout/cssClass/PropertyLayoutCssClassVm.java | 5 ++---
.../describedAs/PropertyLayoutDescribedAsVm.java | 5 ++---
.../PropertyLayout/hidden/PropertyLayoutHiddenVm.java | 5 ++---
.../hidden/child/PropertyLayoutHiddenChildVm.java | 5 ++---
.../labelPosition/PropertyLayoutLabelPositionVm.java | 5 ++---
.../PropertyLayout/multiLine/PropertyLayoutMultiLineVm.java | 5 ++---
.../PropertyLayout/named/PropertyLayoutNamedVm.java | 5 ++---
.../properties/PropertyLayout/navigable/FileNodeType.java | 5 ++---
.../properties/PropertyLayout/navigable/FileNodeVm.java | 4 +---
.../PropertyLayout/renderDay/PropertyLayoutRenderDayVm.java | 5 ++---
.../PropertyLayout/repainting/PropertyLayoutRepaintingVm.java | 5 ++---
.../typicalLength/PropertyLayoutTypicalLengthVm.java | 5 ++---
.../dom/featured/layout/describedAs/DescribedAsVm.java | 5 ++---
.../main/java/demoapp/dom/featured/layout/tabs/TabDemo.java | 5 ++---
.../src/main/java/demoapp/dom/homepage/DemoHomePage.java | 5 ++---
.../src/main/java/demoapp/dom/services/core/ServicesMenu.java | 5 +++--
.../errorreportingservice/ErrorReportingServiceDemoVm.java | 5 ++---
.../services/core/eventbusservice/EventBusServiceDemoVm.java | 5 ++---
.../dom/services/core/eventbusservice/EventLogEntryJdo.java | 5 ++---
.../dom/services/core/eventbusservice/EventLogEntryJpa.java | 5 ++---
.../services/core/messageservice/MessageServiceDemoVm.java | 5 ++---
.../services/core/wrapperFactory/jdo/WrapperFactoryJdo.java | 5 ++---
.../services/core/wrapperFactory/jpa/WrapperFactoryJpa.java | 5 ++---
.../services/core/xmlSnapshotService/XmlSnapshotParentVm.java | 5 ++---
.../core/xmlSnapshotService/child/XmlSnapshotChildVm.java | 3 ++-
.../core/xmlSnapshotService/peer/XmlSnapshotPeerVm.java | 5 +++--
.../xmlSnapshotService/peer/child/XmlSnapshotPeerChildVm.java | 3 ++-
.../demoapp/dom/services/extensions/secman/ExtSecManMenu.java | 2 --
.../services/extensions/secman/apptenancy/AppTenancyVm.java | 5 ++---
.../secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java | 3 ++-
.../extensions/secman/appuser/seed/AppUserSeeding.java | 6 ++++--
.../src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs.java | 5 ++---
.../java/demoapp/dom/types/isis/blobs/jdo/IsisBlobJdo.java | 3 ++-
.../java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java | 6 ++++--
.../main/java/demoapp/dom/types/isis/blobs/vm/IsisBlobVm.java | 5 ++---
.../src/main/java/demoapp/dom/types/isis/clobs/IsisClobs.java | 5 ++---
.../java/demoapp/dom/types/isis/clobs/jdo/IsisClobJdo.java | 3 ++-
.../main/java/demoapp/dom/types/isis/clobs/vm/IsisClobVm.java | 5 +++--
.../types/isis/localresourcepaths/IsisLocalResourcePaths.java | 5 ++---
.../isis/localresourcepaths/jdo/IsisLocalResourcePathJdo.java | 3 ++-
.../isis/localresourcepaths/vm/IsisLocalResourcePathVm.java | 5 +++--
.../main/java/demoapp/dom/types/isis/markups/IsisMarkups.java | 5 ++---
.../demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java | 5 ++---
.../demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java | 5 ++---
.../java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java | 5 ++---
.../java/demoapp/dom/types/isis/passwords/IsisPasswords.java | 5 ++---
.../demoapp/dom/types/isis/passwords/jdo/IsisPasswordJdo.java | 3 ++-
.../demoapp/dom/types/isis/passwords/vm/IsisPasswordVm.java | 5 +++--
.../demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.java | 5 ++---
.../dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo.java | 5 ++---
.../dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java | 5 ++---
.../dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.java | 5 ++---
.../demoapp/dom/types/isisext/cal/IsisCalendarEvents.java | 5 ++---
.../demoapp/dom/types/isisext/markdowns/IsisMarkdowns.java | 5 ++---
.../dom/types/isisext/markdowns/jdo/IsisMarkdownJdo.java | 5 ++---
.../dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java | 5 ++---
.../dom/types/isisext/markdowns/vm/IsisMarkdownVm.java | 5 ++---
.../src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java | 5 ++---
.../dom/types/javaawt/images/JavaAwtBufferedImages.java | 5 ++---
.../dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java | 5 ++---
.../dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java | 5 ++---
.../javaawt/images/samples/JavaAwtBufferedImagesSamples.java | 3 ++-
.../dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java | 5 ++---
.../demoapp/dom/types/javalang/JavaLangWrapperTypesMenu.java | 2 --
.../demoapp/dom/types/javalang/booleans/WrapperBooleans.java | 5 ++---
.../dom/types/javalang/booleans/vm/WrapperBooleanVm.java | 5 +++--
.../java/demoapp/dom/types/javalang/bytes/WrapperBytes.java | 5 ++---
.../demoapp/dom/types/javalang/bytes/vm/WrapperByteVm.java | 5 +++--
.../dom/types/javalang/characters/WrapperCharacters.java | 5 ++---
.../dom/types/javalang/characters/vm/WrapperCharacterVm.java | 5 +++--
.../demoapp/dom/types/javalang/doubles/WrapperDoubles.java | 5 ++---
.../dom/types/javalang/doubles/vm/WrapperDoubleVm.java | 5 +++--
.../java/demoapp/dom/types/javalang/floats/WrapperFloats.java | 5 ++---
.../demoapp/dom/types/javalang/floats/vm/WrapperFloatVm.java | 5 +++--
.../demoapp/dom/types/javalang/integers/WrapperIntegers.java | 5 ++---
.../dom/types/javalang/integers/vm/WrapperIntegerVm.java | 5 +++--
.../java/demoapp/dom/types/javalang/longs/WrapperLongs.java | 5 ++---
.../demoapp/dom/types/javalang/longs/vm/WrapperLongVm.java | 5 +++--
.../java/demoapp/dom/types/javalang/shorts/WrapperShorts.java | 5 ++---
.../demoapp/dom/types/javalang/shorts/vm/WrapperShortVm.java | 5 +++--
.../demoapp/dom/types/javalang/strings/JavaLangStrings.java | 5 ++---
.../types/javalang/strings/samples/JavaLangStringSamples.java | 11 +++++++----
.../dom/types/javalang/strings/vm/JavaLangStringVm.java | 5 +++--
.../java/demoapp/dom/types/javalang/voids/JavaLangVoids.java | 5 ++---
.../java/demoapp/dom/types/javamath/JavaMathTypesMenu.java | 2 --
.../dom/types/javamath/bigdecimals/JavaMathBigDecimals.java | 5 ++---
.../types/javamath/bigdecimals/vm/JavaMathBigDecimalVm.java | 5 +++--
.../dom/types/javamath/bigintegers/JavaMathBigIntegers.java | 5 ++---
.../types/javamath/bigintegers/vm/JavaMathBigIntegerVm.java | 5 +++--
.../main/java/demoapp/dom/types/javanet/JavaNetTypesMenu.java | 2 --
.../main/java/demoapp/dom/types/javanet/urls/JavaNetUrls.java | 5 ++---
.../java/demoapp/dom/types/javanet/urls/vm/JavaNetUrlVm.java | 5 +++--
.../main/java/demoapp/dom/types/javasql/JavaSqlTypesMenu.java | 2 --
.../demoapp/dom/types/javasql/javasqldate/JavaSqlDates.java | 5 ++---
.../dom/types/javasql/javasqldate/vm/JavaSqlDateVm.java | 5 +++--
.../dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.java | 5 ++---
.../types/javasql/javasqltimestamp/vm/JavaSqlTimestampVm.java | 5 +++--
.../types/javatime/javatimelocaldate/JavaTimeLocalDates.java | 5 ++---
.../javatime/javatimelocaldate/vm/JavaTimeLocalDateVm.java | 5 +++--
.../javatimelocaldatetime/JavaTimeLocalDateTimes.java | 5 ++---
.../javatimelocaldatetime/vm/JavaTimeLocalDateTimeVm.java | 5 +++--
.../javatimeoffsetdatetime/JavaTimeOffsetDateTimes.java | 5 ++---
.../javatimeoffsetdatetime/vm/JavaTimeOffsetDateTimeVm.java | 5 +++--
.../javatime/javatimeoffsettime/JavaTimeOffsetTimes.java | 5 ++---
.../javatime/javatimeoffsettime/vm/JavaTimeOffsetTimeVm.java | 5 +++--
.../javatimezoneddatetime/JavaTimeZonedDateTimes.java | 5 ++---
.../javatimezoneddatetime/vm/JavaTimeZonedDateTimeVm.java | 5 +++--
.../java/demoapp/dom/types/javautil/JavaUtilTypesMenu.java | 2 --
.../dom/types/javautil/javautildate/JavaUtilDates.java | 5 ++---
.../dom/types/javautil/javautildate/vm/JavaUtilDateVm.java | 5 +++--
.../java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.java | 5 ++---
.../demoapp/dom/types/javautil/uuids/vm/JavaUtilUuidVm.java | 5 +++--
.../dom/types/jodatime/jodadatetime/JodaDateTimes.java | 5 ++---
.../dom/types/jodatime/jodadatetime/vm/JodaDateTimeVm.java | 5 +++--
.../dom/types/jodatime/jodalocaldate/JodaLocalDates.java | 5 ++---
.../dom/types/jodatime/jodalocaldate/vm/JodaLocalDateVm.java | 5 +++--
.../types/jodatime/jodalocaldatetime/JodaLocalDateTimes.java | 5 ++---
.../jodatime/jodalocaldatetime/vm/JodaLocalDateTimeVm.java | 5 +++--
.../dom/types/jodatime/jodalocaltime/JodaLocalTimes.java | 5 ++---
.../dom/types/jodatime/jodalocaltime/vm/JodaLocalTimeVm.java | 5 +++--
.../dom/types/primitive/booleans/PrimitiveBooleans.java | 5 ++---
.../dom/types/primitive/booleans/vm/PrimitiveBooleanVm.java | 5 +++--
.../demoapp/dom/types/primitive/bytes/PrimitiveBytes.java | 5 ++---
.../demoapp/dom/types/primitive/bytes/vm/PrimitiveByteVm.java | 5 +++--
.../demoapp/dom/types/primitive/chars/PrimitiveChars.java | 5 ++---
.../demoapp/dom/types/primitive/chars/vm/PrimitiveCharVm.java | 5 +++--
.../demoapp/dom/types/primitive/doubles/PrimitiveDoubles.java | 5 ++---
.../dom/types/primitive/doubles/vm/PrimitiveDoubleVm.java | 5 +++--
.../demoapp/dom/types/primitive/floats/PrimitiveFloats.java | 5 ++---
.../dom/types/primitive/floats/vm/PrimitiveFloatVm.java | 5 +++--
.../java/demoapp/dom/types/primitive/ints/PrimitiveInts.java | 5 ++---
.../demoapp/dom/types/primitive/ints/vm/PrimitiveIntVm.java | 5 +++--
.../demoapp/dom/types/primitive/longs/PrimitiveLongs.java | 5 ++---
.../demoapp/dom/types/primitive/longs/vm/PrimitiveLongVm.java | 5 +++--
.../demoapp/dom/types/primitive/shorts/PrimitiveShorts.java | 5 ++---
.../dom/types/primitive/shorts/vm/PrimitiveShortVm.java | 5 +++--
.../extensions/secman/applib/SecmanAutoConfiguration.java | 2 +-
.../permission/app/ApplicationOrphanedPermissionManager.java | 5 ++---
.../secman/applib/permission/dom/ApplicationPermission.java | 5 ++---
.../extensions/secman/applib/role/dom/ApplicationRole.java | 5 ++---
.../applib/role/seed/IsisAppFeatureRoleAndPermissions.java | 7 -------
.../applib/role/seed/IsisConfigurationRoleAndPermissions.java | 2 --
.../secman/applib/tenancy/dom/ApplicationTenancy.java | 5 ++---
.../extensions/secman/applib/user/dom/ApplicationUser.java | 1 -
.../applib/user/dom/ApplicationUserRepositoryAbstract.java | 5 +++--
.../user/dom/mixins/ApplicationUser_updatePassword.java | 2 +-
.../model/good/ProperMemberInheritanceAbstract.java | 3 +--
.../fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java | 3 +--
217 files changed, 451 insertions(+), 542 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
index 1c83390..474a2b3 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
@@ -39,7 +39,6 @@ import java.lang.annotation.Target;
ElementType.METHOD,
ElementType.FIELD
})
-@ObjectSupport // meta annotation, in support of meta-model validation
public @interface Title {
/**
diff --git a/api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java b/api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
index 64be83f..6375d42 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
@@ -33,9 +33,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.PersistentEntitiesAdapter;
import lombok.Getter;
@@ -114,8 +114,7 @@ public class DomainObjectList {
// -- title
private String title;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return title;
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java
index e81dfd1..4d64c3a 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java
@@ -132,8 +132,7 @@ public abstract class ApplicationFeatureViewModel implements ViewModel {
* having a title() method (rather than using @Title annotation) is necessary as a workaround to be able to use
* wrapperFactory#unwrap(...) method, which is otherwise broken in Isis 1.6.0
*/
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return getFullyQualifiedName();
}
@ObjectSupport
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java
index 7fa4d2b..06a39b0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
@DomainObject(
nature = Nature.VIEW_MODEL,
@@ -39,8 +39,7 @@ public class ConfigurationViewmodel {
@Autowired(required = false)
private ConfigurationViewService configurationService;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Configuration";
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java
index e109725..cc3dc0e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMNode.java
@@ -30,7 +30,6 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.Navigable;
import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.schema.metamodel.v2.DomainClassDto;
@@ -65,8 +64,8 @@ public abstract class MMNode {
protected String title;
- @Title
- public final String title() {
+ //FIXME[ISIS-2774] should be picked up also when declared abstract, yet we work around that
+ @ObjectSupport public final String title() {
return title==null
? title = createTitle()
: title;
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 119c7c5..d15b1f4 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
@@ -27,9 +27,10 @@ import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
-import demoapp.dom._infra.resources.AsciiDocReaderService;
import lombok.RequiredArgsConstructor;
+import demoapp.dom._infra.resources.AsciiDocReaderService;
+
@Property(snapshot = Snapshot.EXCLUDED)
@RequiredArgsConstructor
public class 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 889a327..8d09d6a 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
@@ -27,10 +27,11 @@ import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
-import demoapp.dom._infra.resources.MarkupVariableResolverService;
import lombok.RequiredArgsConstructor;
import lombok.val;
+import demoapp.dom._infra.resources.MarkupVariableResolverService;
+
@Property(snapshot = Snapshot.EXCLUDED)
@RequiredArgsConstructor
public class HasAsciiDocDescription_sources {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkdownReaderService.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkdownReaderService.java
index f7f054a..463ed5c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkdownReaderService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/resources/MarkdownReaderService.java
@@ -21,9 +21,10 @@ package demoapp.dom._infra.resources;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.valuetypes.markdown.applib.value.Markdown;
import org.springframework.stereotype.Service;
+import org.apache.isis.valuetypes.markdown.applib.value.Markdown;
+
import lombok.val;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
index 5c3484e..3f9b29a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/seed/SeedServiceAbstract.java
@@ -22,10 +22,10 @@ import java.util.function.Supplier;
import javax.inject.Inject;
-import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.springframework.context.event.EventListener;
import org.springframework.core.annotation.Order;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.core.metamodel.events.MetamodelEvent;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands.java
index 106899d..e5cbb99 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/_commands/ExposePersistedCommands.java
@@ -21,9 +21,9 @@ package demoapp.dom.domain._commands;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.springframework.stereotype.Service;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.tablecol.TableColumnOrderForCollectionTypeAbstract;
import org.apache.isis.extensions.commandlog.model.command.CommandModel;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
index a0e2102..3062859 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/_interactions/InteractionDtoVm.java
@@ -25,9 +25,9 @@ import org.apache.isis.applib.ViewModel;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.services.urlencoding.UrlEncodingService;
import org.apache.isis.applib.util.TitleBuffer;
import org.apache.isis.applib.util.schema.InteractionDtoUtils;
@@ -51,8 +51,7 @@ public class InteractionDtoVm implements ViewModel {
private final static UrlEncodingService encodingService = new UrlEncodingServiceWithCompression();
- @Title
- public String title() {
+ @ObjectSupport public String title() {
// nb: not thread-safe
// formats defined in https://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html
val format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
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 297fb41..487e572 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
@@ -35,10 +35,10 @@ import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -68,8 +68,7 @@ public class ActionAssociateWithVm implements HasAsciiDocDescription {
this.text = text;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Action#associateWith";
}
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 ad9c7ac..3b5da28 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
@@ -26,9 +26,9 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -51,8 +51,7 @@ public class ActionAssociateWithChildVm implements HasAsciiDocDescription {
setValue(value);
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return getValue();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_makeFavorite.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_makeFavorite.java
index 2e370b2..d08c672 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_makeFavorite.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_makeFavorite.java
@@ -24,9 +24,10 @@ import java.util.Objects;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
-import demoapp.dom.domain.actions.Action.associateWith.ActionAssociateWithVm;
import lombok.RequiredArgsConstructor;
+import demoapp.dom.domain.actions.Action.associateWith.ActionAssociateWithVm;
+
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_noLongerFavorite.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_noLongerFavorite.java
index f1bd7db..0483183 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_noLongerFavorite.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_noLongerFavorite.java
@@ -23,9 +23,10 @@ import java.util.Objects;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
-import demoapp.dom.domain.actions.Action.associateWith.ActionAssociateWithVm;
import lombok.RequiredArgsConstructor;
+import demoapp.dom.domain.actions.Action.associateWith.ActionAssociateWithVm;
+
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_noLongerFavorites.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_noLongerFavorites.java
index 3536fda..753e0e9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_noLongerFavorites.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/associateWith/child/ActionAssociateWithVm_noLongerFavorites.java
@@ -24,9 +24,10 @@ import java.util.Objects;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
-import demoapp.dom.domain.actions.Action.associateWith.ActionAssociateWithVm;
import lombok.RequiredArgsConstructor;
+import demoapp.dom.domain.actions.Action.associateWith.ActionAssociateWithVm;
+
//tag::class[]
@Action(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java
index bc4e1b4..2d855cc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jdo/ActionCommandPublishingJdo.java
@@ -31,11 +31,11 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -65,8 +65,7 @@ public class ActionCommandPublishingJdo
this.propertyMetaAnnotatedOverridden = initialValue;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Action#commandPublishing (JDO)";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
index a8f5c35..463418c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/commandPublishing/jpa/ActionCommandPublishingJpa.java
@@ -31,11 +31,11 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
@@ -71,8 +71,7 @@ public class ActionCommandPublishingJpa
this.propertyMetaAnnotatedOverridden = initialValue;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Action#commandPublishing (JPA)";
}
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 e7ba3ec..a1ed8e0 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
@@ -29,10 +29,10 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.events.domain.ActionDomainEvent;
import lombok.Getter;
@@ -58,8 +58,7 @@ public class ActionDomainEventVm implements HasAsciiDocDescription {
this.text = text;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Action#domainEvent";
}
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 52e493b..01c969c 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
@@ -23,9 +23,10 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import demoapp.dom.domain.actions.Action.domainEvent.ActionDomainEventVm;
import lombok.RequiredArgsConstructor;
+import demoapp.dom.domain.actions.Action.domainEvent.ActionDomainEventVm;
+
//tag::class[]
@Property()
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java
index da97878..922fb94 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jdo/ActionExecutionPublishingJdo.java
@@ -31,11 +31,11 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -64,8 +64,7 @@ public class ActionExecutionPublishingJdo
this.propertyMetaAnnotatedOverridden = initialValue;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Action#executionPublishing (JDO)";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
index 0fc16ad..be8ea3a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/executionPublishing/jpa/ActionExecutionPublishingJpa.java
@@ -31,11 +31,11 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
@@ -70,8 +70,7 @@ public class ActionExecutionPublishingJpa
this.propertyMetaAnnotatedOverridden = initialValue;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Action#executionPublishing (JPA)";
}
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 a9279fb..0b8beca 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
@@ -29,10 +29,10 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import lombok.Getter;
@@ -59,8 +59,7 @@ public class ActionHiddenVm implements HasAsciiDocDescription {
this.otherText = value;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Action#hidden";
}
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 846743c..420967a 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
@@ -29,11 +29,11 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -62,8 +62,7 @@ public class ActionRestrictToVm implements HasAsciiDocDescription {
this.propertyForMetaAnnotationsOverridden = value;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Action#restrictTo";
}
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 ce84022..d16d6b9 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
@@ -31,10 +31,10 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
@@ -78,8 +78,7 @@ public class ActionSemanticsVm implements HasAsciiDocDescription {
this.propertyForMetaAnnotationsOverridden = value;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Action#semantics";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.java
index 25b6450..672169b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/typeOf/ActionTypeOfVm.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -55,8 +55,7 @@ public class ActionTypeOfVm implements HasAsciiDocDescription {
//end::class-collections-children[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Action#typeOf";
}
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 32db599..2fcf1a9 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
@@ -26,9 +26,9 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -54,8 +54,7 @@ public class ActionTypeOfChildVm implements HasAsciiDocDescription {
setValueReversed(reverse(value));
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return getValue();
}
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 8d6357a..594fd78 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
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -46,8 +46,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class ActionLayoutPositionVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "ActionLayout#position";
}
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 fbb4f87..e0ffbb9 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -47,12 +47,10 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class ActionLayoutPromptStyleVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "ActionLayout#promptStyle";
}
- //@Title //TODO is in conflict with the above, which one shall it be?
@Property(editing = Editing.DISABLED)
@PropertyLayout(fieldSetId = "general", sequence = "1")
@XmlElement(required = true)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java
index 82f648e..28db4a3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java
@@ -36,11 +36,12 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.services.message.MessageService;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.val;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java
index 98cf45c..edf8f00 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java
@@ -23,9 +23,9 @@ import javax.inject.Named;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -39,8 +39,7 @@ import lombok.Setter;
@AllArgsConstructor(staticName="of")
public class DemoItem {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return String.format("DemoItem '%s'", getName());
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java
index 14e7012..e93239c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java
@@ -23,9 +23,9 @@ import javax.inject.Named;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
@@ -40,8 +40,7 @@ import lombok.Setter;
@EqualsAndHashCode // required for the Dependent Arguments demo to work properly
public class DemoItem {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return String.format("DemoItem '%s' (%s)", getName(), getParity());
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/Parity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/Parity.java
index 4d182cf..7fbc766 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/Parity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/Parity.java
@@ -18,14 +18,13 @@
*/
package demoapp.dom.domain.actions.progmodel.depargs;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
public enum Parity {
EVEN,
ODD;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return name();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.java
index 9224f76..1577ea8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import lombok.Getter;
@@ -55,8 +55,7 @@ public class CollectionDomainEventVm implements HasAsciiDocDescription {
// ...
//end::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Collection#domainEvent";
}
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_addChild.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_addChild.java
index 1e44e16..d755d23 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_addChild.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/collections/Collection/domainEvent/CollectionDomainEventVm_addChild.java
@@ -22,11 +22,12 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.domain.collections.Collection.domainEvent.child.CollectionDomainEventChildVm;
import lombok.RequiredArgsConstructor;
import lombok.val;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.domain.collections.Collection.domainEvent.child.CollectionDomainEventChildVm;
+
//tag::class[]
@Action(
semantics = SemanticsOf.NON_IDEMPOTENT,
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 3bb05b5..fe95326 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+
//tag::class[]
@XmlRootElement(name = "child")
@XmlType
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 ab7d0a5..32b91fa 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
@@ -23,9 +23,10 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventVm;
import lombok.RequiredArgsConstructor;
+import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventVm;
+
//tag::class[]
@Property()
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java
index a1ead07..9c03412 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/entityChangePublishing/DomainObjectEntityChangePublishingVm.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -39,8 +39,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class DomainObjectEntityChangePublishingVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "DomainObject#entityChangePublishing";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java
index 738fe64..e8fb467 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/StatefulVmJaxbRefsEntity.java
@@ -38,10 +38,10 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -65,8 +65,7 @@ public class StatefulVmJaxbRefsEntity implements HasAsciiDocDescription {
@XmlTransient @Inject
private ValueHolderRepository<String, ? extends JaxbRefEntity> childEntities;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return String.format("%s; %s children", getMessage(), getChildren().size());
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java
index 92509d6..0c1c991 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/jaxbrefentity/jdo/JaxbRefJdo.java
@@ -47,7 +47,7 @@ import demoapp.dom.domain.objects.DomainObject.nature.viewmodels.jaxbrefentity.J
public class JaxbRefJdo
extends JaxbRefEntity {
- public JaxbRefJdo(String name) {
+ public JaxbRefJdo(final String name) {
this.name = name;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.java
index d22a696..e7024c6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/nature/viewmodels/usingjaxb/StatefulVmUsingJaxb.java
@@ -35,6 +35,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Title;
@@ -56,8 +57,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class StatefulVmUsingJaxb implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return String.format("%s; %s children", getMessage(), getChildren().size());
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java
index 5586d34..d35025e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -39,8 +39,7 @@ public class EmbeddedTypeVm implements HasAsciiDocDescription {
// end::class[]
@Inject private ValueHolderRepository<ComplexNumber, ? extends NumberConstantEntity> numberConstantRepo;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Embedded Types";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java
index 6663f48..c51246a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java
@@ -22,7 +22,7 @@ import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Value;
import lombok.AccessLevel;
@@ -49,8 +49,7 @@ public class ComplexNumberJdo
// end::class[]
// tag::title[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return im >= 0
? "" + re + " + " + im + "i"
: "" + re + " - " + (-im) + "i";
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java
index 5a9e219..a57ef43 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java
@@ -29,8 +29,8 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -49,8 +49,7 @@ public class NumberConstantJdo
// ...
//end::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return getName();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java
index c6a1fe2..d7eef8c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java
@@ -21,9 +21,10 @@ package demoapp.dom.domain.objects.other.embedded.jdo;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
+import lombok.val;
+
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
-import lombok.val;
@Profile("demo-jdo")
@Service
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java
index 18e4c95..97674d7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java
@@ -22,7 +22,7 @@ import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Value;
import lombok.AccessLevel;
@@ -50,8 +50,7 @@ public class ComplexNumberJpa
// end::class[]
// tag::title[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return im >= 0
? "" + re + " + " + im + "i"
: "" + re + " - " + (-im) + "i";
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
index a396a87..d0b7e7f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java
@@ -28,8 +28,8 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
@@ -55,8 +55,7 @@ public class NumberConstantJpa
// ...
//end::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return getName();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java
index 0939763..00048b7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java
@@ -21,9 +21,10 @@ package demoapp.dom.domain.objects.other.embedded.jpa;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
+import lombok.val;
+
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.domain.objects.other.embedded.ComplexNumber;
-import lombok.val;
@Profile("demo-jpa")
@Service
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.java
index 08def91..37f3acc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.java
@@ -21,8 +21,8 @@ package demoapp.dom.domain.objects.other.mixins;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import lombok.AllArgsConstructor;
@@ -40,8 +40,7 @@ import lombok.Setter;
@AllArgsConstructor(staticName = "of")
public class FibonacciNumberVm {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return String.format("%d ! = %d", getNumber(), getFibonacci());
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java
index 8047e90..c314ceb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java
@@ -26,8 +26,8 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -41,8 +41,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName = "demo.MixinVm")
public class MixinVm implements HasAsciiDocDescription, CountHolder {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Mixins";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java
index d9d7082..84e5f2e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jdo/PropertyCommandPublishingJdo.java
@@ -28,10 +28,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -61,8 +61,7 @@ public class PropertyCommandPublishingJdo
this.propertyMetaAnnotatedOverridden = initialValue;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#commandPublishing (JDO)";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
index 59fd72f..0b63dc6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/commandPublishing/jpa/PropertyCommandPublishingJpa.java
@@ -28,10 +28,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
@@ -67,8 +67,7 @@ public class PropertyCommandPublishingJpa
this.propertyMetaAnnotatedOverridden = initialValue;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#commandPublishing (JPA)";
}
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 7ef33b5..7c81bc7 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
@@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
import lombok.Getter;
@@ -56,8 +56,7 @@ public class PropertyDomainEventVm implements HasAsciiDocDescription {
this.text = text;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#domainEvent";
}
//tag::class[]
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 171dcc2..d8c21de 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
@@ -23,9 +23,10 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import demoapp.dom.domain.properties.Property.domainEvent.PropertyDomainEventVm;
import lombok.RequiredArgsConstructor;
+import demoapp.dom.domain.properties.Property.domainEvent.PropertyDomainEventVm;
+
//tag::class[]
@Property()
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 d98c192..5a6b49c 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
@@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -49,8 +49,7 @@ public class PropertyEditingVm implements HasAsciiDocDescription {
// ...
//end::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#editing";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEnabledMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEnabledMetaAnnotation.java
index 633ea26..a4be4cb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEnabledMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/PropertyExecutionPublishingEnabledMetaAnnotation.java
@@ -24,8 +24,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Publishing;
//tag::class[]
@Property(executionPublishing = Publishing.ENABLED) // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java
index 244ab0e..d994db7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jdo/PropertyExecutionPublishingJdo.java
@@ -29,10 +29,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -61,8 +61,7 @@ public class PropertyExecutionPublishingJdo
this.propertyMetaAnnotatedOverridden = initialValue;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#executionPublishing (JDO)";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
index f13c3cd..efba97e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/executionPublishing/jpa/PropertyExecutionPublishingJpa.java
@@ -29,10 +29,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
@@ -67,8 +67,7 @@ public class PropertyExecutionPublishingJpa
this.propertyMetaAnnotatedOverridden = initialValue;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#executionPublishing (JDO)";
}
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 ece9c08..974a805 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
@@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
@@ -49,8 +49,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyFileAcceptVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#fileAccept";
}
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 d5e39de..5c566a7 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
@@ -32,9 +32,9 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import lombok.Getter;
@@ -56,8 +56,7 @@ import demoapp.dom.domain.properties.Property.hidden.child.PropertyHiddenChildVm
@NoArgsConstructor
public class PropertyHiddenVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#hidden";
}
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 d9c7fa1..88afb91 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
@@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import lombok.Getter;
@@ -65,8 +65,7 @@ public class PropertyHiddenChildVm implements HasAsciiDocDescription {
setPropertyHiddenReferencesParent(parent);
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#hidden (child object)";
}
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 9c53ca6..2c6491b 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
@@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -47,8 +47,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyMaxLengthVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#maxLength";
}
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 8da0f48..fdf1923 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
@@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -47,8 +47,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyMustSatisfyVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#mustSatisfy";
}
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 4064f94..8491478 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -50,8 +50,7 @@ public class PropertyOptionalityVm implements HasAsciiDocDescription {
// ...
//end::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#optionality";
}
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 0cfcdb8..a0d5aa6 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
@@ -32,8 +32,8 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -54,8 +54,7 @@ import demoapp.dom.domain.properties.Property.projecting.child.PropertyProjectin
@NoArgsConstructor
public class PropertyProjectingVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#projecting";
}
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 677d40d..03a935b 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
@@ -29,9 +29,9 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -49,8 +49,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyRegexPatternVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Property#regexPattern";
}
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 310b7e9..302e1d3 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Snapshot;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -58,8 +58,7 @@ public class PropertySnapshotVm implements HasAsciiDocDescription {
this.metaAnnotatedPropertyOverridden = text;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertySnapshotVm";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/SnapshotExcludedMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/SnapshotExcludedMetaAnnotation.java
index 98177df..bae8894 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/SnapshotExcludedMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/SnapshotExcludedMetaAnnotation.java
@@ -24,8 +24,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Snapshot;
//tag::class[]
@Property(snapshot = Snapshot.EXCLUDED)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/SnapshotIncludedMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/SnapshotIncludedMetaAnnotation.java
index c39d72d..57b87ab 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/SnapshotIncludedMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/snapshot/SnapshotIncludedMetaAnnotation.java
@@ -24,8 +24,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.annotation.Snapshot;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Snapshot;
//tag::class[]
@Property(snapshot = Snapshot.INCLUDED)
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 2bdfd02..159811d 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -48,8 +48,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyLayoutCssClassVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertyLayout#cssClass";
}
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 bfa64e7..c1732e4 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -48,8 +48,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyLayoutDescribedAsVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertyLayout#describedAs";
}
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 d83643f..e494a7c 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
@@ -32,10 +32,10 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import lombok.Getter;
@@ -57,8 +57,7 @@ import demoapp.dom.domain.properties.PropertyLayout.hidden.child.PropertyLayoutH
@NoArgsConstructor
public class PropertyLayoutHiddenVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertyLayout#hidden";
}
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 6ec3b6c..7d1ed00 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import lombok.Getter;
@@ -66,8 +66,7 @@ public class PropertyLayoutHiddenChildVm implements HasAsciiDocDescription {
setPropertyHiddenReferencesParent(parent);
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertyLayout#hidden (child object)";
}
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 15aaed9..c011807 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
@@ -28,10 +28,10 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -49,8 +49,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyLayoutLabelPositionVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertyLayout#labelPosition";
}
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 a18777b..d333177 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -48,8 +48,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyLayoutMultiLineVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertyLayout#multiLine";
}
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 3f4f154..4216da1 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -48,8 +48,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyLayoutNamedVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertyLayout#named";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeType.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeType.java
index 1e62383..6e41a36 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeType.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileNodeType.java
@@ -18,7 +18,7 @@
*/
package demoapp.dom.domain.properties.PropertyLayout.navigable;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.util.Enums;
//tag::class[]
@@ -28,8 +28,7 @@ public enum FileNodeType {
DIRECTORY,
FILE;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return Enums.getFriendlyNameOf(this); // <.>
}
}
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 5099089..995d4cc 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
@@ -30,7 +30,6 @@ import org.apache.isis.applib.annotation.Navigable;
import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.graph.tree.TreeNode;
@@ -58,8 +57,7 @@ public class FileNodeVm implements HasAsciiDocDescription {
}
//tag::title[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
if(this.path == null) {
return "(root)";
}
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 7dcc14f..54274e1 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
@@ -30,11 +30,11 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.RenderDay;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JodaTimeJaxbAdapters;
import lombok.Getter;
@@ -60,8 +60,7 @@ public class PropertyLayoutRenderDayVm implements HasAsciiDocDescription {
endDate = startDate.plusDays(7);
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertyLayout#renderDay";
}
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 c7fa6c6..9225394 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
@@ -27,11 +27,11 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Repainting;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.annotations.PdfJsViewer;
@@ -50,8 +50,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyLayoutRepaintingVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertyLayout#repainting";
}
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 53bc8b8..822f742 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -48,8 +48,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
)
public class PropertyLayoutTypicalLengthVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "PropertyLayout#typicalLength";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java
index 53cdd98..fedb6e9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java
@@ -35,6 +35,7 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
@@ -42,7 +43,6 @@ import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Markup;
import lombok.Getter;
@@ -57,8 +57,7 @@ import demoapp.dom.domain.actions.progmodel.assoc.DemoItem;
@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName = "demo.Tooltip")
public class DescribedAsVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Tooltip Demo";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
index 0bbfea3..e103696 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
@@ -28,8 +28,8 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -42,8 +42,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName = "demo.Tab")
public class TabDemo implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Tab Demo";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
index 8c7cd89..18c78b8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.HomePage;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
@@ -39,8 +39,7 @@ import demoapp.dom._infra.resources.AsciiDocReaderService;
public class DemoHomePage
implements HasAsciiDocDescription { // <.>
- @Title
- public String title() { // <.>
+ @ObjectSupport public String title() { // <.>
return "Hello, " + userService.currentUserNameElseNobody();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
index 4a8423d..00f3234 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java
@@ -28,6 +28,9 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.factory.FactoryService;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.services.core.errorreportingservice.ErrorReportingServiceDemoVm;
import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoVm;
@@ -35,8 +38,6 @@ import demoapp.dom.services.core.messageservice.MessageServiceDemoVm;
import demoapp.dom.services.core.wrapperFactory.WrapperFactoryEntity;
import demoapp.dom.services.core.xmlSnapshotService.XmlSnapshotParentVm;
import demoapp.dom.services.core.xmlSnapshotService.peer.XmlSnapshotPeerVm;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
@DomainService(
nature=NatureOfService.VIEW,
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoVm.java
index f867bed..af25709 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/errorreportingservice/ErrorReportingServiceDemoVm.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -38,8 +38,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@DomainObject(nature=Nature.VIEW_MODEL, logicalTypeName = "demo.ErrorReportingServiceDemoVm", editing=Editing.ENABLED)
public class ErrorReportingServiceDemoVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Error Reporting Service demo";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoVm.java
index 8f8e930..b9a0401 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventBusServiceDemoVm.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.ActionLayout.Position;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.services.eventbus.EventBusService;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -39,8 +39,7 @@ public class EventBusServiceDemoVm implements HasAsciiDocDescription {
@Inject private EventLogEntryJdoRepository repository;
@Inject private EventBusService eventBusService;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Event Demo";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
index efafe05..a6be88a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJdo.java
@@ -32,8 +32,8 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -53,8 +53,7 @@ public class EventLogEntryJdo {
return x;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return getEvent();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
index 44d5a08..9c86b38 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/eventbusservice/EventLogEntryJpa.java
@@ -29,8 +29,8 @@ import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -49,8 +49,7 @@ public class EventLogEntryJpa {
return x;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return getEvent();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoVm.java
index 553aeaa..2cbaa79 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/messageservice/MessageServiceDemoVm.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.ActionLayout.Position;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.services.message.MessageService;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -35,8 +35,7 @@ public class MessageServiceDemoVm implements HasAsciiDocDescription {
@Inject private MessageService messageService;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Message Demo";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/WrapperFactoryJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/WrapperFactoryJdo.java
index b0fa3ad..5f65816 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/WrapperFactoryJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jdo/WrapperFactoryJdo.java
@@ -32,10 +32,10 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.control.AsyncControl;
@@ -70,8 +70,7 @@ public class WrapperFactoryJdo
this.propertyAsyncMixin = initialValue;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "WrapperFactory";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
index d7ee50f..87c9ffa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/core/wrapperFactory/jpa/WrapperFactoryJpa.java
@@ -33,10 +33,10 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.control.AsyncControl;
@@ -78,8 +78,7 @@ public class WrapperFactoryJpa
this.propertyAsyncMixin = initialValue;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "WrapperFactory";
}
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 4f57cba..14aecb0 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
@@ -32,9 +32,9 @@ import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -59,8 +59,7 @@ public class XmlSnapshotParentVm implements HasAsciiDocDescription {
this.text = text;
}
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "XmlSnapshotService parent VM";
}
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 4d37b2d..b75d331 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+
//tag::class[]
@XmlRootElement(name = "child")
@XmlType
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 21ed810..9a65e77 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
@@ -35,13 +35,14 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.services.core.xmlSnapshotService.peer.child.XmlSnapshotPeerChildVm;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.val;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.services.core.xmlSnapshotService.peer.child.XmlSnapshotPeerChildVm;
+
//tag::class[]
@XmlRootElement(name = "peer")
@XmlType
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 a5df729..c517e55 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+
//tag::class[]
@XmlRootElement(name = "child")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/ExtSecManMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/ExtSecManMenu.java
index d450da0..41ee887 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/ExtSecManMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/ExtSecManMenu.java
@@ -26,8 +26,6 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.annotation.SemanticsOf;
-import lombok.extern.log4j.Log4j2;
-
import demoapp.dom.services.extensions.secman.apptenancy.AppTenancyVm;
@DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.java
index da60cee..c9cfa5b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/AppTenancyVm.java
@@ -32,10 +32,10 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -51,8 +51,7 @@ import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEnt
)
public class AppTenancyVm implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Tenancy demo";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
index 1aa5d55..9a141b8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/apptenancy/ApplicationTenancyEvaluatorForDemo.java
@@ -25,10 +25,11 @@ import org.springframework.stereotype.Service;
import org.apache.isis.extensions.secman.applib.tenancy.spi.ApplicationTenancyEvaluator;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser;
-import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
import lombok.Getter;
import lombok.val;
+import demoapp.dom.services.extensions.secman.apptenancy.persistence.TenantedEntity;
+
//tag::class[]
@Service
public class ApplicationTenancyEvaluatorForDemo
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java
index 7b47cd2..b74100b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/services/extensions/secman/appuser/seed/AppUserSeeding.java
@@ -18,18 +18,20 @@
*/
package demoapp.dom.services.extensions.secman.appuser.seed;
+import org.springframework.stereotype.Service;
+
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.applib.role.fixtures.AbstractRoleAndPermissionsFixtureScript;
import org.apache.isis.extensions.secman.applib.user.dom.AccountType;
import org.apache.isis.extensions.secman.applib.user.fixtures.AbstractUserAndRolesFixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.springframework.stereotype.Service;
-import demoapp.dom._infra.seed.SeedServiceAbstract;
import static org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionMode.CHANGING;
import static org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionRule.ALLOW;
+import demoapp.dom._infra.seed.SeedServiceAbstract;
+
@Service
public class AppUserSeeding
extends SeedServiceAbstract {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs.java
index 18bfa7b..9fbdcce 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/IsisBlobs.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Blob;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -52,8 +52,7 @@ import demoapp.dom.types.isis.blobs.vm.IsisBlobVm;
//@Log4j2
public class IsisBlobs implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Blob data type";
}
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 eccbaf0..5cd686d 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
@@ -35,10 +35,11 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Blob;
-import demoapp.dom.types.isis.blobs.persistence.IsisBlobEntity;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom.types.isis.blobs.persistence.IsisBlobEntity;
+
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java
index 0f1dc64..97bb10c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/blobs/jpa/IsisBlobJpa.java
@@ -28,6 +28,8 @@ import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
+import org.springframework.context.annotation.Profile;
+
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Optionality;
@@ -37,11 +39,11 @@ import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import org.apache.isis.persistence.jpa.applib.types.BlobJpaEmbeddable;
-import org.springframework.context.annotation.Profile;
-import demoapp.dom.types.isis.blobs.persistence.IsisBlobEntity;
import lombok.NoArgsConstructor;
+import demoapp.dom.types.isis.blobs.persistence.IsisBlobEntity;
+
@Profile("demo-jpa")
//tag::class[]
@Entity
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 6a4d201..965af23 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Blob;
import lombok.Getter;
@@ -58,8 +58,7 @@ public class IsisBlobVm
}
//tag::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Blob view model: " +getReadOnlyProperty().getName();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs.java
index 18c7af8..f42a3fd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/clobs/IsisClobs.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Clob;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -52,8 +52,7 @@ import demoapp.dom.types.isis.clobs.vm.IsisClobVm;
//@Log4j2
public class IsisClobs implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Clob data type";
}
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 4d391e2..a3b8ec0 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
@@ -35,10 +35,11 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Clob;
-import demoapp.dom.types.isis.clobs.persistence.IsisClobEntity;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom.types.isis.clobs.persistence.IsisClobEntity;
+
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
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 ca2a43d..c59e918 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
@@ -33,11 +33,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Clob;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isis.clobs.holder.IsisClobHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.isis.clobs.holder.IsisClobHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths.java
index 2dd94e4..80b0243 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/localresourcepaths/IsisLocalResourcePaths.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.LocalResourcePath;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -52,8 +52,7 @@ import demoapp.dom.types.isis.localresourcepaths.vm.IsisLocalResourcePathVm;
//@Log4j2
public class IsisLocalResourcePaths implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "LocalResourcePath data type";
}
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 43ad8a1..ae00a37 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
@@ -35,10 +35,11 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.LocalResourcePath;
-import demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathEntity;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom.types.isis.localresourcepaths.persistence.IsisLocalResourcePathEntity;
+
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
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 9bfd5fc..0edb39c 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
@@ -33,11 +33,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.LocalResourcePath;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isis.localresourcepaths.holder.IsisLocalResourcePathHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.isis.localresourcepaths.holder.IsisLocalResourcePathHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java
index 30af09a..4c8f1a4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Markup;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -52,8 +52,7 @@ import demoapp.dom.types.isis.markups.vm.IsisMarkupVm;
//@Log4j2
public class IsisMarkups implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Markup data type";
}
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 3cf8e48..c82a1ac 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
@@ -29,10 +29,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.value.Markup;
@@ -60,8 +60,7 @@ public class IsisMarkupJdo // <.>
//tag::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Markup JDO entity: " +
bookmarkService.bookmarkForElseFail(this).getIdentifier();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
index b8a09f8..cb130a7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
@@ -34,10 +34,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.value.Markup;
@@ -75,8 +75,7 @@ public class IsisMarkupJpa
@GeneratedValue
private Long id;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Markup JPA entity: " +
bookmarkService.bookmarkForElseFail(this).getIdentifier();
}
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 0482dbf..8596166 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.value.Markup;
@@ -59,8 +59,7 @@ public class IsisMarkupVm
}
//tag::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Markup view model";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords.java
index e41a43d..23c1d03 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/passwords/IsisPasswords.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Password;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -52,8 +52,7 @@ import demoapp.dom.types.isis.passwords.vm.IsisPasswordVm;
//@Log4j2
public class IsisPasswords implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Password data type";
}
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 cdf3dab..e475e20 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
@@ -34,10 +34,11 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Password;
-import demoapp.dom.types.isis.passwords.persistence.IsisPasswordEntity;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom.types.isis.passwords.persistence.IsisPasswordEntity;
+
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
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 b347632..f142f98 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
@@ -33,11 +33,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.value.Password;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isis.passwords.holder.IsisPasswordHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.isis.passwords.holder.IsisPasswordHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.java
index 0333373..283438d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -52,8 +52,7 @@ import demoapp.dom.types.isisext.asciidocs.vm.IsisAsciiDocVm;
//@Log4j2
public class IsisAsciiDocs implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "AsciiDoc data type";
}
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 3179153..5e141fd 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
@@ -29,10 +29,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
@@ -59,8 +59,7 @@ public class IsisAsciiDocJdo // <.>
}
//tag::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "AsciiDoc JDO entity: " +
bookmarkService.bookmarkForElseFail(this).getIdentifier();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java
index dae3dbd..0be6eda 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java
@@ -34,10 +34,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
@@ -75,8 +75,7 @@ public class IsisAsciiDocJpa
@GeneratedValue
private Long id;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "AsciiDoc JPA entity: " +
bookmarkService.bookmarkForElseFail(this).getIdentifier();
}
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 4a55409..53bc0d6 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
@@ -59,8 +59,7 @@ public class IsisAsciiDocVm
}
//tag::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "AsciiDoc view model";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents.java
index 68a913f..4f55f1f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/cal/IsisCalendarEvents.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.extensions.fullcalendar.applib.value.CalendarEvent;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -52,8 +52,7 @@ import demoapp.dom.types.isisext.cal.vm.IsisCalendarEventVm;
//@Log4j2
public class IsisCalendarEvents implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "CalendarEvent data type";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns.java
index 1710478..6cb9278 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.valuetypes.markdown.applib.value.Markdown;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -52,8 +52,7 @@ import demoapp.dom.types.isisext.markdowns.vm.IsisMarkdownVm;
//@Log4j2
public class IsisMarkdowns implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Markdown data type";
}
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 c28d9ef5..76f9bb7 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
@@ -29,10 +29,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.valuetypes.markdown.applib.value.Markdown;
@@ -59,8 +59,7 @@ public class IsisMarkdownJdo // <.>
}
//tag::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Markdown JDO entity: " +
bookmarkService.bookmarkForElseFail(this).getIdentifier();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java
index efaf673..f382387 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java
@@ -34,10 +34,10 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
@@ -75,8 +75,7 @@ public class IsisMarkdownJpa
@GeneratedValue
private Long id;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Markdown JPA entity: " +
bookmarkService.bookmarkForElseFail(this).getIdentifier();
}
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 8a0bafb..b9d3e07 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
@@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.valuetypes.markdown.applib.value.Markdown;
@@ -59,8 +59,7 @@ public class IsisMarkdownVm
}
//tag::class[]
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Markdown view model";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java
index 6c0c8f0..d1122c9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.LongAdder;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.commons.internal.concurrent._ThreadSleep;
import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
@@ -34,8 +34,7 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor(staticName="of")
public class DemoTask implements SseSource {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return String.format("DemoTask '%s'", Integer.toHexString(hashCode()));
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.java
index ca711c3..450dd14 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/JavaAwtBufferedImages.java
@@ -35,9 +35,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -52,8 +52,7 @@ import demoapp.dom.types.javaawt.images.vm.JavaAwtBufferedImageVm;
//@Log4j2
public class JavaAwtBufferedImages implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Image data type";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java
index 16e962f..0a10ae8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jdo/JavaAwtBufferedImageJdo.java
@@ -29,10 +29,10 @@ import javax.jdo.annotations.PersistenceCapable;
import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -60,8 +60,7 @@ public class JavaAwtBufferedImageJdo
}
// @Title not yet supported
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Image JDO entity";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
index 8e65561..0eb04c8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/jpa/JavaAwtBufferedImageJpa.java
@@ -31,10 +31,10 @@ import javax.persistence.Table;
import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import org.apache.isis.persistence.jpa.integration.typeconverters.JavaAwtBufferedImageByteArrayConverter;
@@ -70,8 +70,7 @@ public class JavaAwtBufferedImageJpa
}
// @Title not yet supported
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Image JPA entity";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
index 97d2384..7161ab2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/samples/JavaAwtBufferedImagesSamples.java
@@ -28,10 +28,11 @@ import org.springframework.stereotype.Service;
import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.resources._Resources;
-import demoapp.dom.types.Samples;
import lombok.SneakyThrows;
import lombok.val;
+import demoapp.dom.types.Samples;
+
@Service
public class JavaAwtBufferedImagesSamples implements Samples<BufferedImage> {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java
index 012f7d8..62203f2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javaawt/images/vm/JavaAwtBufferedImageVm.java
@@ -28,10 +28,10 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -62,8 +62,7 @@ public class JavaAwtBufferedImageVm
}
// @Title not yet supported
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Image view model";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/JavaLangWrapperTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/JavaLangWrapperTypesMenu.java
index a8115f6..be3c646 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/JavaLangWrapperTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/JavaLangWrapperTypesMenu.java
@@ -26,8 +26,6 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.annotation.SemanticsOf;
-import lombok.extern.log4j.Log4j2;
-
import demoapp.dom.types.javalang.booleans.WrapperBooleans;
import demoapp.dom.types.javalang.bytes.WrapperBytes;
import demoapp.dom.types.javalang.characters.WrapperCharacters;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java
index 42cd4ba..553c7f7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/booleans/WrapperBooleans.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javalang.booleans.vm.WrapperBooleanVm;
//@Log4j2
public class WrapperBooleans implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Boolean (wrapper) data type";
}
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 8357bbc..83a9bb1 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javalang.booleans.holder.WrapperBooleanHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javalang.booleans.holder.WrapperBooleanHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.java
index 3c618c1..eb428ed 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/bytes/WrapperBytes.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javalang.bytes.vm.WrapperByteVm;
//@Log4j2
public class WrapperBytes implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Byte (wrapper) data type";
}
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 47a83e3..06761f1 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javalang.bytes.holder.WrapperByteHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javalang.bytes.holder.WrapperByteHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.java
index 3af0c62..3b9a6cc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/characters/WrapperCharacters.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javalang.characters.vm.WrapperCharacterVm;
//@Log4j2
public class WrapperCharacters implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Character (wrapper) data type";
}
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 f7585b4..0e60a13 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javalang.characters.holder.WrapperCharacterHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javalang.characters.holder.WrapperCharacterHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.java
index e6ff8cb..2b15a9b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/doubles/WrapperDoubles.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javalang.doubles.vm.WrapperDoubleVm;
//@Log4j2
public class WrapperDoubles implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Double (wrapper) data type";
}
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 d0b31e5..8024a5a 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javalang.doubles.holder.WrapperDoubleHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javalang.doubles.holder.WrapperDoubleHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/WrapperFloats.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/WrapperFloats.java
index 497a686..0eb61dd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/WrapperFloats.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/floats/WrapperFloats.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javalang.floats.vm.WrapperFloatVm;
//@Log4j2
public class WrapperFloats implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Float (wrapper) data type";
}
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 55b2f1f..b0a4f29 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javalang.floats.holder.WrapperFloatHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javalang.floats.holder.WrapperFloatHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/WrapperIntegers.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/WrapperIntegers.java
index 59fa6e9..711c852 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/WrapperIntegers.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/integers/WrapperIntegers.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javalang.integers.vm.WrapperIntegerVm;
//@Log4j2
public class WrapperIntegers implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Integer (wrapper) data type";
}
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 3616622..dac385d 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javalang.integers.holder.WrapperIntegerHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javalang.integers.holder.WrapperIntegerHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/WrapperLongs.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/WrapperLongs.java
index 59c778f..0863afe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/WrapperLongs.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/longs/WrapperLongs.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javalang.longs.vm.WrapperLongVm;
//@Log4j2
public class WrapperLongs implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Long (wrapper) data type";
}
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 8f3bca1..f25f524 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javalang.longs.holder.WrapperLongHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javalang.longs.holder.WrapperLongHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.java
index b63d465..71b7cdc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/shorts/WrapperShorts.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javalang.shorts.vm.WrapperShortVm;
//@Log4j2
public class WrapperShorts implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Short (wrapper) data type";
}
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 7139040..e86d5be 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javalang.shorts.holder.WrapperShortHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javalang.shorts.holder.WrapperShortHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/JavaLangStrings.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/JavaLangStrings.java
index bfc3839..e9b58cb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/JavaLangStrings.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/JavaLangStrings.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -51,8 +51,7 @@ import demoapp.dom.types.javalang.strings.vm.JavaLangStringVm;
//@Log4j2
public class JavaLangStrings implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "String data type";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java
index ddaf6e2..211fa54 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java
@@ -18,12 +18,15 @@
*/
package demoapp.dom.types.javalang.strings.samples;
-import demoapp.dom.types.Samples;
-import org.apache.isis.applib.annotation.PriorityPrecedence;
-import org.springframework.stereotype.Service;
+import java.util.stream.Stream;
import javax.annotation.Priority;
-import java.util.stream.Stream;
+
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.applib.annotation.PriorityPrecedence;
+
+import demoapp.dom.types.Samples;
@Service
@Priority(PriorityPrecedence.EARLY)
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 25b88ad..7a79502 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javalang.strings.holder.JavaLangStringHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javalang.strings.holder.JavaLangStringHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.java
index 8773ce8..018568c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/voids/JavaLangVoids.java
@@ -28,9 +28,9 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@@ -41,8 +41,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
//@Log4j2
public class JavaLangVoids implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Void data type";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/JavaMathTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/JavaMathTypesMenu.java
index 596b79b..5ed738e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/JavaMathTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/JavaMathTypesMenu.java
@@ -27,8 +27,6 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.annotation.SemanticsOf;
-import lombok.extern.log4j.Log4j2;
-
import demoapp.dom.types.javamath.bigdecimals.JavaMathBigDecimals;
import demoapp.dom.types.javamath.bigintegers.JavaMathBigIntegers;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/JavaMathBigDecimals.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/JavaMathBigDecimals.java
index 9915bb8..c1989b7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/JavaMathBigDecimals.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/JavaMathBigDecimals.java
@@ -35,9 +35,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -52,8 +52,7 @@ import demoapp.dom.types.javamath.bigdecimals.vm.JavaMathBigDecimalVm;
//@Log4j2
public class JavaMathBigDecimals implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.math.BigDecimal data type";
}
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 f91704b..874545f 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javamath.bigdecimals.holder.JavaMathBigDecimalHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javamath.bigdecimals.holder.JavaMathBigDecimalHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/JavaMathBigIntegers.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/JavaMathBigIntegers.java
index 52c8de9c..cd4de31 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/JavaMathBigIntegers.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javamath/bigintegers/JavaMathBigIntegers.java
@@ -35,9 +35,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -52,8 +52,7 @@ import demoapp.dom.types.javamath.bigintegers.vm.JavaMathBigIntegerVm;
//@Log4j2
public class JavaMathBigIntegers implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.math.BigInteger data type";
}
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 42e69ec..023240d 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javamath.bigintegers.holder.JavaMathBigIntegerHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javamath.bigintegers.holder.JavaMathBigIntegerHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/JavaNetTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/JavaNetTypesMenu.java
index 99ebda7..e8a19e7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/JavaNetTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/JavaNetTypesMenu.java
@@ -26,8 +26,6 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.annotation.SemanticsOf;
-import lombok.extern.log4j.Log4j2;
-
import demoapp.dom.types.javanet.urls.JavaNetUrls;
@DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/JavaNetUrls.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/JavaNetUrls.java
index eec8d48..aeb0bcb 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/JavaNetUrls.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javanet/urls/JavaNetUrls.java
@@ -35,9 +35,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -52,8 +52,7 @@ import demoapp.dom.types.javanet.urls.vm.JavaNetUrlVm;
//@Log4j2
public class JavaNetUrls implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.net.URL data type";
}
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 a09607f..3507246 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javanet.urls.holder.JavaNetUrlHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javanet.urls.holder.JavaNetUrlHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/JavaSqlTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/JavaSqlTypesMenu.java
index 3a347e2..bd64b67 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/JavaSqlTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/JavaSqlTypesMenu.java
@@ -27,8 +27,6 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.annotation.SemanticsOf;
-import lombok.extern.log4j.Log4j2;
-
import demoapp.dom.types.javasql.javasqldate.JavaSqlDates;
import demoapp.dom.types.javasql.javasqltimestamp.JavaSqlTimestamps;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.java
index fd237e4..ff2f038 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqldate/JavaSqlDates.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javasql.javasqldate.vm.JavaSqlDateVm;
//@Log4j2
public class JavaSqlDates implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.sql.Date data type";
}
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 f1d9eeb..17c670c 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaSqlJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javasql.javasqldate.holder.JavaSqlDateHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javasql.javasqldate.holder.JavaSqlDateHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.java
index 3be3cef..eb3734a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javasql/javasqltimestamp/JavaSqlTimestamps.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javasql.javasqltimestamp.vm.JavaSqlTimestampVm;
//@Log4j2
public class JavaSqlTimestamps implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.sql.Timestamp data type";
}
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 aa6e389..b86e475 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaSqlJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javasql.javasqltimestamp.holder.JavaSqlTimestampHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javasql.javasqltimestamp.holder.JavaSqlTimestampHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/JavaTimeLocalDates.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/JavaTimeLocalDates.java
index 953cbde..6e0d0be 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/JavaTimeLocalDates.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldate/JavaTimeLocalDates.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javatime.javatimelocaldate.vm.JavaTimeLocalDateVm;
//@Log4j2
public class JavaTimeLocalDates implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.time.LocalDate data type";
}
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 7f0bb0f..ceb182e 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javatime.javatimelocaldate.holder.JavaTimeLocalDateHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javatime.javatimelocaldate.holder.JavaTimeLocalDateHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/JavaTimeLocalDateTimes.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/JavaTimeLocalDateTimes.java
index a2c6431..884b3c6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/JavaTimeLocalDateTimes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimelocaldatetime/JavaTimeLocalDateTimes.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javatime.javatimelocaldatetime.vm.JavaTimeLocalDateTime
//@Log4j2
public class JavaTimeLocalDateTimes implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.time.LocalDateTime data type";
}
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 464e80e..c1a0072 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javatime.javatimelocaldatetime.holder.JavaTimeLocalDateTimeHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javatime.javatimelocaldatetime.holder.JavaTimeLocalDateTimeHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/JavaTimeOffsetDateTimes.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/JavaTimeOffsetDateTimes.java
index 82ef942..7c1f294 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/JavaTimeOffsetDateTimes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsetdatetime/JavaTimeOffsetDateTimes.java
@@ -35,9 +35,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -51,8 +51,7 @@ import demoapp.dom.types.javatime.javatimeoffsetdatetime.vm.JavaTimeOffsetDateTi
//@Log4j2
public class JavaTimeOffsetDateTimes implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.time.OffsetDateTime data type";
}
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 22b5a58..c64a347 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javatime.javatimeoffsetdatetime.holder.JavaTimeOffsetDateTimeHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javatime.javatimeoffsetdatetime.holder.JavaTimeOffsetDateTimeHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/JavaTimeOffsetTimes.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/JavaTimeOffsetTimes.java
index aac2289..727c005 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/JavaTimeOffsetTimes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimeoffsettime/JavaTimeOffsetTimes.java
@@ -35,9 +35,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -51,8 +51,7 @@ import demoapp.dom.types.javatime.javatimeoffsettime.vm.JavaTimeOffsetTimeVm;
//@Log4j2
public class JavaTimeOffsetTimes implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.time.OffsetTime data type";
}
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 8dbbfec..ae29fe1 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javatime.javatimeoffsettime.holder.JavaTimeOffsetTimeHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javatime.javatimeoffsettime.holder.JavaTimeOffsetTimeHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/JavaTimeZonedDateTimes.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/JavaTimeZonedDateTimes.java
index 25a6250..6a64cad 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/JavaTimeZonedDateTimes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javatime/javatimezoneddatetime/JavaTimeZonedDateTimes.java
@@ -35,9 +35,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -51,8 +51,7 @@ import demoapp.dom.types.javatime.javatimezoneddatetime.vm.JavaTimeZonedDateTime
//@Log4j2
public class JavaTimeZonedDateTimes implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.time.ZonedDateTime data type";
}
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 524b9f0..8d51038 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaTimeJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javatime.javatimezoneddatetime.holder.JavaTimeZonedDateTimeHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javatime.javatimezoneddatetime.holder.JavaTimeZonedDateTimeHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/JavaUtilTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/JavaUtilTypesMenu.java
index e2ac3e0..70adb91 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/JavaUtilTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/JavaUtilTypesMenu.java
@@ -26,8 +26,6 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.annotation.SemanticsOf;
-import lombok.extern.log4j.Log4j2;
-
import demoapp.dom.types.javautil.javautildate.JavaUtilDates;
import demoapp.dom.types.javautil.uuids.JavaUtilUuids;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/JavaUtilDates.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/JavaUtilDates.java
index 55c3cf1..d6a954d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/JavaUtilDates.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/javautildate/JavaUtilDates.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -50,8 +50,7 @@ import demoapp.dom.types.javautil.javautildate.vm.JavaUtilDateVm;
//@Log4j2
public class JavaUtilDates implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.util.Date data type";
}
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 90b4184..adeaca5 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JavaUtilJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javautil.javautildate.holder.JavaUtilDateHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javautil.javautildate.holder.JavaUtilDateHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.java
index 983dec8..1660a60 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/JavaUtilUuids.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -51,8 +51,7 @@ import demoapp.dom.types.javautil.uuids.vm.JavaUtilUuidVm;
//@Log4j2
public class JavaUtilUuids implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "java.util.UUID data type";
}
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 ddfe628..dda1dea 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
@@ -32,11 +32,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.javautil.uuids.holder.JavaUtilUuidHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.javautil.uuids.holder.JavaUtilUuidHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/JodaDateTimes.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/JodaDateTimes.java
index 33fadfe..7bd6e47 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/JodaDateTimes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodadatetime/JodaDateTimes.java
@@ -37,9 +37,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -54,8 +54,7 @@ import demoapp.dom.types.jodatime.jodadatetime.vm.JodaDateTimeVm;
//@Log4j2
public class JodaDateTimes implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "org.joda.time.DateTime data type";
}
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 4f56e0c..4bcf7a4 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JodaTimeJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.jodatime.jodadatetime.holder.JodaDateTimeHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.jodatime.jodadatetime.holder.JodaDateTimeHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/JodaLocalDates.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/JodaLocalDates.java
index 0f90f5b..c42dba9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/JodaLocalDates.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldate/JodaLocalDates.java
@@ -38,9 +38,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -55,8 +55,7 @@ import demoapp.dom.types.jodatime.jodalocaldate.vm.JodaLocalDateVm;
//@Log4j2
public class JodaLocalDates implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "org.joda.time.LocalDate data type";
}
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 a2e6c9f..314929c 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JodaTimeJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.jodatime.jodalocaldate.holder.JodaLocalDateHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.jodatime.jodalocaldate.holder.JodaLocalDateHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/JodaLocalDateTimes.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/JodaLocalDateTimes.java
index 4e46f15..f81226a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/JodaLocalDateTimes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaldatetime/JodaLocalDateTimes.java
@@ -38,9 +38,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -55,8 +55,7 @@ import demoapp.dom.types.jodatime.jodalocaldatetime.vm.JodaLocalDateTimeVm;
//@Log4j2
public class JodaLocalDateTimes implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "org.joda.time.LocalDateTime data type";
}
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 730f7a9..efa6c11 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
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JodaTimeJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.jodatime.jodalocaldatetime.holder.JodaLocalDateTimeHolder3;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.jodatime.jodalocaldatetime.holder.JodaLocalDateTimeHolder3;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/JodaLocalTimes.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/JodaLocalTimes.java
index e975ccd..2467b9f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/JodaLocalTimes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/JodaLocalTimes.java
@@ -38,9 +38,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -55,8 +55,7 @@ import demoapp.dom.types.jodatime.jodalocaltime.vm.JodaLocalTimeVm;
//@Log4j2
public class JodaLocalTimes implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "org.joda.time.LocalTime data type";
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/vm/JodaLocalTimeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/vm/JodaLocalTimeVm.java
index 37d4908..8993d45 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/vm/JodaLocalTimeVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/jodatime/jodalocaltime/vm/JodaLocalTimeVm.java
@@ -34,11 +34,12 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.jaxb.JodaTimeJaxbAdapters;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.jodatime.jodalocaltime.holder.JodaLocalTimeHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.jodatime.jodalocaltime.holder.JodaLocalTimeHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/PrimitiveBooleans.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/PrimitiveBooleans.java
index be525e1..a6da5ca 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/PrimitiveBooleans.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/booleans/PrimitiveBooleans.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -54,8 +54,7 @@ import demoapp.dom.types.primitive.booleans.vm.PrimitiveBooleanVm;
//@Log4j2
public class PrimitiveBooleans implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "boolean (primitive) data type";
}
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 364a938..e175f9c 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.primitive.booleans.holder.PrimitiveBooleanHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.primitive.booleans.holder.PrimitiveBooleanHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.java
index 9d195da..20a6e22 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -54,8 +54,7 @@ import demoapp.dom.types.primitive.bytes.vm.PrimitiveByteVm;
//@Log4j2
public class PrimitiveBytes implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "byte (primitive) data type";
}
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 98ec47f..b18f0ba 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.primitive.bytes.holder.PrimitiveByteHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.primitive.bytes.holder.PrimitiveByteHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java
index 5e80773..5289049 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -54,8 +54,7 @@ import demoapp.dom.types.primitive.chars.vm.PrimitiveCharVm;
//@Log4j2
public class PrimitiveChars implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "char (primitive) data type";
}
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 534ef3b..383d327 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.primitive.chars.holder.PrimitiveCharHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.primitive.chars.holder.PrimitiveCharHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/PrimitiveDoubles.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/PrimitiveDoubles.java
index 71837bc..dd88ec3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/PrimitiveDoubles.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/doubles/PrimitiveDoubles.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -54,8 +54,7 @@ import demoapp.dom.types.primitive.doubles.vm.PrimitiveDoubleVm;
//@Log4j2
public class PrimitiveDoubles implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "double (primitive) data type";
}
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 1f24115..4180116 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.primitive.doubles.holder.PrimitiveDoubleHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.primitive.doubles.holder.PrimitiveDoubleHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/PrimitiveFloats.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/PrimitiveFloats.java
index 996bf8d..3e15910 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/PrimitiveFloats.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/floats/PrimitiveFloats.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -54,8 +54,7 @@ import demoapp.dom.types.primitive.floats.vm.PrimitiveFloatVm;
//@Log4j2
public class PrimitiveFloats implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "float (primitive) data type";
}
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 3e63edc..cfe8811 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.primitive.floats.holder.PrimitiveFloatHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.primitive.floats.holder.PrimitiveFloatHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/PrimitiveInts.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/PrimitiveInts.java
index d383c86..bc312f9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/PrimitiveInts.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/ints/PrimitiveInts.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -54,8 +54,7 @@ import demoapp.dom.types.primitive.ints.vm.PrimitiveIntVm;
//@Log4j2
public class PrimitiveInts implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "int (primitive) data type";
}
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 ea28b74..7f9f456 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.primitive.ints.holder.PrimitiveIntHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.primitive.ints.holder.PrimitiveIntHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/PrimitiveLongs.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/PrimitiveLongs.java
index 51c776d..8c4f2b5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/PrimitiveLongs.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/longs/PrimitiveLongs.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -54,8 +54,7 @@ import demoapp.dom.types.primitive.longs.vm.PrimitiveLongVm;
//@Log4j2
public class PrimitiveLongs implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "long (primitive) data type";
}
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 e4f69a7..177103c 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.primitive.longs.holder.PrimitiveLongHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.primitive.longs.holder.PrimitiveLongHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/PrimitiveShorts.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/PrimitiveShorts.java
index 2e8d2cc..5aa7095 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/PrimitiveShorts.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/shorts/PrimitiveShorts.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.annotation.Title;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -54,8 +54,7 @@ import demoapp.dom.types.primitive.shorts.vm.PrimitiveShortVm;
//@Log4j2
public class PrimitiveShorts implements HasAsciiDocDescription {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "short (primitive) data type";
}
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 26ca96f..cc94b6f 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
@@ -30,11 +30,12 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Title;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.primitive.shorts.holder.PrimitiveShortHolder2;
import lombok.Getter;
import lombok.Setter;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.types.primitive.shorts.holder.PrimitiveShortHolder2;
+
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/SecmanAutoConfiguration.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/SecmanAutoConfiguration.java
index 952558c..c00a2a4 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/SecmanAutoConfiguration.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/SecmanAutoConfiguration.java
@@ -18,12 +18,12 @@
*/
package org.apache.isis.extensions.secman.applib;
-import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.extensions.secman.applib.permission.spi.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.applib.permission.spi.PermissionsEvaluationServiceAllowBeatsVeto;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.java
index af22d48..b4d5728 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/app/ApplicationOrphanedPermissionManager.java
@@ -24,7 +24,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
import org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermission;
import org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionRepository;
@@ -42,8 +42,7 @@ public class ApplicationOrphanedPermissionManager {
@Inject private ApplicationPermissionRepository applicationPermissionRepository;
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "Manage Orphaned Permissions";
}
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java
index d60c641..93e1a5b 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/permission/dom/ApplicationPermission.java
@@ -31,10 +31,10 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.appfeat.ApplicationFeature;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
@@ -105,8 +105,7 @@ public abstract class ApplicationPermission implements Comparable<ApplicationPer
// -- MODEL
- @Title
- public String title() {
+ @ObjectSupport public String title() {
val buf = new StringBuilder();
buf.append(getRole().getName()).append(":") // admin:
.append(" ").append(getRule().toString()) // Allow|Veto
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/ApplicationRole.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/ApplicationRole.java
index 70c6c25..987e242 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/ApplicationRole.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/dom/ApplicationRole.java
@@ -32,12 +32,12 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.util.Equality;
import org.apache.isis.applib.util.Hashing;
import org.apache.isis.applib.util.ObjectContracts;
@@ -71,8 +71,7 @@ public abstract class ApplicationRole implements Comparable<ApplicationRole> {
// -- MODEL
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return getName();
}
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed/IsisAppFeatureRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed/IsisAppFeatureRoleAndPermissions.java
index a223b36..ea39004 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed/IsisAppFeatureRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed/IsisAppFeatureRoleAndPermissions.java
@@ -21,13 +21,6 @@ package org.apache.isis.extensions.secman.applib.role.seed;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.appfeatui.ApplicationFeatureMenu;
-import org.apache.isis.applib.services.appfeatui.ApplicationFeatureViewModel;
-import org.apache.isis.applib.services.appfeatui.ApplicationNamespace;
-import org.apache.isis.applib.services.appfeatui.ApplicationType;
-import org.apache.isis.applib.services.appfeatui.ApplicationTypeAction;
-import org.apache.isis.applib.services.appfeatui.ApplicationTypeCollection;
-import org.apache.isis.applib.services.appfeatui.ApplicationTypeMember;
-import org.apache.isis.applib.services.appfeatui.ApplicationTypeProperty;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed/IsisConfigurationRoleAndPermissions.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed/IsisConfigurationRoleAndPermissions.java
index 9e0c2f1..08cceaa 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed/IsisConfigurationRoleAndPermissions.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/role/seed/IsisConfigurationRoleAndPermissions.java
@@ -21,8 +21,6 @@ package org.apache.isis.extensions.secman.applib.role.seed;
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.confview.ConfigurationMenu;
-import org.apache.isis.applib.services.confview.ConfigurationProperty;
-import org.apache.isis.applib.services.confview.ConfigurationViewmodel;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.applib.permission.dom.ApplicationPermissionRule;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/ApplicationTenancy.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/ApplicationTenancy.java
index 593b363..6f5b2b5 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/ApplicationTenancy.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/tenancy/dom/ApplicationTenancy.java
@@ -28,11 +28,11 @@ import java.util.Comparator;
import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.util.Equality;
import org.apache.isis.applib.util.Hashing;
@@ -64,8 +64,7 @@ public abstract class ApplicationTenancy implements Comparable<ApplicationTenanc
// -- MODEL
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return getName();
}
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java
index 294cc77..5282c8a 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUser.java
@@ -40,7 +40,6 @@ import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.mixins.security.HasUsername;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java
index c60b871..61a103f 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/ApplicationUserRepositoryAbstract.java
@@ -23,9 +23,10 @@ import java.util.Collections;
import java.util.Optional;
import java.util.function.Consumer;
-import org.springframework.lang.Nullable;
import javax.inject.Inject;
+import org.springframework.lang.Nullable;
+
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.factory.FactoryService;
@@ -37,12 +38,12 @@ import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.extensions.secman.applib.SecmanConfiguration;
-import org.apache.isis.extensions.secman.applib.user.spi.PasswordEncryptionService;
import org.apache.isis.extensions.secman.applib.role.dom.ApplicationRole;
import org.apache.isis.extensions.secman.applib.tenancy.dom.ApplicationTenancy;
import org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_lock;
import org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_unlock;
import org.apache.isis.extensions.secman.applib.user.events.UserCreatedEvent;
+import org.apache.isis.extensions.secman.applib.user.spi.PasswordEncryptionService;
import org.apache.isis.extensions.secman.applib.util.RegexReplacer;
import lombok.NonNull;
diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_updatePassword.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_updatePassword.java
index 24cabdc..0208ba1 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_updatePassword.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_updatePassword.java
@@ -30,10 +30,10 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.value.Password;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.extensions.secman.applib.IsisModuleExtSecmanApplib;
-import org.apache.isis.extensions.secman.applib.user.spi.PasswordEncryptionService;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUserRepository;
import org.apache.isis.extensions.secman.applib.user.dom.mixins.ApplicationUser_updatePassword.DomainEvent;
+import org.apache.isis.extensions.secman.applib.user.spi.PasswordEncryptionService;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberInheritanceAbstract.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberInheritanceAbstract.java
index 9e9d110..571239a 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberInheritanceAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperMemberInheritanceAbstract.java
@@ -34,8 +34,7 @@ import lombok.Setter;
abstract class ProperMemberInheritanceAbstract {
- @Title
- public String title() {
+ @ObjectSupport public String title() {
return "inherited title";
}
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
index f40dfaf..14fb3e1 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java
@@ -135,8 +135,7 @@ public class ExcelDemoToDoItem implements Comparable<ExcelDemoToDoItem> /*, Cale
//region > title, iconName
- @Title
- public String title() {
+ @ObjectSupport public String title() {
final TitleBuffer buf = new TitleBuffer();
buf.append(getDescription());
if (isComplete()) {