ISIS-1027: allow @PropertyLayout and @CollectionLayout be applied to actions also (ie when contributed).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6efc6595 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6efc6595 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6efc6595 Branch: refs/heads/master Commit: 6efc6595db6f26132fcbfa3b41b86910e544d376 Parents: 9c35d46 Author: Dan Haywood <[email protected]> Authored: Fri Feb 6 18:03:56 2015 +0000 Committer: Dan Haywood <[email protected]> Committed: Fri Feb 6 18:03:56 2015 +0000 ---------------------------------------------------------------------- .../facets/collections/layout/CollectionLayoutFacetFactory.java | 2 +- .../properties/propertylayout/PropertyLayoutFacetFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/6efc6595/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java index 065da4f..3447fe6 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CollectionLayoutFacetFactory.java @@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet; public class CollectionLayoutFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory { public CollectionLayoutFacetFactory() { - super(FeatureType.COLLECTIONS_ONLY); + super(FeatureType.COLLECTIONS_AND_ACTIONS); } @Override http://git-wip-us.apache.org/repos/asf/isis/blob/6efc6595/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java index 97b70ac..410a16f 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PropertyLayoutFacetFactory.java @@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.facets.objectvalue.renderedadjusted.Render public class PropertyLayoutFacetFactory extends FacetFactoryAbstract implements ContributeeMemberFacetFactory { public PropertyLayoutFacetFactory() { - super(FeatureType.PROPERTIES_ONLY); + super(FeatureType.PROPERTIES_AND_ACTIONS); } @Override
