This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3102
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3102 by this push:
new 97d214b7c7 ISIS-3102: renames FallbackLayoutFieldSetIds to
LayoutConstants, improves javadoc
97d214b7c7 is described below
commit 97d214b7c74ff561fece89e831c99d81d1cac628
Author: Dan Haywood <[email protected]>
AuthorDate: Sun Jul 31 15:08:12 2022 +0100
ISIS-3102: renames FallbackLayoutFieldSetIds to LayoutConstants, improves
javadoc
---
...ackLayoutFieldSetIds.java => LayoutConstants.java} | 19 +++++++++++++------
.../mixins/layout/Object_downloadLayoutXml.java | 4 ++--
.../mixins/metamodel/Object_downloadMetamodelXml.java | 4 ++--
.../mixins/metamodel/Object_logicalTypeName.java | 4 ++--
.../mixins/metamodel/Object_objectIdentifier.java | 4 ++--
.../mixins/metamodel/Object_rebuildMetamodel.java | 4 ++--
.../isis/applib/mixins/rest/Object_openRestApi.java | 4 ++--
.../metamodel/inspect/Object_inspectMetamodel.java | 4 ++--
.../grid/bootstrap/GridSystemServiceBootstrap.java | 4 ++--
.../applib/contributions/Object_recentCommands.java | 4 ++--
.../applib/contributions/Object_recentExecutions.java | 4 ++--
.../mixins/Persistable_datanucleusVersionLong.java | 4 ++--
.../Persistable_datanucleusVersionTimestamp.java | 4 ++--
.../mixins/Persistable_downloadJdoMetadata.java | 4 ++--
.../commons/applib/mixins/Object_impersonate.java | 4 ++--
.../applib/mixins/Object_impersonateWithRoles.java | 4 ++--
.../wicket/viewer/mixins/Object_clearHints.java | 4 ++--
17 files changed, 45 insertions(+), 38 deletions(-)
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/layout/FallbackLayoutFieldSetIds.java
b/api/applib/src/main/java/org/apache/isis/applib/layout/LayoutConstants.java
similarity index 69%
rename from
api/applib/src/main/java/org/apache/isis/applib/layout/FallbackLayoutFieldSetIds.java
rename to
api/applib/src/main/java/org/apache/isis/applib/layout/LayoutConstants.java
index 68d5a26c00..a843b30362 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/layout/FallbackLayoutFieldSetIds.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/layout/LayoutConstants.java
@@ -23,19 +23,26 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
/**
- * Field set identifiers of the <code>layout.xml</code> that is used as a
fallback if no layout.xml file is available
- * for the object being displayed.
+ * Constant identifiers of the <code>layout.xml</code> that are commonly used
in layouts.
*
* <p>
- * The service that loads layouts is {@link
org.apache.isis.applib.services.grid.GridSystemService}; the notion of
- * a fallback layout is implemented by the framework's default
implementation. (The fallback layout itself can
- * be found in the <code>GridFallbackLayout.xml</code> file.
+ * All of the mixins provided by the framework are bound to the {@link
#METADATA_FIELDSET_ID metadata} field set,
+ * and so - unless explicitly specified in the object's layout to some
other location, will expect that the layout
+ * includes a field set with this id.
+ * </p>
+ *
+ * <p>
+ * The service that loads layouts is {@link
org.apache.isis.applib.services.grid.GridSystemService}, and the
+ * framework's default implementation of this service supports the notion
of a fallback layout, used whenever
+ * an object has no associated layout file. This fallback layout
<i>does</i> expose a
+ * {@link #METADATA_FIELDSET_ID metadata} fieldset. (The fallback layout
itself can be found in the
+ * <code>GridFallbackLayout.xml</code> file).
* </p>
*
* @since 2.x {@index}
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class FallbackLayoutFieldSetIds {
+public final class LayoutConstants {
/**
* The id for a field set intended to hold the properties/fields that
uniquely identify the object from the
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
index 1b8c880690..853426fc73 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/Object_downloadLayoutXml.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.mixins.dto.DtoMixinConstants;
import org.apache.isis.applib.services.layout.LayoutService;
import org.apache.isis.applib.services.layout.Style;
@@ -53,7 +53,7 @@ import lombok.val;
@ActionLayout(
cssClassFa = "fa-download",
position = ActionLayout.Position.PANEL_DROPDOWN,
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "700.1"
)
//mixin's don't need a logicalTypeName
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
index cdf980d08e..dfaddadb7a 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_downloadMetamodelXml.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.id.LogicalType;
import org.apache.isis.applib.mixins.dto.DtoMixinConstants;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.metamodel.Config;
@@ -59,7 +59,7 @@ import lombok.val;
@ActionLayout(
cssClassFa = "fa-download",
position = ActionLayout.Position.PANEL_DROPDOWN,
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "700.2"
)
//mixin's don't need a logicalTypeName
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
index 757fc7208f..c015cd40c2 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_logicalTypeName.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
@@ -53,7 +53,7 @@ import lombok.val;
@Property
@PropertyLayout(
hidden = Where.ALL_TABLES,
- fieldSetId = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ fieldSetId = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "700.1"
)
//mixin's don't need a logicalTypeName
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
index cc7447d017..0cc4626c88 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_objectIdentifier.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
@@ -53,7 +53,7 @@ import lombok.val;
@Property
@PropertyLayout(
hidden = Where.ALL_TABLES,
- fieldSetId = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ fieldSetId = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "700.2"
)
//mixin's don't need a logicalTypeName
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_rebuildMetamodel.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_rebuildMetamodel.java
index 6a6b7f1a2f..ba399c7428 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_rebuildMetamodel.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/metamodel/Object_rebuildMetamodel.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import lombok.RequiredArgsConstructor;
@@ -48,7 +48,7 @@ import lombok.RequiredArgsConstructor;
@ActionLayout(
cssClassFa = "fa-sync",
position = ActionLayout.Position.PANEL,
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "800.1"
)
//mixin's don't need a logicalTypeName
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/mixins/rest/Object_openRestApi.java
b/api/applib/src/main/java/org/apache/isis/applib/mixins/rest/Object_openRestApi.java
index 8e1d0a9f9e..72ab8a678e 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/mixins/rest/Object_openRestApi.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/mixins/rest/Object_openRestApi.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.value.LocalResourcePath;
@@ -51,7 +51,7 @@ import lombok.val;
@ActionLayout(
cssClassFa = "fa-external-link-alt",
position = ActionLayout.Position.PANEL_DROPDOWN,
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "750.1"
)
//mixin's don't need a logicalTypeName
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/Object_inspectMetamodel.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/Object_inspectMetamodel.java
index 87967a2ac1..3d2c46c15b 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/Object_inspectMetamodel.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/Object_inspectMetamodel.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.graph.tree.TreeNode;
import org.apache.isis.applib.graph.tree.TreePath;
import org.apache.isis.applib.id.LogicalType;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.metamodel.Config;
import org.apache.isis.applib.services.metamodel.MetaModelService;
@@ -53,7 +53,7 @@ import lombok.val;
@ActionLayout(
cssClassFa = "fa-sitemap",
position = ActionLayout.Position.PANEL_DROPDOWN,
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "700.2.1"
)
//mixin's don't need a logicalTypeName
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
index 3002ee411e..8eab84d3f1 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
@@ -50,7 +50,7 @@ import org.apache.isis.applib.layout.grid.bootstrap.BSRow;
import org.apache.isis.applib.layout.grid.bootstrap.BSTab;
import org.apache.isis.applib.layout.grid.bootstrap.BSTabGroup;
import org.apache.isis.applib.layout.grid.bootstrap.Size;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.message.MessageService;
@@ -271,7 +271,7 @@ extends GridSystemServiceAbstract<BSGrid> {
Set<String> boundAssociationIds =
boundAssociationIdsByFieldSetId.computeIfAbsent(id, k
-> _Sets.newLinkedHashSet());
boundAssociationIds.add(oneToOneAssociation.getId());
- } else
if(id.equals(FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID)) {
+ } else if(id.equals(LayoutConstants.METADATA_FIELDSET_ID)) {
unboundMetadataContributingIds.add(oneToOneAssociation.getId());
}
}
diff --git
a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
index c77598645f..7acf939428 100644
---
a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
+++
b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/contributions/Object_recentCommands.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.mixins.system.HasInteractionId;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import
org.apache.isis.extensions.commandlog.applib.IsisModuleExtCommandLogApplib;
@@ -54,7 +54,7 @@ import lombok.RequiredArgsConstructor;
@ActionLayout(
cssClassFa = "fa-bolt",
position = ActionLayout.Position.PANEL_DROPDOWN,
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "900.1"
)
@RequiredArgsConstructor
diff --git
a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/contributions/Object_recentExecutions.java
b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/contributions/Object_recentExecutions.java
index b3680f8cdc..c26075e7a1 100644
---
a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/contributions/Object_recentExecutions.java
+++
b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/contributions/Object_recentExecutions.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.mixins.system.HasInteractionId;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import
org.apache.isis.extensions.executionlog.applib.IsisModuleExtExecutionLogApplib;
@@ -54,7 +54,7 @@ import lombok.RequiredArgsConstructor;
@ActionLayout(
cssClassFa = "fa-bolt",
position = ActionLayout.Position.PANEL_DROPDOWN,
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "900.1"
)
@RequiredArgsConstructor
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java
index 9621df71bd..6550f70d24 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionLong.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import lombok.RequiredArgsConstructor;
@@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
named = "Version",
hidden = Where.ALL_TABLES,
- fieldSetId = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ fieldSetId = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "800.2"
)
@RequiredArgsConstructor
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java
index d2531ae1ed..cc413a9580 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_datanucleusVersionTimestamp.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import lombok.RequiredArgsConstructor;
@@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor;
@PropertyLayout(
named = "Version",
hidden = Where.ALL_TABLES,
- fieldSetId = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ fieldSetId = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "800.2"
)
@RequiredArgsConstructor
diff --git
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.java
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.java
index 2026367581..3f84e4a388 100644
---
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.java
+++
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/mixins/Persistable_downloadJdoMetadata.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.persistence.jdo.applib.services.JdoSupportService;
@@ -58,7 +58,7 @@ import lombok.RequiredArgsConstructor;
@ActionLayout(
cssClassFa = "fa-download",
position = ActionLayout.Position.PANEL_DROPDOWN,
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "710.1"
)
@RequiredArgsConstructor
diff --git
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonate.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonate.java
index c20ca7da0e..19ac6c646f 100644
---
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonate.java
+++
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonate.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Redirect;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.mixins.security.HasUsername;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.user.ImpersonateMenu;
@@ -48,7 +48,7 @@ import lombok.RequiredArgsConstructor;
restrictTo = RestrictTo.PROTOTYPING
)
@ActionLayout(
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
cssClassFa = "fa-mask",
position = ActionLayout.Position.PANEL_DROPDOWN,
redirectPolicy = Redirect.EVEN_IF_SAME,
diff --git
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonateWithRoles.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonateWithRoles.java
index 5cfd3ae934..c0799352a6 100644
---
a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonateWithRoles.java
+++
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/applib/mixins/Object_impersonateWithRoles.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.Redirect;
import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.mixins.security.HasUsername;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.user.ImpersonateMenu;
@@ -54,7 +54,7 @@ import lombok.val;
cssClassFa = "fa-mask",
position = ActionLayout.Position.PANEL_DROPDOWN,
redirectPolicy = Redirect.EVEN_IF_SAME,
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "850.2"
)
//mixin's don't need a logicalTypeName
diff --git
a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/mixins/Object_clearHints.java
b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/mixins/Object_clearHints.java
index 07d361d5d2..b892e2d80a 100644
---
a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/mixins/Object_clearHints.java
+++
b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/mixins/Object_clearHints.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds;
+import org.apache.isis.applib.layout.LayoutConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.hint.HintStore;
import
org.apache.isis.viewer.wicket.viewer.services.HintStoreUsingWicketSession;
@@ -63,7 +63,7 @@ import lombok.val;
@ActionLayout(
cssClassFa = "fa-circle",
position = ActionLayout.Position.PANEL,
- associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID,
+ associateWith = LayoutConstants.METADATA_FIELDSET_ID,
sequence = "400.1",
describedAs = "Resets the presentation of the displayed object/page to
its initial form. "
+ "(table sorting, tab selection, etc.)"
