You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/01/17 16:48:22 UTC
[isis] branch maint-1.16.1 updated (4445703 -> e21fef1)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 4445703 ISIS-1808: extends Ticket (response of ErrorReportingService) to allow a "kitten URL" to optionally be returned.
add f6aa70c ISIS-1743 fa-Icon mapping for mixins using '$$' method names
add df1e555 ISIS-1743: also supports mixins specified using @Mixin(method="...") eg "act" or "coll" as well as the default "$$"
add 5badcf2 ISIS-1743: removes some unused imports from HelloWorldObject
add 5c72372 Merge branch 'ISIS-1743' into maint-1.16.1
new 4c55ccf ISIS-1743: fixes backport issue
new e21fef1 Merge branch 'ISIS-1743' into maint-1.16.1
The 2 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:
.../annotprop/CssClassFaFacetOnMemberFactory.java | 7 +--
.../cssclassfa/annotprop/MixinInterceptor.java | 64 ++++++++++++++++++++++
.../specloader/specimpl/ObjectMemberAbstract.java | 14 ++---
.../specimpl/ObjectActionMixedInTest.java | 10 ++--
.../specimpl/ObjectMemberAbstractTest.java | 25 +++++++++
.../java/domainapp/dom/impl/HelloWorldObject.java | 1 +
6 files changed, 103 insertions(+), 18 deletions(-)
create mode 100644 core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
create mode 100644 core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectMemberAbstractTest.java
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].
[isis] 01/02: ISIS-1743: fixes backport issue
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4c55ccf7332eb1b241846f737cfe8d8a032108d2
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 17 16:47:43 2018 +0000
ISIS-1743: fixes backport issue
---
.../facets/members/cssclassfa/annotprop/MixinInterceptor.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
index 689e01e..18b5866 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/MixinInterceptor.java
@@ -45,12 +45,11 @@ class MixinInterceptor {
static String intendedNameOf(Method method) {
final Class<?> declaringClass = method.getDeclaringClass();
- final List<Mixin> mixins = Annotations.getAnnotations(declaringClass, Mixin.class);
- final Optional<Mixin> mixinIfAny = mixins.stream().findFirst();
+ final Mixin mixin = Annotations.getAnnotation(declaringClass, Mixin.class);
- if(mixinIfAny.isPresent()) {
+ if(mixin != null) {
final String methodName = method.getName();
- final String mixinAnnotMethodName = mixinIfAny.get().method();
+ final String mixinAnnotMethodName = mixin.method();
if(mixinAnnotMethodName.equals(methodName)) {
final String mixinMethodName = ObjectMemberAbstract.deriveMemberNameFrom(method.getDeclaringClass().getName());
if(mixinMethodName!=null) {
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 02/02: Merge branch 'ISIS-1743' into maint-1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch maint-1.16.1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e21fef1c69a6683ee1b7a7e95e231723aa069bb2
Merge: 5c72372 4c55ccf
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 17 16:48:00 2018 +0000
Merge branch 'ISIS-1743' into maint-1.16.1
.../facets/members/cssclassfa/annotprop/MixinInterceptor.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.