This is an automated email from the ASF dual-hosted git repository.

joergrade pushed a change to branch CAUSEWAY-3428
in repository https://gitbox.apache.org/repos/asf/causeway.git


    from d163a9d222 Merge remote-tracking branch 'origin/CAUSEWAY-3428' into 
CAUSEWAY-3428
     add 549f5a40e4 CAUSEWAY-2485: reworks @Action#describedAs
     add 90e2b10047 Merge branch 'master' into CAUSEWAY-3428

No new revisions were added by this update.

Summary of changes:
 .../actions/ActionLayout/ActionLayoutMenu.java     |   2 +
 .../ActionLayoutAssociateWithPage-description.adoc |  64 ++++++++++
 .../ActionLayoutAssociateWithPage.layout.xml       |   2 +-
 .../ActionLayoutCssClassPage-description.adoc      |   1 +
 .../cssClass/ActionLayoutCssClassPage.java         |   1 +
 .../cssClass/ActionLayoutCssClassPage.layout.xml   |  19 +--
 .../ActionLayoutCssClassFaPage-description.adoc    |   2 +-
 .../ActionLayoutCssClassFaPage.layout.xml          |  19 +--
 .../ActionLayoutDescribedAsPage-description.adoc   |  62 +++++++++-
 .../describedAs/ActionLayoutDescribedAsPage.java   | 131 ++++++++++++++++++---
 .../ActionLayoutDescribedAsPage.layout.xml         |  28 ++---
 ...ctionLayoutDescribedAsChildVm-description.adoc} |   2 +-
 .../child/ActionLayoutDescribedAsChildVm.java}     |  12 +-
 .../ActionLayoutDescribedAsChildVm.layout.xml}     |   0
 14 files changed, 264 insertions(+), 81 deletions(-)
 copy 
examples/demo/domain/src/main/java/demoapp/dom/domain/actions/{Action/typeOf/child/ActionTypeOfChildVm-description.adoc
 => 
ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm-description.adoc} 
(93%)
 copy 
examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/{associateWith/child/ActionLayoutAssociateWithChildVm.java
 => describedAs/child/ActionLayoutDescribedAsChildVm.java} (81%)
 copy 
examples/demo/domain/src/main/java/demoapp/dom/domain/actions/{Action/typeOf/child/ActionTypeOfChildVm.layout.xml
 => ActionLayout/describedAs/child/ActionLayoutDescribedAsChildVm.layout.xml} 
(100%)

Reply via email to