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
commit 632a733a0a345b1d96e13fa9750a56000374626b Author: Dan Haywood <[email protected]> AuthorDate: Sun Jul 31 14:08:17 2022 +0100 ISIS-3102: renames constant class --- .../applib/layout/FallbackLayoutFieldSetIds.java | 60 ++++++++++++++++++++++ .../applib/mixins/layout/LayoutMixinConstants.java | 32 ------------ .../mixins/layout/Object_downloadLayoutXml.java | 3 +- .../metamodel/Object_downloadMetamodelXml.java | 4 +- .../mixins/metamodel/Object_logicalTypeName.java | 4 +- .../mixins/metamodel/Object_objectIdentifier.java | 4 +- .../mixins/metamodel/Object_rebuildMetamodel.java | 4 +- .../applib/mixins/rest/Object_openRestApi.java | 4 +- .../metamodel/inspect/Object_inspectMetamodel.java | 4 +- .../grid/bootstrap/GridSystemServiceBootstrap.java | 4 +- .../contributions/Object_recentCommands.java | 4 +- .../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 +- 18 files changed, 92 insertions(+), 63 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/FallbackLayoutFieldSetIds.java new file mode 100644 index 0000000000..68d5a26c00 --- /dev/null +++ b/api/applib/src/main/java/org/apache/isis/applib/layout/FallbackLayoutFieldSetIds.java @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.isis.applib.layout; + +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. + * + * <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. + * </p> + * + * @since 2.x {@index} + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class FallbackLayoutFieldSetIds { + + /** + * The id for a field set intended to hold the properties/fields that uniquely identify the object from the + * end-user's perspective. + * + * <p> + * The fallback layout places the 'identity' and 'metadata' fieldsets as tabs within a single tab group. + * </p> + */ + public static final String IDENTITY_FIELDSET_ID = "identity"; + + /** + * The id for a field set intended to hold various metadata, such as the id or version. All of the framework + * provided mixins are associated with this fieldset, either properties or actions. + * + * <p> + * The fallback layout places the 'identity' and 'metadata' fieldsets as tabs within a single tab group. + * </p> + */ + public static final String METADATA_FIELDSET_ID = "metadata"; + +} diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/LayoutMixinConstants.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/LayoutMixinConstants.java deleted file mode 100644 index 564adf7598..0000000000 --- a/api/applib/src/main/java/org/apache/isis/applib/mixins/layout/LayoutMixinConstants.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.isis.applib.mixins.layout; - -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -/** - * @since 1.x {@index} - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public final class LayoutMixinConstants { - - - public static final String METADATA_LAYOUT_GROUPNAME = "metadata"; -} 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 27d5e7f859..1b8c880690 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,6 +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.mixins.dto.DtoMixinConstants; import org.apache.isis.applib.services.layout.LayoutService; import org.apache.isis.applib.services.layout.Style; @@ -52,7 +53,7 @@ import lombok.val; @ActionLayout( cssClassFa = "fa-download", position = ActionLayout.Position.PANEL_DROPDOWN, - associateWith = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.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 c369e9b005..cdf980d08e 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.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 432c1789ee..757fc7208f 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + fieldSetId = FallbackLayoutFieldSetIds.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 26a5abde7e..cc7447d017 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + fieldSetId = FallbackLayoutFieldSetIds.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 78f47c0be1..6a6b7f1a2f 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.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 4bb30dfda8..8e1d0a9f9e 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.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 9562cb015b..87967a2ac1 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.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 bb9ae7088f..3002ee411e 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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(LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME)) { + } else if(id.equals(FallbackLayoutFieldSetIds.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 8c036c8208..c77598645f 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.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 e59ee4937a..b3680f8cdc 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.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 35fc34b6ea..9621df71bd 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; import lombok.RequiredArgsConstructor; @@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor; @PropertyLayout( named = "Version", hidden = Where.ALL_TABLES, - fieldSetId = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + fieldSetId = FallbackLayoutFieldSetIds.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 d8abada00b..d2531ae1ed 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; import lombok.RequiredArgsConstructor; @@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor; @PropertyLayout( named = "Version", hidden = Where.ALL_TABLES, - fieldSetId = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + fieldSetId = FallbackLayoutFieldSetIds.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 633818e91e..2026367581 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.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 111948d2e7..c20ca7da0e 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.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 d935428451..5cfd3ae934 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.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 2d4834febb..07d361d5d2 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.mixins.layout.LayoutMixinConstants; +import org.apache.isis.applib.layout.FallbackLayoutFieldSetIds; 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 = LayoutMixinConstants.METADATA_LAYOUT_GROUPNAME, + associateWith = FallbackLayoutFieldSetIds.METADATA_FIELDSET_ID, sequence = "400.1", describedAs = "Resets the presentation of the displayed object/page to its initial form. " + "(table sorting, tab selection, etc.)"
