You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jc...@apache.org on 2013/11/06 21:10:30 UTC
git commit: ISIS-583: contributed collections honour the @Render
annotation
Updated Branches:
refs/heads/master cfcb54662 -> e78ec61e0
ISIS-583: contributed collections honour the @Render annotation
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e78ec61e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e78ec61e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e78ec61e
Branch: refs/heads/master
Commit: e78ec61e009dd8237ebbe1272d58ebecd8e2022b
Parents: cfcb546
Author: Jeroen van der Wal <je...@stromboli.it>
Authored: Wed Nov 6 21:03:14 2013 +0100
Committer: Jeroen van der Wal <je...@stromboli.it>
Committed: Wed Nov 6 21:03:14 2013 +0100
----------------------------------------------------------------------
.../specloader/specimpl/OneToManyAssociationContributee.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e78ec61e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
index 203f0af..95046b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationContributee.java
@@ -40,6 +40,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
import org.apache.isis.core.progmodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.core.progmodel.facets.members.disabled.DisabledFacetImpl;
+import org.apache.isis.core.progmodel.facets.members.resolve.RenderFacetAnnotation;
public class OneToManyAssociationContributee extends OneToManyAssociationImpl implements ContributeeMember {
@@ -72,12 +73,10 @@ public class OneToManyAssociationContributee extends OneToManyAssociationImpl im
// copy over facets from contributed to own.
FacetUtil.copyFacets(serviceAction.getFacetedMethod(), facetHolder);
- final RenderFacet renderFacet = new RenderFacetAbstract(Render.Type.EAGERLY, this) {};
final NotPersistedFacet notPersistedFacet = new NotPersistedFacetAbstract(this) {};
final DisabledFacet disabledFacet = disabledFacet();
final TypeOfFacet typeOfFacet = new TypeOfFacetAbstract(getSpecification().getCorrespondingClass(), this, objectMemberContext.getSpecificationLookup()) {};
- FacetUtil.addFacet(renderFacet);
FacetUtil.addFacet(notPersistedFacet);
FacetUtil.addFacet(disabledFacet);
FacetUtil.addFacet(typeOfFacet);