You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/11/12 21:01:47 UTC
[05/50] [abbrv] isis git commit: ISIS-1213: shouldn't be able to
contribute or mixin to another mixin.
ISIS-1213: shouldn't be able to contribute or mixin to another mixin.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f37ea89e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f37ea89e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f37ea89e
Branch: refs/heads/ISIS-1224-select2-v4
Commit: f37ea89eb40e09cc2afce1745c963989c6234777
Parents: acf1860
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Nov 4 15:13:26 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Nov 4 15:13:26 2015 +0000
----------------------------------------------------------------------
.../specloader/specimpl/ObjectSpecificationAbstract.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f37ea89e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index fd6bf5c..d2fa3c6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -741,8 +741,12 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
if(contributed.isIncluded() && !contributeeAndMixedInActionsAdded) {
synchronized (this.objectActions) {
final List<ObjectAction> actions = Lists.newArrayList(this.objectActions);
- actions.addAll(createContributeeActions());
- actions.addAll(createMixedInActions());
+ if (containsDoOpFacet(MixinFacet.class)) {
+ // don't contribute to mixins themselves!
+ } else {
+ actions.addAll(createContributeeActions());
+ actions.addAll(createMixedInActions());
+ }
sortCacheAndUpdateActions(actions);
contributeeAndMixedInActionsAdded = true;
}