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 e202fee19b Merge pull request #1371 from myroch/master
add 79277e6fd3 ISIS-3329: [Applib] Refactor
DomainObjectLayout#tableDecoration to allow Customization
add a077d62973 Merge remote-tracking branch 'origin/master' into
3329-applib.tabledeco
add 85758cf6ff ISIS-3329: rename all tableDecoration to tableDecorator
add 08250363c0 ISIS-3329: mm reg test approval
add ee925ae049 ISIS-3329: consolidate static header gen. into
WicketApplicationInitializer
new 61aa7f4546 Merge pull request #1373 from apache/3329-applib.tabledeco
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:
.../applib/annotation/CollectionLayout.java | 6 +-
.../applib/annotation/DomainObjectLayout.java | 7 +-
.../applib/annotation/TableDecoration.java | 60 -
.../causeway/applib/annotation/TableDecorator.java | 89 ++
.../layout/component/CollectionLayoutData.java | 13 +-
.../layout/component/DomainObjectLayoutData.java | 13 +-
.../applib/layout/component/TableDecoration.java | 31 -
.../core/config/CausewayConfiguration.java | 51 +-
.../facets/CollectionLayoutConfigOptions.java | 39 -
.../facets/DomainObjectLayoutConfigOptions.java | 53 -
.../layout/CollectionLayoutFacetFactory.java | 4 +-
.../PagedFacetForCollectionLayoutAnnotation.java | 7 +-
...va => CollectionLayoutTableDecoratorFacet.java} | 33 +-
...llectionLayoutTableDecoratorFacetAbstract.java} | 18 +-
...coratorFacetForCollectionLayoutAnnotation.java} | 10 +-
...ForCollectionLayoutAnnotationAsConfigured.java} | 10 +-
...TableDecoratorFacetForCollectionLayoutXml.java} | 34 +-
...ayoutTableDecoratorFacetFromConfiguration.java} | 10 +-
.../DomainObjectLayoutFacetFactory.java | 4 +-
.../PagedFacetForDomainObjectLayoutAnnotation.java | 7 +-
... => DomainObjectLayoutTableDecoratorFacet.java} | 35 +-
...inObjectLayoutTableDecoratorFacetAbstract.java} | 18 +-
...ratorFacetForDomainObjectLayoutAnnotation.java} | 10 +-
...rDomainObjectLayoutAnnotationAsConfigured.java} | 10 +-
...bleDecoratorFacetForDomainObjectLayoutXml.java} | 33 +-
...ayoutTableDecoratorFacetFromConfiguration.java} | 10 +-
.../services/grid/GridSystemServiceAbstract.java | 8 +-
.../core/metamodel/spec/feature/ObjectMember.java | 3 +-
.../causeway/core/metamodel/util/Facets.java | 26 +-
.../DomainObjectLayout/DomainObjectLayoutMenu.java | 8 +
.../plural/DomainObjectLayoutPluralVm.java | 2 -
...inObjectLayoutTableDecoratorVm-description.adoc | 4 +
.../DomainObjectLayoutTableDecoratorVm.java} | 35 +-
.../DomainObjectLayoutTableDecoratorVm.layout.xml} | 0
.../src/main/java/demoapp/dom/menubars.layout.xml | 1 +
.../MetaModelRegressionTest.verify.approved.xml | 1374 ++++++++++----------
.../entity/collection/EntityCollectionPanel.java | 31 +-
.../StandaloneCollectionPanel.java | 31 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 11 -
.../DatatablesJavaScriptResourceReferenceInit.java | 77 --
.../common/datatables/dataTables.init.js.template | 28 -
.../viewer/wicket/ui/panels/PanelAbstract.java | 15 +
.../apache/causeway/viewer/wicket/ui/util/Wkt.java | 6 +
.../viewer/CausewayModuleViewerWicketViewer.java | 2 +
.../wicketapp/config/DatatableNetInitWkt.java | 55 +
45 files changed, 1105 insertions(+), 1227 deletions(-)
delete mode 100644
api/applib/src/main/java/org/apache/causeway/applib/annotation/TableDecoration.java
create mode 100644
api/applib/src/main/java/org/apache/causeway/applib/annotation/TableDecorator.java
delete mode 100644
api/applib/src/main/java/org/apache/causeway/applib/layout/component/TableDecoration.java
delete mode 100644
core/config/src/main/java/org/apache/causeway/core/config/metamodel/facets/DomainObjectLayoutConfigOptions.java
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/{CollectionLayoutTableDecorationFacet.java
=> CollectionLayoutTableDecoratorFacet.java} (53%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/{CollectionLayoutTableDecorationFacetAbstract.java
=> CollectionLayoutTableDecoratorFacetAbstract.java} (66%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/{CollectionLayoutTableDecorationFacetFromConfiguration.java
=> CollectionLayoutTableDecoratorFacetForCollectionLayoutAnnotation.java} (73%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/{CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotationAsConfigured.java
=>
CollectionLayoutTableDecoratorFacetForCollectionLayoutAnnotationAsConfigured.java}
(69%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/{CollectionLayoutTableDecorationFacetForCollectionLayoutXml.java
=> CollectionLayoutTableDecoratorFacetForCollectionLayoutXml.java} (52%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/layout/tabledec/{CollectionLayoutTableDecorationFacetForCollectionLayoutAnnotation.java
=> CollectionLayoutTableDecoratorFacetFromConfiguration.java} (72%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/{DomainObjectLayoutTableDecorationFacet.java
=> DomainObjectLayoutTableDecoratorFacet.java} (52%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/{DomainObjectLayoutTableDecorationFacetAbstract.java
=> DomainObjectLayoutTableDecoratorFacetAbstract.java} (69%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/{DomainObjectLayoutTableDecorationFacetFromConfiguration.java
=> DomainObjectLayoutTableDecoratorFacetForDomainObjectLayoutAnnotation.java}
(73%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/{DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotation.java
=>
DomainObjectLayoutTableDecoratorFacetForDomainObjectLayoutAnnotationAsConfigured.java}
(71%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/{DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutXml.java
=> DomainObjectLayoutTableDecoratorFacetForDomainObjectLayoutXml.java} (56%)
rename
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobjectlayout/tabledec/{DomainObjectLayoutTableDecorationFacetForDomainObjectLayoutAnnotationAsConfigured.java
=> DomainObjectLayoutTableDecoratorFacetFromConfiguration.java} (69%)
create mode 100644
examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecoratorVm-description.adoc
copy
examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/{plural/DomainObjectLayoutPluralVm.java
=> tabledec/DomainObjectLayoutTableDecoratorVm.java} (63%)
copy
examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/{bookmarking/DomainObjectLayoutBookmarkingVm.layout.xml
=> tabledec/DomainObjectLayoutTableDecoratorVm.layout.xml} (100%)
delete mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
delete mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/datatables/dataTables.init.js.template
create mode 100644
viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/config/DatatableNetInitWkt.java
