This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push: new 0a1b384cc8 ISIS-3193: regenerate docs is all. 0a1b384cc8 is described below commit 0a1b384cc8f8ba89279dd77b875987476f341c4d Author: Dan Haywood <d...@haywood-associates.co.uk> AuthorDate: Tue Aug 30 12:11:50 2022 +0100 ISIS-3193: regenerate docs is all. --- .../modules/applib/pages/index/annotation/Action.adoc | 11 ----------- .../pages/index/annotation/DependentDefaultsPolicy.adoc | 8 ++++---- .../modules/applib/pages/index/annotation/Parameter.adoc | 11 +++++++++++ .../core/pages/index/metamodel/object/ManagedObject.adoc | 12 +++++++++++- core/adoc/modules/_overview/pages/about.adoc | 2 +- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc index b3cd8675e4..e9dc151a06 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Action.adoc @@ -20,7 +20,6 @@ Groups together all domain-specific metadata for an invokable action on a domain Class<?> typeOf() default // represents unspecified void.class; // <.> String fileAccept() default ""; // <.> - DependentDefaultsPolicy dependentDefaultsPolicy() default DependentDefaultsPolicy.AS_CONFIGURED; // <.> } ---- @@ -74,11 +73,6 @@ If the action returns a collection, then this hints as to the run-time type of t -- For downloading xref:refguide:applib:index/value/Blob.adoc[Blob] or xref:refguide:applib:index/value/Clob.adoc[Clob] , optionally restrict the files accepted (eg `.xslx` ). -- -<.> xref:#dependentDefaultsPolicy[dependentDefaultsPolicy] -+ --- -Whether dependent parameters should be reset to their default if an earlier parameter changes its value, or whether instead a parameter value, once changed by the end-user, should never be overwritten even if the end-user changes an earlier parameter value. --- == Members @@ -169,11 +163,6 @@ For downloading xref:refguide:applib:index/value/Blob.adoc[Blob] or xref:refguid The value should be of the form "file_extension|audio/*|video/*|image/*|media_type". -[#dependentDefaultsPolicy] -=== dependentDefaultsPolicy - -Whether dependent parameters should be reset to their default if an earlier parameter changes its value, or whether instead a parameter value, once changed by the end-user, should never be overwritten even if the end-user changes an earlier parameter value. - include::hooks/Action_010-examples-and-usage.adoc[] include::hooks/Action_021-associating.adoc[] diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/DependentDefaultsPolicy.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/DependentDefaultsPolicy.adoc index b757998177..59932f62ac 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/annotation/DependentDefaultsPolicy.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/DependentDefaultsPolicy.adoc @@ -24,12 +24,12 @@ The policy to use should be as per the default defaults policy configured in `ap <.> xref:#PRESERVE_CHANGES[PRESERVE_CHANGES] + -- -If an end-user has changed a parameter value, then do not overwrite the value. +If an end-user has changed this parameter's value, then do not overwrite the value when an earlier parameter changes. -- <.> xref:#UPDATE_DEPENDENT[UPDATE_DEPENDENT] + -- -If the parameter declares a default that is dependent on the value of a previous parameter, and that previous parameter changes its value, then update the dependent, _even if_ the end-user had changed the value of that dependent default. +If this parameter declares a default that is dependent on the value of a previous parameter, and that previous parameter has been changed by the end-user, then update this dependent parameter with its computed default, _even if_ the end-user has changed the value of this parameter previously. -- <.> xref:#NOT_SPECIFIED[NOT_SPECIFIED] + @@ -49,12 +49,12 @@ If no defaults policy is configured, then default to the _DependentDefaultsPolic [#PRESERVE_CHANGES] === PRESERVE_CHANGES -If an end-user has changed a parameter value, then do not overwrite the value. +If an end-user has changed this parameter's value, then do not overwrite the value when an earlier parameter changes. [#UPDATE_DEPENDENT] === UPDATE_DEPENDENT -If the parameter declares a default that is dependent on the value of a previous parameter, and that previous parameter changes its value, then update the dependent, _even if_ the end-user had changed the value of that dependent default. +If this parameter declares a default that is dependent on the value of a previous parameter, and that previous parameter has been changed by the end-user, then update this dependent parameter with its computed default, _even if_ the end-user has changed the value of this parameter previously. [#NOT_SPECIFIED] === NOT_SPECIFIED diff --git a/antora/components/refguide-index/modules/applib/pages/index/annotation/Parameter.adoc b/antora/components/refguide-index/modules/applib/pages/index/annotation/Parameter.adoc index a3f8273244..b475531a3e 100644 --- a/antora/components/refguide-index/modules/applib/pages/index/annotation/Parameter.adoc +++ b/antora/components/refguide-index/modules/applib/pages/index/annotation/Parameter.adoc @@ -16,6 +16,7 @@ Collects together all domain semantics of an action parameter within a single an String regexPattern() default ""; // <.> int regexPatternFlags() default 0; // <.> String regexPatternReplacement() default "Doesn't match pattern"; // <.> + DependentDefaultsPolicy dependentDefaultsPolicy() default DependentDefaultsPolicy.AS_CONFIGURED; // <.> } ---- @@ -54,6 +55,11 @@ Pattern flags, as per _java.util.regex.Pattern#compile(String, int)_ . -- Replacement text for the pattern in generated error message. -- +<.> xref:#dependentDefaultsPolicy[dependentDefaultsPolicy] ++ +-- +Whether this parameter should be reset to its default if an earlier parameter changes its value, or whether instead the parameter's value, once changed by the end-user, should never be overwritten even if the end-user changes an earlier parameter value. +-- == Members @@ -104,6 +110,11 @@ The default value, `0` , means that no flags have been specified. Replacement text for the pattern in generated error message. +[#dependentDefaultsPolicy] +=== dependentDefaultsPolicy + +Whether this parameter should be reset to its default if an earlier parameter changes its value, or whether instead the parameter's value, once changed by the end-user, should never be overwritten even if the end-user changes an earlier parameter value. + include::hooks/Parameter_010-examples-and-usage.adoc[] include::hooks/Parameter_021-optionality.adoc[] diff --git a/antora/components/refguide-index/modules/core/pages/index/metamodel/object/ManagedObject.adoc b/antora/components/refguide-index/modules/core/pages/index/metamodel/object/ManagedObject.adoc index edb96ac3fd..aa69dbcb8c 100644 --- a/antora/components/refguide-index/modules/core/pages/index/metamodel/object/ManagedObject.adoc +++ b/antora/components/refguide-index/modules/core/pages/index/metamodel/object/ManagedObject.adoc @@ -17,7 +17,7 @@ interface ManagedObject { void refreshViewmodel(Supplier<Bookmark> bookmarkSupplier) // <.> boolean isBookmarkMemoized() Supplier<ManagedObject> asSupplier() - void assertSpecIsInSyncWithPojo() + T assertCompliance(T pojo) // <.> String titleString(UnaryOperator<TitleRenderRequest.TitleRenderRequestBuilder> onBuilder) String titleString() Optional<ObjectSpecification> getElementSpecification() // <.> @@ -70,6 +70,11 @@ Similar to _#getBookmark()_ , but invalidates any memoized xref:refguide:applib: -- If the underlying domain object is a viewmodel, refreshes any referenced entities. (Acts as a no-op otherwise.) -- +<.> xref:#assertCompliance_T[assertCompliance(T)] ++ +-- +Unary operator asserting that _pojo_ and _#getSpecification()_ are compliant with the policies from _#getSpecialization()_ . +-- <.> xref:#getElementSpecification_[getElementSpecification()] + -- @@ -173,6 +178,11 @@ Similar to _#getBookmark()_ , but invalidates any memoized xref:refguide:applib: If the underlying domain object is a viewmodel, refreshes any referenced entities. (Acts as a no-op otherwise.) +[#assertCompliance_T] +=== assertCompliance(T) + +Unary operator asserting that _pojo_ and _#getSpecification()_ are compliant with the policies from _#getSpecialization()_ . + [#getElementSpecification_] === getElementSpecification() diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc index 6a6d992b8d..6aaa2bb073 100644 --- a/core/adoc/modules/_overview/pages/about.adoc +++ b/core/adoc/modules/_overview/pages/about.adoc @@ -4542,7 +4542,7 @@ Directory: /extensions/vw/pdfjs/wicket/integration org.apache.isis.extensions:isis-extensions-pdfjs-applib:jar:<managed> + org.apache.isis.viewer:isis-viewer-wicket-ui:jar:<managed> + org.webjars.bowergithub.mozilla:pdfjs-dist:jar:1.10.100 + -org.webjars.npm:pdfjs-dist:jar:2.14.305 + +org.webjars.npm:pdfjs-dist:jar:2.15.349 + **** .Document Index Entries