This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new a46b474816 ISIS-3060: make Facet type-specific/-agnostic semantics
more clear
a46b474816 is described below
commit a46b4748166ef1d26db996752fa5d912b76418d6
Author: Andi Huber <[email protected]>
AuthorDate: Wed Jul 6 09:29:28 2022 +0200
ISIS-3060: make Facet type-specific/-agnostic semantics more clear
- renaming flag, also flipping boolean semantics
---
.../apache/isis/core/metamodel/facetapi/Facet.java | 21 ++++++++++++++++-----
.../core/metamodel/facetapi/FacetHolderLayered.java | 6 +++---
.../ActionPositionFacetForActionLayoutXml.java | 4 ++--
.../BookmarkPolicyFacetForActionLayoutXml.java | 4 ++--
.../layout/CssClassFaFacetForActionLayoutXml.java | 4 ++--
.../layout/CssClassFacetForActionLayoutXml.java | 4 ++--
.../layout/HiddenFacetForActionLayoutXml.java | 4 ++--
.../MemberDescribedFacetForActionLayoutXml.java | 4 ++--
.../layout/MemberNamedFacetForActionLayoutXml.java | 4 ++--
.../layout/PromptStyleFacetForActionLayoutXml.java | 4 ++--
.../layout/RedirectFacetFromActionLayoutXml.java | 4 ++--
.../layout/CssClassFacetForCollectionLayoutXml.java | 4 ++--
.../DefaultViewFacetForCollectionLayoutXml.java | 4 ++--
.../layout/HiddenFacetForCollectionLayoutXml.java | 4 ++--
.../MemberDescribedFacetForCollectionLayoutXml.java | 4 ++--
.../MemberNamedFacetForCollectionLayoutXml.java | 4 ++--
.../layout/PagedFacetForCollectionLayoutXml.java | 4 ++--
.../layout/SortedByFacetForCollectionLayoutXml.java | 4 ++--
.../layout/group/LayoutGroupFacetForLayoutXml.java | 4 ++--
.../layout/order/LayoutOrderFacetForLayoutXml.java | 4 ++--
...BookmarkPolicyFacetForDomainObjectLayoutXml.java | 4 ++--
.../CssClassFaFacetForDomainObjectLayoutXml.java | 4 ++--
.../CssClassFacetForDomainObjectLayoutXml.java | 4 ++--
.../DescribedAsFacetForDomainObjectLayoutXml.java | 4 ++--
.../ObjectNamedFacetForDomainObjectLayoutXml.java | 4 ++--
.../CssClassFacetForPropertyLayoutXml.java | 4 ++--
.../HiddenFacetForPropertyLayoutXml.java | 4 ++--
.../LabelAtFacetForPropertyLayoutXml.java | 4 ++--
.../MemberDescribedFacetForPropertyLayoutXml.java | 4 ++--
.../MemberNamedFacetForPropertyLayoutXml.java | 4 ++--
.../MultiLineFacetForPropertyLayoutXml.java | 4 ++--
.../PromptStyleFacetForPropertyLayoutXml.java | 4 ++--
.../RenderedAdjustedFacetForPropertyLayoutXml.java | 4 ++--
.../TypicalLengthFacetForPropertyLayoutXml.java | 4 ++--
.../UnchangingFacetForPropertyLayoutXml.java | 4 ++--
.../facets/TenantedAuthorizationFacet.java | 4 ++--
36 files changed, 87 insertions(+), 76 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java
index de53130605..99024fead7 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/Facet.java
@@ -22,9 +22,11 @@ import java.util.Optional;
import org.apache.isis.applib.Identifier;
import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import
org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.isis.core.metamodel.facets.all.named.ObjectNamedFacet;
+import org.apache.isis.core.metamodel.specloader.postprocessor.PostProcessor;
public interface Facet
extends
@@ -171,19 +173,28 @@ extends
public Precedence getPrecedence();
/**
- * Whether this {@link Facet} can be installed on a mixed-in {@link
FacetedMethod},
- * and hence effectively be shared among multiple (target) <i>Mixee</i>
types.
+ * Whether this {@link Facet} acts in a domain-object-type specific manner,
+ * or otherwise is agnostic to the concrete domain-object-type.
+ * <p>
+ * In the type agnostic case this {@link Facet} can be installed on a
mixed-in {@link FacetedMethod},
+ * and hence is effectively shared among multiple (target) <i>Mixee</i>
types.
+ * <p>
+ * <ul>
+ * <li>type specific facets: probably only ever installed via {@link
PostProcessor}(s)</li>
+ * <li>type agnostic facets: probably installed by both regular {@link
FacetFactory}(s)
+ * and {@link PostProcessor}(s)</li>
+ * </ul>
* <p>
* Regularly {@link Facet}s for <i>Members</i> are installed on the
<i>Member's</i> {@link FacetedMethod}.
* However, for mixed-in <i>Members</i>, the {@link FacetedMethod} is a
shared one,
* which usually shall not receive any {@link Facet}s,
* that eg. originate from <i>layout.xml</i> file introspection.
* Those instead would be installed on a synthetic {@link FacetHolder}
specifically created
- * for the associated <i>Mixee</i> type.
+ * for the associated <i>Mixee</i>.
* @see FacetHolderLayered
*/
- public default boolean isAllowedToBeSharedWhenMixedIn() {
- return true;
+ public default boolean isObjectTypeSpecific() {
+ return false;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderLayered.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderLayered.java
index 4549df9b94..ad0c9fe7ed 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderLayered.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetHolderLayered.java
@@ -71,9 +71,9 @@ implements FacetHolder {
@Override
public void addFacet(@NonNull final Facet facet) {
// eg. if a Facet originates from layout.xml introspection, don't
install it on the shared FacetHolder
- val facetHolder = facet.isAllowedToBeSharedWhenMixedIn()
- ? shared
- : local;
+ val facetHolder = facet.isObjectTypeSpecific()
+ ? local
+ : shared;
facetHolder.addFacet(facet);
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionLayoutXml.java
index d7e25189fb..54d1951657 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionPositionFacetForActionLayoutXml.java
@@ -44,8 +44,8 @@ public class ActionPositionFacetForActionLayoutXml extends
ActionPositionFacetAb
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionLayoutXml.java
index 2fb40f033b..10d5f7ca53 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/BookmarkPolicyFacetForActionLayoutXml.java
@@ -47,8 +47,8 @@ extends BookmarkPolicyFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutXml.java
index 7713f4f518..93d08bd11c 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFaFacetForActionLayoutXml.java
@@ -49,8 +49,8 @@ extends CssClassFaStaticFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutXml.java
index bf89629130..90ba8142b5 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/CssClassFacetForActionLayoutXml.java
@@ -46,8 +46,8 @@ extends CssClassFacetSimple {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
index ea291da2a7..e07fdca2d8 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/HiddenFacetForActionLayoutXml.java
@@ -48,8 +48,8 @@ extends HiddenFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
@Override
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java
index 87cdc6e901..454b379cd4 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberDescribedFacetForActionLayoutXml.java
@@ -46,8 +46,8 @@ extends MemberDescribedFacetWithStaticTextAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberNamedFacetForActionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberNamedFacetForActionLayoutXml.java
index 82611e7df8..1c2953dd6a 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberNamedFacetForActionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/MemberNamedFacetForActionLayoutXml.java
@@ -46,8 +46,8 @@ extends MemberNamedFacetWithStaticTextAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutXml.java
index 01c843138e..5da5de3c7c 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/PromptStyleFacetForActionLayoutXml.java
@@ -55,8 +55,8 @@ extends PromptStyleFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
@Override
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutXml.java
index 6528544e1a..b5e5044a8a 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/RedirectFacetFromActionLayoutXml.java
@@ -47,8 +47,8 @@ extends RedirectFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java
index ca8d387b84..1716e7fbeb 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/CssClassFacetForCollectionLayoutXml.java
@@ -46,8 +46,8 @@ extends CssClassFacetSimple {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutXml.java
index 8fa0d454d4..4771c99bfe 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/DefaultViewFacetForCollectionLayoutXml.java
@@ -47,7 +47,7 @@ extends DefaultViewFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java
index 6e00fe0031..487472db3f 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/HiddenFacetForCollectionLayoutXml.java
@@ -48,8 +48,8 @@ extends HiddenFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
@Override
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutXml.java
index 88a9cc007a..7153e0199f 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberDescribedFacetForCollectionLayoutXml.java
@@ -48,8 +48,8 @@ extends MemberDescribedFacetWithStaticTextAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutXml.java
index a3a970c265..24066ac8db 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/MemberNamedFacetForCollectionLayoutXml.java
@@ -49,8 +49,8 @@ extends MemberNamedFacetWithStaticTextAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java
index 9ca7d86f1d..b5c50b16b5 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/PagedFacetForCollectionLayoutXml.java
@@ -46,8 +46,8 @@ extends PagedFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutXml.java
index 0379af2e3c..bbc84dd603 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/layout/SortedByFacetForCollectionLayoutXml.java
@@ -57,8 +57,8 @@ extends SortedByFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java
index 280bc8d9d7..aa736fc216 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/LayoutGroupFacetForLayoutXml.java
@@ -56,8 +56,8 @@ extends LayoutGroupFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
@Override
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetForLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetForLayoutXml.java
index 6be1a1ddc8..01cfa81bac 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetForLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/order/LayoutOrderFacetForLayoutXml.java
@@ -34,8 +34,8 @@ extends LayoutOrderFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java
index 7c0ac99e3d..13d29beaa9 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/BookmarkPolicyFacetForDomainObjectLayoutXml.java
@@ -49,8 +49,8 @@ extends BookmarkPolicyFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutXml.java
index ffdc4887fe..c6af306851 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFaFacetForDomainObjectLayoutXml.java
@@ -51,8 +51,8 @@ extends CssClassFaStaticFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutXml.java
index 7257dc6df5..22b16db5b8 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/CssClassFacetForDomainObjectLayoutXml.java
@@ -46,8 +46,8 @@ extends CssClassFacetSimple {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutXml.java
index 74a341849e..47ac439d78 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DescribedAsFacetForDomainObjectLayoutXml.java
@@ -48,8 +48,8 @@ extends ObjectDescribedFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutXml.java
index 618f888e06..2ea9d3cf3b 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/ObjectNamedFacetForDomainObjectLayoutXml.java
@@ -66,8 +66,8 @@ extends ObjectNamedFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutXml.java
index 34d0eebca2..66730d12a6 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/CssClassFacetForPropertyLayoutXml.java
@@ -46,8 +46,8 @@ extends CssClassFacetSimple {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java
index bdbeb2460e..4b21888a95 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/HiddenFacetForPropertyLayoutXml.java
@@ -48,8 +48,8 @@ extends HiddenFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
@Override
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutXml.java
index 2df15aee6e..45ce24e6fc 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/LabelAtFacetForPropertyLayoutXml.java
@@ -46,8 +46,8 @@ extends LabelAtFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java
index 5a7c4b1b14..b2b8a5d4a5 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberDescribedFacetForPropertyLayoutXml.java
@@ -48,7 +48,7 @@ extends MemberDescribedFacetWithStaticTextAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberNamedFacetForPropertyLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberNamedFacetForPropertyLayoutXml.java
index c6ada80d75..f57e742cd2 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberNamedFacetForPropertyLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MemberNamedFacetForPropertyLayoutXml.java
@@ -48,8 +48,8 @@ extends MemberNamedFacetWithStaticTextAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutXml.java
index 8ffcfe6b30..e898a181ef 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/MultiLineFacetForPropertyLayoutXml.java
@@ -45,8 +45,8 @@ extends MultiLineFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutXml.java
index d9643b21dc..ab70957c4a 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/PromptStyleFacetForPropertyLayoutXml.java
@@ -50,8 +50,8 @@ extends PromptStyleFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
@Override
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java
index c86a22b644..cc74992dc0 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/RenderedAdjustedFacetForPropertyLayoutXml.java
@@ -45,8 +45,8 @@ extends DateRenderAdjustFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutXml.java
index dc0f7415dd..6e749afe2d 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/TypicalLengthFacetForPropertyLayoutXml.java
@@ -46,8 +46,8 @@ extends TypicalLengthFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyLayoutXml.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyLayoutXml.java
index d1847b9d53..940779abfe 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyLayoutXml.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/propertylayout/UnchangingFacetForPropertyLayoutXml.java
@@ -48,8 +48,8 @@ extends UnchangingFacetAbstract {
}
@Override
- public boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public boolean isObjectTypeSpecific() {
+ return true;
}
}
diff --git
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationFacet.java
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationFacet.java
index 5bc3080f6d..6efdf291a9 100644
---
a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationFacet.java
+++
b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationFacet.java
@@ -30,8 +30,8 @@ public interface TenantedAuthorizationFacet
extends Facet, HidingInteractionAdvisor, DisablingInteractionAdvisor {
@Override
- public default boolean isAllowedToBeSharedWhenMixedIn() {
- return false;
+ public default boolean isObjectTypeSpecific() {
+ return true;
}
}
