This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new c6bccebc7bf CAUSEWAY-3859: ditches HasCommonContext
c6bccebc7bf is described below
commit c6bccebc7bfd36ccc79340870e0c2b5e0163a38c
Author: Andi Huber <[email protected]>
AuthorDate: Wed Feb 26 08:16:54 2025 +0100
CAUSEWAY-3859: ditches HasCommonContext
---
.../metamodel/context/HasMetaModelContext.java | 33 +++++++++++++
.../testdomain/conf/Configuration_usingWicket.java | 10 ++--
.../model/models/AttributeModelWithChoice.java | 3 +-
.../wicket/model/models/HasCommonContext.java | 56 ----------------------
.../viewer/wicket/model/models/ModelAbstract.java | 3 +-
.../wicket/model/models/ObjectAdapterModel.java | 3 +-
.../wicket/model/models/coll/CollectionModel.java | 4 +-
.../models/interaction/act/UiParameterWkt.java | 7 ++-
.../models/interaction/prop/UiPropertyWkt.java | 4 +-
.../model/value/ValueSemanticsModelAbstract.java | 7 +--
.../model/models/test/UiObjectWkt_hintsTest.java | 4 +-
.../wicket/ui/components/WebComponentBase.java | 4 +-
.../ajaxtable/columns/GenericColumnAbstract.java | 5 --
.../ui/components/table/nav/NavigationToolbar.java | 4 +-
.../table/nonav/TotalRecordsToolbar.java | 4 +-
.../components/widgets/select2/ChoiceProvider.java | 4 +-
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 4 +-
.../viewer/wicket/ui/exec/FormExecutorDefault.java | 4 +-
.../viewer/wicket/ui/pages/WebPageBase.java | 4 +-
.../viewer/wicket/ui/panels/FormAbstract.java | 4 +-
.../viewer/wicket/ui/panels/PanelBase.java | 5 +-
.../AuthenticatedWebSessionForCauseway.java | 3 +-
.../integration/WebRequestCycleForCauseway.java | 4 +-
.../wicketapp/CausewayWicketApplication.java | 6 +--
24 files changed, 79 insertions(+), 110 deletions(-)
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java
index 67f2c7488de..f023673783a 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/context/HasMetaModelContext.java
@@ -27,6 +27,7 @@
import org.apache.causeway.applib.locale.UserLocale;
import org.apache.causeway.applib.services.ascii.AsciiIdentifierService;
import org.apache.causeway.applib.services.factory.FactoryService;
+import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.applib.services.i18n.TranslationService;
import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
import org.apache.causeway.applib.services.iactnlayer.InteractionService;
@@ -40,6 +41,9 @@
import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Common;
+import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket;
+import
org.apache.causeway.core.config.CausewayConfiguration.Viewer.Common.Application;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
import org.apache.causeway.core.config.viewer.web.WebAppContextPath;
import org.apache.causeway.core.metamodel.execution.MemberExecutorService;
@@ -209,4 +213,33 @@ default Stream<ManagedObject> streamServiceAdapters() {
return getMetaModelContext().streamServiceAdapters();
}
+ // -- VIEWER SHORTCUTS
+
+ default Common getCommonViewerSettings() {
+ return getConfiguration().getViewer().getCommon();
+ }
+
+ default Wicket getWicketViewerSettings() {
+ return getConfiguration().getViewer().getWicket();
+ }
+
+ default Application getApplicationSettings() {
+ return getCommonViewerSettings().getApplication();
+ }
+
+ /**
+ * Translate without context: Tooltips, Button-Labels, etc.
+ */
+ default String translate(final String input) {
+ return getTranslationService().translate(TranslationContext.empty(),
input);
+ }
+
+ default String translate(final TranslationContext tc, final String text) {
+ return getTranslationService().translate(tc, text);
+ }
+
+ default boolean isPrototyping() {
+ return getSystemEnvironment().isPrototyping();
+ }
+
}
diff --git
a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
index 73d3811c430..d833ce9d51e 100644
---
a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
+++
b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
@@ -36,6 +36,7 @@
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.settings.DebugSettings.ClassOutputStrategy;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.jupiter.api.function.ThrowingConsumer;
@@ -90,7 +91,7 @@ public class WicketViewerOutputMarkupContainerClassNameEnable
public void init(final WebApplication webApplication) {
webApplication.getDebugSettings()
.setComponentPathAttributeName("wicket-tester-path")
- .setOutputMarkupContainerClassName(true);
+
.setOutputMarkupContainerClassNameStrategy(ClassOutputStrategy.HTML_COMMENT);
}
}
@@ -346,8 +347,7 @@ public <C extends IRequestablePage> boolean
isBookmarkable(final Class<C> pageCl
static class WicketApplication_forTesting
extends WebApplication
implements
- HasComponentFactoryRegistry,
- HasMetaModelContext {
+ HasComponentFactoryRegistry{
private static final long serialVersionUID = 1L;
@Override
@@ -368,11 +368,11 @@ protected void init() {
@Getter(lazy=true)
private final ComponentFactoryRegistry componentFactoryRegistry =
- lookupServiceElseFail(ComponentFactoryRegistry.class);
+
metaModelContext.lookupServiceElseFail(ComponentFactoryRegistry.class);
@Getter(lazy=true)
private final PageClassRegistry pageClassRegistry =
- lookupServiceElseFail(PageClassRegistry.class);
+
metaModelContext.lookupServiceElseFail(PageClassRegistry.class);
@Override
public Class<? extends Page> getHomePage() {
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithChoice.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithChoice.java
index 0d62f665e5f..2632522214d 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithChoice.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/AttributeModelWithChoice.java
@@ -20,12 +20,13 @@
import org.apache.wicket.model.IModel;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.interactions.managed.ManagedValue;
public interface AttributeModelWithChoice<T>
extends
IModel<T>,
- HasCommonContext {
+ HasMetaModelContext {
UiAttributeWkt attributeModel();
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/HasCommonContext.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/HasCommonContext.java
deleted file mode 100644
index 11bda649bb9..00000000000
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/HasCommonContext.java
+++ /dev/null
@@ -1,56 +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.causeway.viewer.wicket.model.models;
-
-import org.apache.causeway.applib.services.i18n.TranslationContext;
-import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Common;
-import
org.apache.causeway.core.config.CausewayConfiguration.Viewer.Common.Application;
-import org.apache.causeway.core.config.CausewayConfiguration.Viewer.Wicket;
-import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
-
-public interface HasCommonContext extends HasMetaModelContext {
-
- default Common getCommonViewerSettings() {
- return getConfiguration().getViewer().getCommon();
- }
-
- default Wicket getWicketViewerSettings() {
- return getConfiguration().getViewer().getWicket();
- }
-
- default Application getApplicationSettings() {
- return getCommonViewerSettings().getApplication();
- }
-
- /**
- * Translate without context: Tooltips, Button-Labels, etc.
- */
- default String translate(final String input) {
- return getTranslationService().translate(TranslationContext.empty(),
input);
- }
-
- default String translate(final TranslationContext tc, final String text) {
- return getTranslationService().translate(tc, text);
- }
-
- default boolean isPrototyping() {
- return getSystemEnvironment().isPrototyping();
- }
-
-}
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ModelAbstract.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ModelAbstract.java
index 37e892cba49..01554d9d47f 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ModelAbstract.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ModelAbstract.java
@@ -20,6 +20,7 @@
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
/**
@@ -28,7 +29,7 @@
*/
public abstract class ModelAbstract<T>
extends LoadableDetachableModel<T>
-implements HasCommonContext {
+implements HasMetaModelContext {
private static final long serialVersionUID = 1L;
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ObjectAdapterModel.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ObjectAdapterModel.java
index 9a5fb73ae43..9ae6ea57188 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ObjectAdapterModel.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/ObjectAdapterModel.java
@@ -21,6 +21,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.viewer.commons.model.hints.HasRenderingHints;
@@ -29,7 +30,7 @@
public interface ObjectAdapterModel
extends
- HasCommonContext,
+ HasMetaModelContext,
HasRenderingHints,
IModel<ManagedObject> {
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/coll/CollectionModel.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/coll/CollectionModel.java
index 04e599dbec3..94831f34d20 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/coll/CollectionModel.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/coll/CollectionModel.java
@@ -25,13 +25,13 @@
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.applib.annotation.TableDecorator;
import org.apache.causeway.applib.services.bookmark.Bookmark;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import org.apache.causeway.core.metamodel.tabular.DataTableInteractive;
import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
import org.apache.causeway.viewer.wicket.model.links.LinksProvider;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -39,7 +39,7 @@
public sealed interface CollectionModel
extends
IModel<DataTableInteractive>,
- HasCommonContext,
+ HasMetaModelContext,
LinksProvider
permits CollectionModelAbstract, CollectionModelEmpty {
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/UiParameterWkt.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/UiParameterWkt.java
index a353569404e..dc462b476a5 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/UiParameterWkt.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/act/UiParameterWkt.java
@@ -19,7 +19,9 @@
package org.apache.causeway.viewer.wicket.model.models.interaction.act;
import org.apache.wicket.model.IModel;
+import org.jspecify.annotations.NonNull;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import
org.apache.causeway.core.metamodel.interactions.managed.ActionInteraction;
import
org.apache.causeway.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -27,9 +29,6 @@
import org.apache.causeway.viewer.commons.model.attrib.UiParameter;
import org.apache.causeway.viewer.commons.model.object.HasUiParentObject;
import org.apache.causeway.viewer.commons.model.object.UiObject;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
-
-import org.jspecify.annotations.NonNull;
/**
* <i>Action Parameter Interaction</i> model bound to its owner {@link
ActionInteractionWkt}.
@@ -41,7 +40,7 @@ public record UiParameterWkt(
int paramIndex)
implements
IModel<ActionInteraction>,
- HasCommonContext,
+ HasMetaModelContext,
HasUiParentObject<UiObject>,
UiParameter {
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
index a409cd44d57..d4ff77c587a 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/interaction/prop/UiPropertyWkt.java
@@ -20,6 +20,7 @@
import org.apache.wicket.model.ChainingModel;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import
org.apache.causeway.core.metamodel.interactions.managed.PropertyInteraction;
import
org.apache.causeway.core.metamodel.interactions.managed.PropertyNegotiationModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
@@ -27,7 +28,6 @@
import org.apache.causeway.viewer.commons.model.attrib.UiProperty;
import org.apache.causeway.viewer.commons.model.object.HasUiParentObject;
import org.apache.causeway.viewer.commons.model.object.UiObject;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
/**
* <i>Property Interaction</i> model bound to its owner {@link
PropertyInteractionWkt}.
@@ -38,7 +38,7 @@
public final class UiPropertyWkt
extends ChainingModel<PropertyInteraction>
implements
- HasCommonContext,
+ HasMetaModelContext,
HasUiParentObject<UiObject>,
UiProperty {
diff --git
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ValueSemanticsModelAbstract.java
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ValueSemanticsModelAbstract.java
index 90fe6216720..136626bc8f7 100644
---
a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ValueSemanticsModelAbstract.java
+++
b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/value/ValueSemanticsModelAbstract.java
@@ -20,22 +20,23 @@
import java.io.Serializable;
+import org.jspecify.annotations.NonNull;
+
import org.apache.causeway.applib.Identifier;
import org.apache.causeway.commons.functional.Either;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.commons.ViewOrEditMode;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.facets.object.value.ValueFacet;
import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.causeway.core.metamodel.spec.feature.ObjectFeature;
import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
-import org.jspecify.annotations.NonNull;
import lombok.Synchronized;
abstract class ValueSemanticsModelAbstract
implements
- HasCommonContext,
+ HasMetaModelContext,
Serializable {
private static final long serialVersionUID = 1L;
diff --git
a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
index d6526292b6c..f7bb551abac 100644
---
a/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
+++
b/viewers/wicket/ui-test/src/test/java/org/apache/causeway/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
@@ -42,7 +42,6 @@
import org.apache.causeway.applib.services.hint.HintStore;
import org.apache.causeway.commons.internal.collections._Maps;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
-import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
@@ -61,8 +60,7 @@ class UiObjectWkt_hintsTest {
@RequiredArgsConstructor
static class WicketAppStup
- extends org.apache.wicket.Application
- implements HasMetaModelContext {
+ extends org.apache.wicket.Application {
@Getter final MetaModelContext metaModelContext;
@Override public String getApplicationKey() {
return null; }
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/WebComponentBase.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/WebComponentBase.java
index 15201dca282..066f39fad5d 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/WebComponentBase.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/WebComponentBase.java
@@ -21,7 +21,7 @@
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.model.IModel;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
/**
* Provides all the system dependencies for sub-classes.
@@ -29,7 +29,7 @@
*/
public abstract class WebComponentBase
extends WebComponent
-implements HasCommonContext {
+implements HasMetaModelContext {
private static final long serialVersionUID = 1L;
public WebComponentBase(final String id) {
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/ajaxtable/columns/GenericColumnAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/ajaxtable/columns/GenericColumnAbstract.java
index 7dc38338a40..2ef2c7c28fc 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/ajaxtable/columns/GenericColumnAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/present/ajaxtable/columns/GenericColumnAbstract.java
@@ -28,7 +28,6 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.causeway.applib.services.i18n.TranslationContext;
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@@ -116,8 +115,4 @@ protected ComponentFactoryRegistry getComponentRegistry() {
return componentRegistry;
}
- protected String translate(final String raw) {
- return getTranslationService().translate(TranslationContext.empty(),
raw);
- }
-
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.java
index 85e1f86a2b8..851ed8a9156 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.java
@@ -23,7 +23,7 @@
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.viewer.wicket.model.timetaken.TimeTakenModel;
import
org.apache.causeway.viewer.wicket.ui.components.table.DataTableWithPagesAndFilter;
import
org.apache.causeway.viewer.wicket.ui.components.table.nav.pagesize.PagesizeChooser;
@@ -31,7 +31,7 @@
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
public class NavigationToolbar extends AjaxNavigationToolbar
-implements HasCommonContext {
+implements HasMetaModelContext {
private static final long serialVersionUID = 1L;
private static final String NAVIGATOR_CONTAINER_ID = "span";
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nonav/TotalRecordsToolbar.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nonav/TotalRecordsToolbar.java
index fd157f2e94e..3ccffb82560 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nonav/TotalRecordsToolbar.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nonav/TotalRecordsToolbar.java
@@ -25,7 +25,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LambdaModel;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.viewer.wicket.model.timetaken.TimeTakenModel;
import
org.apache.causeway.viewer.wicket.ui.components.table.DataTableWithPagesAndFilter;
import
org.apache.causeway.viewer.wicket.ui.components.table.nav.pagesize.PagesizeChooser;
@@ -39,7 +39,7 @@
* @since 2.0
*/
public class TotalRecordsToolbar extends AbstractToolbar
-implements HasCommonContext {
+implements HasMetaModelContext {
private static final long serialVersionUID = 1L;
private static final String ID_NAVIGATOR_CONTAINER = "navigatorContainer";
private static final String ID_PAGESIZE_CHOOSER = "pagesizeChooser";
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/ChoiceProvider.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/ChoiceProvider.java
index 7e3454f3fef..36b912e9e2f 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/ChoiceProvider.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/select2/ChoiceProvider.java
@@ -30,18 +30,18 @@
import
org.apache.causeway.applib.services.placeholder.PlaceholderRenderService.PlaceholderLiteral;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._NullSafe;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.causeway.core.metamodel.util.Facets;
import org.apache.causeway.viewer.commons.model.attrib.UiAttribute;
import org.apache.causeway.viewer.commons.model.attrib.UiParameter;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
import org.apache.causeway.viewer.wicket.model.models.UiAttributeWkt;
record ChoiceProvider(
UiAttributeWkt attributeModel,
UiAttribute.ChoiceProviderSort choiceProviderSort)
-implements HasCommonContext, Serializable {
+implements HasMetaModelContext, Serializable {
public ChoiceProvider(
final UiAttributeWkt attributeModel) {
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlBehaviour.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlBehaviour.java
index 91842291786..14bc72ae64c 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -28,8 +28,8 @@
import org.apache.causeway.applib.exceptions.RecoverableException;
import org.apache.causeway.commons.internal.base._Strings;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.services.message.MessageBroker;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
/**
* Attach to any Ajax button that might trigger a notification (ie calls
@@ -45,7 +45,7 @@
*/
public class JGrowlBehaviour
extends AbstractDefaultAjaxBehavior
-implements HasCommonContext {
+implements HasMetaModelContext {
private static final long serialVersionUID = 1L;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/exec/FormExecutorDefault.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/exec/FormExecutorDefault.java
index dffec02ba7c..3039d005b79 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/exec/FormExecutorDefault.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/exec/FormExecutorDefault.java
@@ -29,10 +29,10 @@
import
org.apache.causeway.applib.services.exceprecog.ExceptionRecognizerService;
import org.apache.causeway.applib.services.exceprecog.Recognition;
import org.apache.causeway.commons.functional.Either;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
import org.apache.causeway.viewer.wicket.model.models.FormExecutor;
import org.apache.causeway.viewer.wicket.model.models.FormExecutorContext;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
import org.apache.causeway.viewer.wicket.model.models.PropertyModel;
import lombok.extern.log4j.Log4j2;
@@ -40,7 +40,7 @@
@Log4j2
public record FormExecutorDefault(
Either<ActionModel, PropertyModel> actionOrPropertyModel
- ) implements FormExecutor, HasCommonContext {
+ ) implements FormExecutor, HasMetaModelContext {
// -- FACTORIES
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/WebPageBase.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/WebPageBase.java
index ed5cc74e0f6..3d6b222964b 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/WebPageBase.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/WebPageBase.java
@@ -25,7 +25,7 @@
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.causeway.commons.internal.base._Strings;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
/**
* Provides all the system dependencies for sub-classes.
@@ -33,7 +33,7 @@
*/
public abstract class WebPageBase
extends WebPage
-implements HasCommonContext {
+implements HasMetaModelContext {
private static final long serialVersionUID = 1L;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormAbstract.java
index 65f817b2dcb..b8b66f86ac9 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/FormAbstract.java
@@ -21,7 +21,7 @@
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import
org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import
org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegistry;
import org.apache.causeway.viewer.wicket.ui.pages.HasPageClassRegistry;
@@ -29,7 +29,7 @@
public abstract class FormAbstract<T> extends Form<T>
implements
- HasCommonContext,
+ HasMetaModelContext,
HasComponentFactoryRegistry,
HasPageClassRegistry {
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelBase.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelBase.java
index d18c47e7481..cb4e9e44ed2 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelBase.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelBase.java
@@ -22,15 +22,14 @@
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
-
import org.jspecify.annotations.Nullable;
import org.apache.causeway.applib.services.i18n.LanguageProvider;
import org.apache.causeway.applib.services.userreg.EmailNotificationService;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.viewer.commons.applib.services.header.HeaderUiModel;
import
org.apache.causeway.viewer.commons.applib.services.header.HeaderUiService;
import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
import org.apache.causeway.viewer.wicket.model.models.ImageResourceCache;
import
org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import
org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegistry;
@@ -46,7 +45,7 @@
*/
public class PanelBase<T>
extends GenericPanel<T>
-implements HasCommonContext {
+implements HasMetaModelContext {
private static final long serialVersionUID = 1L;
diff --git
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
index d5ef50865c7..fc63282dca5 100644
---
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
+++
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/AuthenticatedWebSessionForCauseway.java
@@ -44,7 +44,6 @@
import
org.apache.causeway.core.security.authentication.manager.AuthenticationManager;
import
org.apache.causeway.viewer.wicket.model.causeway.HasAmendableInteractionContext;
import org.apache.causeway.viewer.wicket.model.models.BookmarkedPagesModel;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.causeway.viewer.wicket.ui.pages.BookmarkedPagesModelProvider;
@@ -65,7 +64,7 @@ public class AuthenticatedWebSessionForCauseway
implements
BreadcrumbModelProvider,
BookmarkedPagesModelProvider,
- HasCommonContext,
+ HasMetaModelContext,
HasAmendableInteractionContext {
private static final long serialVersionUID = 1L;
diff --git
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
index f847d353f39..86871a488d0 100644
---
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
+++
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
@@ -60,9 +60,9 @@
import org.apache.causeway.commons.internal.base._Timing;
import org.apache.causeway.commons.internal.base._Timing.StopWatch;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
+import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import
org.apache.causeway.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.causeway.viewer.wicket.model.models.HasCommonContext;
import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
@@ -84,7 +84,7 @@
@Log4j2
public class WebRequestCycleForCauseway
implements
- HasCommonContext,
+ HasMetaModelContext,
IRequestCycleListener {
// introduced (CAUSEWAY-1922) to handle render 'session refreshed'
messages after session was expired
diff --git
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java
index 3572b1173e2..7e039e8c6bb 100644
---
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java
+++
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CausewayWicketApplication.java
@@ -54,7 +54,6 @@
import org.apache.causeway.commons.internal.concurrent._ConcurrentTaskList;
import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.config.environment.CausewaySystemEnvironment;
-import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.objectmanager.memento.ObjectMemento;
@@ -98,8 +97,7 @@ public class CausewayWicketApplication
extends AuthenticatedWebApplication
implements
HasComponentFactoryRegistry,
- HasPageClassRegistry,
- HasMetaModelContext {
+ HasPageClassRegistry {
private static final long serialVersionUID = 1L;
@@ -110,7 +108,7 @@ public static CausewayWicketApplication get() {
return (CausewayWicketApplication) AuthenticatedWebApplication.get();
}
- @Getter(onMethod = @__(@Override))
+ @Getter
@Inject private MetaModelContext metaModelContext;
@Inject private List<WicketApplicationInitializer> applicationInitializers;
@Inject private CausewaySystemEnvironment systemEnvironment;
