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 2015/10/16 12:07:27 UTC
[2/2] isis git commit: ISIS-1213: mixed actions should be
automatically contributed as both actions and associations unless
@ActionLayout is used to restrict their applicability.
ISIS-1213: mixed actions should be automatically contributed as both actions and associations unless @ActionLayout is used to restrict their applicability.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0a77fae8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0a77fae8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0a77fae8
Branch: refs/heads/master
Commit: 0a77fae81269a3919160c5cb054da9e1674b2b3f
Parents: 3fa87f4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Oct 16 10:37:07 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 16 10:37:07 2015 +0100
----------------------------------------------------------------------
.../org/apache/isis/applib/annotation/NotContributed.java | 3 ++-
.../derived/NotContributedFacetDerivedFromMixinFacet.java | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0a77fae8/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
index 5e37325..0ea2741 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/NotContributed.java
@@ -55,7 +55,8 @@ public @interface NotContributed {
public enum As {
ACTION,
ASSOCIATION,
- EITHER;
+ EITHER,
+ NEITHER; /* ie contributed as both ! */
/**
* @deprecated
http://git-wip-us.apache.org/repos/asf/isis/blob/0a77fae8/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
index ba6f38f..8e8fea3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
@@ -18,15 +18,20 @@
*/
package org.apache.isis.core.metamodel.facets.actions.notcontributed.derived;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.NotContributed;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
+/**
+ * By default, any mixin actions are contributed as both actions and associations. This can be overridden using
+ * {@link ActionLayout#contributed()}.
+ */
public class NotContributedFacetDerivedFromMixinFacet extends NotContributedFacetAbstract {
public NotContributedFacetDerivedFromMixinFacet(
final FacetHolder holder) {
- super(NotContributed.As.EITHER, holder, Derivation.DERIVED);
+ super(NotContributed.As.NEITHER, holder, Derivation.DERIVED);
}
}