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
commit 88665f627db142b411948a13f28bb1e789093cb9 Merge: ce0c4c5 826726c Author: Dan Haywood <d...@haywood-associates.co.uk> AuthorDate: Fri Feb 23 00:57:09 2018 +0000 Merge branch 'maint-1.16.2' STATUS | 8 +++ adocs/documentation/pom-pdf.xml | 2 +- .../documentation/src/main/asciidoc/doap_isis.rdf | 24 +++++++ .../documentation/src/main/asciidoc/downloads.adoc | 12 ++-- .../guides/cgcom/_cgcom_cutting-a-release.adoc | 2 +- .../cgcom/_cgcom_post-release-successful.adoc | 41 ++++++++--- ...cgcom_release-process-for-interim-releases.adoc | 12 ++-- .../guides/cgcom/_cgcom_verifying-releases.adoc | 19 ++--- ...ugfun_getting-started_helloworld-archetype.adoc | 2 +- ..._ugfun_getting-started_simpleapp-archetype.adoc | 2 +- adocs/documentation/src/main/asciidoc/index.html | 71 +++++++++++++------ .../src/main/asciidoc/pages/tg/tg.adoc | 2 +- .../release-notes/_release-notes_1.13.0.adoc | 2 +- .../release-notes/_release-notes_1.16.1.adoc | 80 ++++++++++++++++++++++ .../main/asciidoc/release-notes/release-notes.adoc | 10 +-- adocs/template/document.html.erb | 2 +- .../cssclassfa/annotprop/MixinInterceptor.java | 4 +- ...onParameterDefaultsAndChoicesPostProcessor.java | 2 +- .../core/metamodel/spec/feature/ObjectAction.java | 29 +++++--- core/pom.xml | 23 +++++-- .../runtime/services/ServiceInstantiatorTest.java | 27 ++++---- .../wicket/model/mementos/CollectionMemento.java | 25 ++++--- .../wicket/model/models/EntityCollectionModel.java | 12 +++- .../collection/AssociatedWithActionsHelper.java | 8 ++- example/application/simpleapp/README.adoc | 2 +- example/archetype/helloworld/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 3 +- .../java/domainapp/dom/impl/HelloWorldObject.java | 1 + .../resources/projects/basic/archetype.properties | 2 +- .../main/resources/archetype-resources/README.adoc | 2 +- .../bdd/specglue/BootstrappingGlue.java | 16 ++++- .../{RunBddSpecs.java => RunIntegBddSpecs.java} | 2 +- .../modules/simple/dom/impl/SimpleObject.java | 3 +- .../simple/dom/impl/SimpleObject.layout.xml | 6 +- .../src/main/resources/archetype-resources/pom.xml | 3 +- .../resources/projects/basic/archetype.properties | 2 +- 36 files changed, 344 insertions(+), 121 deletions(-) diff --cc core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java index f8166ee,acdc126..22e1d14 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java @@@ -380,8 -385,41 +380,8 @@@ public interface ObjectAction extends O private Predicates() { } - public static Predicate<ObjectAction> associatedWith(final String collectionName) { - return new AssociatedWith(collectionName); - public static Predicate<ObjectAction> dynamicallyVisible( - final ObjectAdapter target, - final InteractionInitiatedBy interactionInitiatedBy, - final Where where) { - return org.apache.isis.applib.filter.Filters - .asPredicate(Filters.dynamicallyVisible(target, interactionInitiatedBy, where)); - } - - public static Predicate<ObjectAction> withId(final String actionId) { - return org.apache.isis.applib.filter.Filters.asPredicate(Filters.withId(actionId)); - } - - public static Predicate<ObjectAction> withNoValidationRules() { - return org.apache.isis.applib.filter.Filters.asPredicate(Filters.withNoValidationRules()); - } - - public static Predicate<ObjectAction> ofType(final ActionType type) { - return org.apache.isis.applib.filter.Filters.asPredicate(Filters.ofType(type)); - } - - public static Predicate<ObjectAction> bulk() { - return org.apache.isis.applib.filter.Filters.asPredicate(Filters.bulk()); - } - - // UNUSED? - public static Predicate<ObjectAction> notBulkOnly() { - return org.apache.isis.applib.filter.Filters.asPredicate(Filters.notBulkOnly()); - } - - public static Predicate<ObjectAction> memberOrderOf(ObjectAssociation association) { - return org.apache.isis.applib.filter.Filters.asPredicate(Filters.memberOrderOf(association)); - } - + public static Predicate<ObjectAction> associatedWith(final ObjectAssociation objectAssociation) { + return new AssociatedWith(objectAssociation); } public static Predicate<ObjectAction> associatedWithAndWithCollectionParameterFor( -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.