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 2023/01/06 08:33:13 UTC
[isis] branch master updated (69e8e1882f -> c88472eb60)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from 69e8e1882f updates index.html; note re scaling of deployed apps (2)
add c56c0d4e93 ISIS-3309: [Demo] Object Layout Annotation: adding VM stubs
add 1e65127e5f ISIS-3318: simplified internal use of BookmarkPolicy
add 91bc4fe039 ISIS-3318: simplify BookmarkTreeNode
add c36df3b3d8 ISIS-3318: facet precedence from xml layout is either HIGH or LOW
add 2a63c7befd ISIS-3318: FacetUtil: honor facet precedence when updating facets
add 4a5171ac5e ISIS-3318: just typos and comments
add 9b326228cb ISIS-3318: hotfix for LayoutGroupFacetForLayoutXml - so can move on
add 56181e7ac8 ISIS-3318: minor comments
add 399e68180b ISIS-3318: demo: fixes bookmark parent/child relation showcase
new c88472eb60 Merge pull request #1321 from apache/3309-demo.obj.layout
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../causeway/applib/annotation/BookmarkPolicy.java | 7 +-
.../causeway/applib/layout/LayoutConstants.java | 6 +-
.../apache/causeway/applib/layout/grid/Grid.java | 11 +
.../causeway/applib/layout/grid/GridAbstract.java | 14 +-
.../core/metamodel/facetapi/FacetAbstract.java | 1 -
.../core/metamodel/facetapi/FacetUtil.java | 38 +-
.../metamodel/facets/SingleValueFacetAbstract.java | 14 +-
.../ActionPositionFacetForActionLayoutXml.java | 12 +-
.../BookmarkPolicyFacetForActionLayoutXml.java | 12 +-
.../layout/CssClassFaFacetForActionLayoutXml.java | 12 +-
.../layout/CssClassFacetForActionLayoutXml.java | 12 +-
.../layout/HiddenFacetForActionLayoutXml.java | 10 +-
.../MemberDescribedFacetForActionLayoutXml.java | 12 +-
.../layout/MemberNamedFacetForActionLayoutXml.java | 9 +-
.../layout/PromptStyleFacetForActionLayoutXml.java | 9 +-
.../layout/RedirectFacetFromActionLayoutXml.java | 9 +-
.../described/ObjectDescribedFacetAbstract.java | 12 +
.../CssClassFacetForCollectionLayoutXml.java | 10 +-
.../DefaultViewFacetForCollectionLayoutXml.java | 10 +-
.../layout/HiddenFacetForCollectionLayoutXml.java | 10 +-
...MemberDescribedFacetForCollectionLayoutXml.java | 10 +-
.../MemberNamedFacetForCollectionLayoutXml.java | 11 +-
.../layout/PagedFacetForCollectionLayoutXml.java | 10 +-
.../SortedByFacetForCollectionLayoutXml.java | 10 +-
...llectionLayoutTableDecorationFacetAbstract.java | 6 +
...TableDecorationFacetForCollectionLayoutXml.java | 10 +-
.../sortedby/SortedByFacetAbstract.java | 8 +-
.../layout/group/LayoutGroupFacetForLayoutXml.java | 17 +-
.../layout/order/LayoutOrderFacetAbstract.java | 7 +-
.../layout/order/LayoutOrderFacetForLayoutXml.java | 10 +-
...ookmarkPolicyFacetForDomainObjectLayoutXml.java | 12 +-
.../CssClassFaFacetForDomainObjectLayoutXml.java | 12 +-
.../CssClassFacetForDomainObjectLayoutXml.java | 13 +-
...jectDescribedFacetForDomainObjectLayoutXml.java | 11 +-
.../ObjectNamedFacetForDomainObjectLayoutXml.java | 12 +-
...inObjectLayoutTableDecorationFacetAbstract.java | 10 +-
...bleDecorationFacetForDomainObjectLayoutXml.java | 12 +-
.../facets/object/paged/PagedFacetAbstract.java | 7 +-
.../DateRenderAdjustFacetAbstract.java | 5 +
.../CssClassFacetForPropertyLayoutXml.java | 9 +-
.../HiddenFacetForPropertyLayoutXml.java | 10 +-
.../LabelAtFacetForPropertyLayoutXml.java | 10 +-
.../MemberDescribedFacetForPropertyLayoutXml.java | 11 +-
.../MemberNamedFacetForPropertyLayoutXml.java | 11 +-
.../MultiLineFacetForPropertyLayoutXml.java | 10 +-
.../PromptStyleFacetForPropertyLayoutXml.java | 10 +-
.../RenderedAdjustedFacetForPropertyLayoutXml.java | 10 +-
.../TypicalLengthFacetForPropertyLayoutXml.java | 10 +-
.../UnchangingFacetForPropertyLayoutXml.java | 10 +-
.../renderunchanged/UnchangingFacetAbstract.java | 6 +-
.../services/grid/GridSystemServiceAbstract.java | 387 +++++++++------------
.../grid/bootstrap/GridSystemServiceBootstrap.java | 8 +-
.../causeway/core/metamodel/util/Facets.java | 6 +-
.../bootstrap/MenuBarsServiceBootstrap.java | 37 +-
.../DomainObjectLayout/DomainObjectLayoutMenu.java | 2 +-
... => DomainObjectLayoutBookmarkingNestedVm.java} | 22 +-
...omainObjectLayoutBookmarkingVm-description.adoc | 7 +
.../DomainObjectLayoutBookmarkingVm.java | 20 +-
.../DomainObjectLayoutBookmarkingVm.layout.xml | 49 +++
.../DomainObjectLayoutCssClassVm-description.adoc | 6 +
.../cssClass/DomainObjectLayoutCssClassVm.java | 2 +-
.../DomainObjectLayoutCssClassVm.layout.xml | 49 +++
...DomainObjectLayoutCssClassFaVm-description.adoc | 6 +
.../cssClassFa/DomainObjectLayoutCssClassFaVm.java | 2 +-
.../DomainObjectLayoutCssClassFaVm.layout.xml | 49 +++
...omainObjectLayoutDescribedAsVm-description.adoc | 6 +
.../DomainObjectLayoutDescribedAsVm.java | 2 +-
.../DomainObjectLayoutDescribedAsVm.layout.xml | 49 +++
.../DomainObjectLayoutNamedVm-description.adoc | 6 +
.../named/DomainObjectLayoutNamedVm.java | 2 +-
.../named/DomainObjectLayoutNamedVm.layout.xml | 49 +++
.../DomainObjectLayoutPagedVm-description.adoc | 7 +
.../paged/DomainObjectLayoutPagedVm.java | 2 +-
.../paged/DomainObjectLayoutPagedVm.layout.xml | 49 +++
.../DomainObjectLayoutPluralVm-description.adoc | 7 +
.../plural/DomainObjectLayoutPluralVm.java | 2 +-
.../plural/DomainObjectLayoutPluralVm.layout.xml | 49 +++
...DomainObjectLayoutXxxUiEventVm-description.adoc | 6 +
.../xxxUiEvent/DomainObjectLayoutXxxUiEventVm.java | 2 +-
.../DomainObjectLayoutXxxUiEventVm.layout.xml | 49 +++
.../commons/model/action/HasManagedAction.java | 8 +-
.../wicket/model/models/ActionModelImpl.java | 5 +-
.../wicket/model/models/BookmarkTreeNode.java | 255 ++++++--------
.../model/models/BookmarkTreeNodeComparator.java | 60 ----
.../wicket/model/models/BookmarkableModel.java | 23 +-
.../wicket/model/models/BookmarkedPagesModel.java | 84 ++---
.../wicket/model/models/ManagedObjectModel.java | 13 -
.../viewer/wicket/model/models/UiObjectWkt.java | 18 +
.../interaction/HasBookmarkedOwnerAbstract.java | 13 +-
.../bookmarkedpages/BookmarkedPagesPanel.java | 2 +-
90 files changed, 1199 insertions(+), 751 deletions(-)
copy examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/{DomainObjectLayoutBookmarkingVm.java => DomainObjectLayoutBookmarkingNestedVm.java} (73%)
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/bookmarking/DomainObjectLayoutBookmarkingVm.layout.xml
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClass/DomainObjectLayoutCssClassVm.layout.xml
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFaVm.layout.xml
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsVm.layout.xml
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedVm.layout.xml
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPagedVm.layout.xml
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/plural/DomainObjectLayoutPluralVm.layout.xml
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/xxxUiEvent/DomainObjectLayoutXxxUiEventVm.layout.xml
delete mode 100644 viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
[isis] 01/01: Merge pull request #1321 from apache/3309-demo.obj.layout
Posted by ah...@apache.org.
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
commit c88472eb60794e4291f74bb7b9ad5f49a48cc964
Merge: 69e8e1882f 399e68180b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 6 09:33:08 2023 +0100
Merge pull request #1321 from apache/3309-demo.obj.layout
Demo: DomainObjectLayout showcases - (part 1 of more to come)
.../causeway/applib/annotation/BookmarkPolicy.java | 7 +-
.../causeway/applib/layout/LayoutConstants.java | 6 +-
.../apache/causeway/applib/layout/grid/Grid.java | 11 +
.../causeway/applib/layout/grid/GridAbstract.java | 14 +-
.../core/metamodel/facetapi/FacetAbstract.java | 1 -
.../core/metamodel/facetapi/FacetUtil.java | 38 +-
.../metamodel/facets/SingleValueFacetAbstract.java | 14 +-
.../ActionPositionFacetForActionLayoutXml.java | 12 +-
.../BookmarkPolicyFacetForActionLayoutXml.java | 12 +-
.../layout/CssClassFaFacetForActionLayoutXml.java | 12 +-
.../layout/CssClassFacetForActionLayoutXml.java | 12 +-
.../layout/HiddenFacetForActionLayoutXml.java | 10 +-
.../MemberDescribedFacetForActionLayoutXml.java | 12 +-
.../layout/MemberNamedFacetForActionLayoutXml.java | 9 +-
.../layout/PromptStyleFacetForActionLayoutXml.java | 9 +-
.../layout/RedirectFacetFromActionLayoutXml.java | 9 +-
.../described/ObjectDescribedFacetAbstract.java | 12 +
.../CssClassFacetForCollectionLayoutXml.java | 10 +-
.../DefaultViewFacetForCollectionLayoutXml.java | 10 +-
.../layout/HiddenFacetForCollectionLayoutXml.java | 10 +-
...MemberDescribedFacetForCollectionLayoutXml.java | 10 +-
.../MemberNamedFacetForCollectionLayoutXml.java | 11 +-
.../layout/PagedFacetForCollectionLayoutXml.java | 10 +-
.../SortedByFacetForCollectionLayoutXml.java | 10 +-
...llectionLayoutTableDecorationFacetAbstract.java | 6 +
...TableDecorationFacetForCollectionLayoutXml.java | 10 +-
.../sortedby/SortedByFacetAbstract.java | 8 +-
.../layout/group/LayoutGroupFacetForLayoutXml.java | 17 +-
.../layout/order/LayoutOrderFacetAbstract.java | 7 +-
.../layout/order/LayoutOrderFacetForLayoutXml.java | 10 +-
...ookmarkPolicyFacetForDomainObjectLayoutXml.java | 12 +-
.../CssClassFaFacetForDomainObjectLayoutXml.java | 12 +-
.../CssClassFacetForDomainObjectLayoutXml.java | 13 +-
...jectDescribedFacetForDomainObjectLayoutXml.java | 11 +-
.../ObjectNamedFacetForDomainObjectLayoutXml.java | 12 +-
...inObjectLayoutTableDecorationFacetAbstract.java | 10 +-
...bleDecorationFacetForDomainObjectLayoutXml.java | 12 +-
.../facets/object/paged/PagedFacetAbstract.java | 7 +-
.../DateRenderAdjustFacetAbstract.java | 5 +
.../CssClassFacetForPropertyLayoutXml.java | 9 +-
.../HiddenFacetForPropertyLayoutXml.java | 10 +-
.../LabelAtFacetForPropertyLayoutXml.java | 10 +-
.../MemberDescribedFacetForPropertyLayoutXml.java | 11 +-
.../MemberNamedFacetForPropertyLayoutXml.java | 11 +-
.../MultiLineFacetForPropertyLayoutXml.java | 10 +-
.../PromptStyleFacetForPropertyLayoutXml.java | 10 +-
.../RenderedAdjustedFacetForPropertyLayoutXml.java | 10 +-
.../TypicalLengthFacetForPropertyLayoutXml.java | 10 +-
.../UnchangingFacetForPropertyLayoutXml.java | 10 +-
.../renderunchanged/UnchangingFacetAbstract.java | 6 +-
.../services/grid/GridSystemServiceAbstract.java | 387 +++++++++------------
.../grid/bootstrap/GridSystemServiceBootstrap.java | 8 +-
.../causeway/core/metamodel/util/Facets.java | 6 +-
.../bootstrap/MenuBarsServiceBootstrap.java | 37 +-
.../DomainObjectLayout/DomainObjectLayoutMenu.java | 2 +-
... => DomainObjectLayoutBookmarkingNestedVm.java} | 22 +-
...omainObjectLayoutBookmarkingVm-description.adoc | 7 +
.../DomainObjectLayoutBookmarkingVm.java | 20 +-
.../DomainObjectLayoutBookmarkingVm.layout.xml | 49 +++
.../DomainObjectLayoutCssClassVm-description.adoc | 6 +
.../cssClass/DomainObjectLayoutCssClassVm.java | 2 +-
.../DomainObjectLayoutCssClassVm.layout.xml | 49 +++
...DomainObjectLayoutCssClassFaVm-description.adoc | 6 +
.../cssClassFa/DomainObjectLayoutCssClassFaVm.java | 2 +-
.../DomainObjectLayoutCssClassFaVm.layout.xml | 49 +++
...omainObjectLayoutDescribedAsVm-description.adoc | 6 +
.../DomainObjectLayoutDescribedAsVm.java | 2 +-
.../DomainObjectLayoutDescribedAsVm.layout.xml | 49 +++
.../DomainObjectLayoutNamedVm-description.adoc | 6 +
.../named/DomainObjectLayoutNamedVm.java | 2 +-
.../named/DomainObjectLayoutNamedVm.layout.xml | 49 +++
.../DomainObjectLayoutPagedVm-description.adoc | 7 +
.../paged/DomainObjectLayoutPagedVm.java | 2 +-
.../paged/DomainObjectLayoutPagedVm.layout.xml | 49 +++
.../DomainObjectLayoutPluralVm-description.adoc | 7 +
.../plural/DomainObjectLayoutPluralVm.java | 2 +-
.../plural/DomainObjectLayoutPluralVm.layout.xml | 49 +++
...DomainObjectLayoutXxxUiEventVm-description.adoc | 6 +
.../xxxUiEvent/DomainObjectLayoutXxxUiEventVm.java | 2 +-
.../DomainObjectLayoutXxxUiEventVm.layout.xml | 49 +++
.../commons/model/action/HasManagedAction.java | 8 +-
.../wicket/model/models/ActionModelImpl.java | 5 +-
.../wicket/model/models/BookmarkTreeNode.java | 255 ++++++--------
.../model/models/BookmarkTreeNodeComparator.java | 60 ----
.../wicket/model/models/BookmarkableModel.java | 23 +-
.../wicket/model/models/BookmarkedPagesModel.java | 84 ++---
.../wicket/model/models/ManagedObjectModel.java | 13 -
.../viewer/wicket/model/models/UiObjectWkt.java | 18 +
.../interaction/HasBookmarkedOwnerAbstract.java | 13 +-
.../bookmarkedpages/BookmarkedPagesPanel.java | 2 +-
90 files changed, 1199 insertions(+), 751 deletions(-)