You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/06/24 09:49:33 UTC
[isis] branch master updated: ISIS-2340: IsisWebAppCommonContext ->
IsisAppCommonContext
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 f311e99 ISIS-2340: IsisWebAppCommonContext -> IsisAppCommonContext
f311e99 is described below
commit f311e99234368bfd226c36f638c641f0b6d71e3d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jun 24 11:49:18 2020 +0200
ISIS-2340: IsisWebAppCommonContext -> IsisAppCommonContext
---
...AppCommonContext.java => IsisAppCommonContext.java} | 10 +++++-----
.../ui/component/EventProviderAbstract.java | 6 +++---
.../ui/component/FullCalendarWithEventHandling.java | 8 ++++----
.../javafx/model/action/ActionLinkFactoryFx.java | 4 ++--
.../incubator/viewer/javafx/ui/main/MenuBuilderFx.java | 4 ++--
.../incubator/viewer/javafx/ui/main/UiController.java | 4 ++--
.../vaadin/model/action/ActionLinkFactoryVaa.java | 4 ++--
.../viewer/vaadin/model/decorator/Decorators.java | 4 ++--
.../viewer/vaadin/ui/pages/main/MainView.java | 6 +++---
.../vaadin/ui/pages/main/MainView_createHeader.java | 8 ++++----
.../common/model/action/ActionLinkUiModelFactory.java | 4 ++--
.../isis/viewer/common/model/menu/MenuUiModel.java | 6 +++---
.../common/model/menu/MenuUiModel_buildMenuItems.java | 8 ++++----
.../common/model/object/SimpleObjectUiModel.java | 4 ++--
.../viewer/wicket/model/common/CommonContextUtils.java | 8 ++++----
.../wicket/model/modelhelpers/WhereAmIHelper.java | 4 ++--
.../isis/viewer/wicket/model/models/AboutModel.java | 4 ++--
.../isis/viewer/wicket/model/models/ActionModel.java | 4 ++--
.../wicket/model/models/BookmarkedPagesModel.java | 4 ++--
.../wicket/model/models/EntityCollectionModel.java | 4 ++--
.../isis/viewer/wicket/model/models/EntityModel.java | 18 +++++++++---------
.../wicket/model/models/FormExecutorContext.java | 2 +-
.../viewer/wicket/model/models/ManagedObjectModel.java | 6 +++---
.../isis/viewer/wicket/model/models/ModelAbstract.java | 12 ++++++------
.../viewer/wicket/model/models/PageParameterUtil.java | 8 ++++----
.../isis/viewer/wicket/model/models/PendingModel.java | 4 ++--
.../wicket/model/models/ServiceActionsModel.java | 4 ++--
.../isis/viewer/wicket/model/models/ValueModel.java | 4 ++--
.../isis/viewer/wicket/model/models/VoidModel.java | 4 ++--
.../isis/viewer/wicket/model/models/WelcomeModel.java | 4 ++--
.../viewer/wicket/model/util/ComponentHintKey.java | 6 +++---
.../wicket/model/models/EntityModel_hintsTest.java | 4 ++--
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 4 ++--
.../viewer/wicket/ui/ComponentFactoryAbstract.java | 4 ++--
.../ActionResultResponseHandlingStrategy.java | 12 ++++++------
.../ui/actionresponse/ActionResultResponseType.java | 4 ++--
.../isis/viewer/wicket/ui/components/LabelBase.java | 8 ++++----
.../viewer/wicket/ui/components/WebComponentBase.java | 8 ++++----
.../wicket/ui/components/about/JarManifestModel.java | 4 ++--
.../actionmenu/serviceactions/ServiceActionUtil.java | 10 +++++-----
.../collection/AssociatedWithActionsHelper.java | 4 ++--
.../ajaxtable/PrototypingMessageProvider.java | 6 +++---
.../ajaxtable/columns/ColumnAbstract.java | 10 +++++-----
.../ajaxtable/columns/ObjectAdapterPropertyColumn.java | 4 ++--
.../ajaxtable/columns/ObjectAdapterTitleColumn.java | 4 ++--
.../columns/ObjectAdapterToggleboxColumn.java | 6 +++---
.../scalars/ScalarPanelTextFieldAbstract.java | 6 +++---
.../datepicker/TextFieldWithDateTimePicker.java | 4 ++--
.../ui/components/tree/IsisToWicketTreeAdapter.java | 18 +++++++++---------
.../widgets/breadcrumbs/BreadcrumbModel.java | 6 +++---
.../widgets/breadcrumbs/BreadcrumbPanel.java | 6 +++---
.../ui/components/widgets/linkandlabel/ActionLink.java | 6 +++---
.../linkandlabel/LinkAndLabelFactoryAbstract.java | 4 ++--
.../ObjectAdapterMementoProviderAbstract.java | 4 ++--
.../isis/viewer/wicket/ui/errors/ExceptionModel.java | 6 +++---
.../isis/viewer/wicket/ui/errors/JGrowlBehaviour.java | 8 ++++----
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 8 ++++----
.../ui/pages/accmngt/EmailAvailableValidator.java | 8 ++++----
.../ui/pages/accmngt/UsernameAvailableValidator.java | 6 +++---
.../wicket/ui/pages/actionprompt/ActionPromptPage.java | 6 +++---
.../isis/viewer/wicket/ui/pages/entity/EntityPage.java | 10 +++++-----
.../isis/viewer/wicket/ui/panels/FormAbstract.java | 6 +++---
.../viewer/wicket/ui/panels/FormExecutorDefault.java | 4 ++--
.../apache/isis/viewer/wicket/ui/panels/PanelBase.java | 8 ++++----
.../viewer/wicket/ui/validation/ValidatorBase.java | 6 +++---
.../wicket/ui/ComponentFactoryAbstractTest_init.java | 6 +++---
.../CollectionContentsSelectorDropdownPanelTest.java | 4 ++--
...bjectAdapterMementoProviderForValueChoicesTest.java | 4 ++--
.../integration/AuthenticatedWebSessionForIsis.java | 8 ++++----
.../integration/ConverterForObjectAdapterMemento.java | 4 ++--
.../viewer/integration/WebRequestCycleForIsis.java | 6 +++---
.../components/ComponentFactoryRegistryDefault.java | 6 +++---
.../wicket/viewer/wicketapp/IsisWicketApplication.java | 8 ++++----
.../IsisWicketApplication_newPageFactory.java | 4 ++--
.../AuthenticatedWebSessionForIsis_Authenticate.java | 4 ++--
.../AuthenticatedWebSessionForIsis_SignIn.java | 4 ++--
.../AuthenticatedWebSessionForIsis_TestAbstract.java | 4 ++--
77 files changed, 232 insertions(+), 232 deletions(-)
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisAppCommonContext.java
similarity index 94%
rename from core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisAppCommonContext.java
index 7038cf5..0f0d9cd 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisAppCommonContext.java
@@ -51,13 +51,13 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Log4j2
-public class IsisWebAppCommonContext implements MetaModelContext.Delegating {
+public class IsisAppCommonContext implements MetaModelContext.Delegating {
/**
* Can be bootstrapped from a {@link MetaModelContext}
*/
- public static IsisWebAppCommonContext of(MetaModelContext metaModelContext) {
- val webAppCommonContext = new IsisWebAppCommonContext();
+ public static IsisAppCommonContext of(MetaModelContext metaModelContext) {
+ val webAppCommonContext = new IsisAppCommonContext();
webAppCommonContext.metaModelContext = metaModelContext;
return webAppCommonContext;
}
@@ -131,14 +131,14 @@ public class IsisWebAppCommonContext implements MetaModelContext.Delegating {
// -- COMMON CONTEXT PROVIDER INTERFACE
public static interface Provider {
- IsisWebAppCommonContext getCommonContext();
+ IsisAppCommonContext getCommonContext();
}
// -- FOR THOSE THAT IMPLEMENT BY DELEGATION
public static interface HasCommonContext {
- IsisWebAppCommonContext getCommonContext();
+ IsisAppCommonContext getCommonContext();
default IsisConfiguration getConfiguration() {
return getCommonContext().getConfiguration();
diff --git a/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java b/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java
index a1bfcf2..369d811 100644
--- a/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java
+++ b/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/EventProviderAbstract.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.extensions.fullcalendar.applib.spi.CalendarableDereferencingService;
import org.apache.isis.extensions.fullcalendar.applib.value.CalendarEvent;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
@@ -69,7 +69,7 @@ public abstract class EventProviderAbstract implements EventProvider {
}
}
- private Object dereference(final IsisWebAppCommonContext commonContext, final Object domainObject) {
+ private Object dereference(final IsisAppCommonContext commonContext, final Object domainObject) {
val serviceRegistry = commonContext.getServiceRegistry();
val services = serviceRegistry.select(CalendarableDereferencingService.class);
for (final CalendarableDereferencingService dereferencingService : services) {
@@ -84,7 +84,7 @@ public abstract class EventProviderAbstract implements EventProvider {
protected abstract CalendarEvent calendarEventFor(final Object domainObject, final String calendarName);
private Function<ManagedObject, Event> newEvent(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final String calendarName) {
return input -> {
diff --git a/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/FullCalendarWithEventHandling.java b/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/FullCalendarWithEventHandling.java
index d1fc2cd..052ea6c 100644
--- a/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/FullCalendarWithEventHandling.java
+++ b/extensions/vw/fullcalendar/ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component/FullCalendarWithEventHandling.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.objectmanager.load.ObjectLoader;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
@@ -44,7 +44,7 @@ final class FullCalendarWithEventHandling extends FullCalendar {
@SuppressWarnings("unused")
private final NotificationPanel feedback;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
FullCalendarWithEventHandling(
@@ -68,7 +68,7 @@ final class FullCalendarWithEventHandling extends FullCalendar {
final SpecificationLoader specificationLoader = commonContext.getSpecificationLoader();
final MetaModelContext metaModelContext = commonContext.getMetaModelContext();
final ObjectManager objectManager = commonContext.getObjectManager();
- final IsisWebAppCommonContext webAppCommonContext = IsisWebAppCommonContext.of(metaModelContext);
+ final IsisAppCommonContext webAppCommonContext = IsisAppCommonContext.of(metaModelContext);
val spec = specificationLoader.loadSpecification(oid.getObjectSpecId());
val objectId = oid.getIdentifier();
@@ -84,7 +84,7 @@ final class FullCalendarWithEventHandling extends FullCalendar {
// otherwise ignore
}
- public IsisWebAppCommonContext getCommonContext() {
+ public IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/action/ActionLinkFactoryFx.java b/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/action/ActionLinkFactoryFx.java
index 8bccf20..e23d6d8 100644
--- a/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/action/ActionLinkFactoryFx.java
+++ b/incubator/viewers/javafx/model/src/main/java/org/apache/isis/incubator/viewer/javafx/model/action/ActionLinkFactoryFx.java
@@ -20,7 +20,7 @@ package org.apache.isis.incubator.viewer.javafx.model.action;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.common.model.action.ActionLinkUiModel;
import org.apache.isis.viewer.common.model.action.ActionLinkUiModelFactory;
import org.apache.isis.viewer.common.model.object.SimpleObjectUiModel;
@@ -36,7 +36,7 @@ public class ActionLinkFactoryFx implements ActionLinkUiModelFactory<Node> {
@Override
public ActionLinkFx newAction(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
String named,
ManagedAction managedAction) {
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MenuBuilderFx.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MenuBuilderFx.java
index 3cf7889..2e23e35 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MenuBuilderFx.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/MenuBuilderFx.java
@@ -20,7 +20,7 @@ package org.apache.isis.incubator.viewer.javafx.ui.main;
import org.apache.isis.applib.layout.menubars.bootstrap3.BS3Menu;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.incubator.viewer.javafx.model.action.ActionLinkFactoryFx;
import org.apache.isis.viewer.common.model.menu.MenuBuilder;
@@ -35,7 +35,7 @@ import javafx.scene.control.MenuBar;
@Log4j2
public class MenuBuilderFx implements MenuBuilder {
- private final IsisWebAppCommonContext commonContext;
+ private final IsisAppCommonContext commonContext;
private final MenuBar menuBar;
private Menu currentTopLevelMenu = null;
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiController.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiController.java
index b46b006..5656c49 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiController.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/main/UiController.java
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.common.model.header.HeaderUiModelProvider;
import lombok.RequiredArgsConstructor;
@@ -55,7 +55,7 @@ public class UiController {
private void buildMenu() {
val header = headerUiModelProvider.getHeader();
- val commonContext = IsisWebAppCommonContext.of(metaModelContext);
+ val commonContext = IsisAppCommonContext.of(metaModelContext);
val leftMenuBuilder = MenuBuilderFx.of(commonContext, menuBarLeft);
val rightMenuBuilder = MenuBuilderFx.of(commonContext, menuBarRight);
diff --git a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionLinkFactoryVaa.java b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionLinkFactoryVaa.java
index 8972e3e..86fa639 100644
--- a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionLinkFactoryVaa.java
+++ b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/ActionLinkFactoryVaa.java
@@ -22,7 +22,7 @@ import com.vaadin.flow.component.Component;
import com.vaadin.flow.component.html.Label;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.incubator.viewer.vaadin.model.decorator.Decorators;
import org.apache.isis.viewer.common.model.action.ActionLinkUiModel;
import org.apache.isis.viewer.common.model.action.ActionLinkUiModelFactory;
@@ -36,7 +36,7 @@ public class ActionLinkFactoryVaa implements ActionLinkUiModelFactory<Component>
@Override
public ActionLinkUiModel<Component> newAction(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
String named,
ManagedAction managedAction) {
diff --git a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java
index 4596de7..6a1d900 100644
--- a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java
+++ b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/decorator/Decorators.java
@@ -29,7 +29,7 @@ import com.vaadin.flow.component.orderedlayout.FlexComponent.Alignment;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import org.apache.isis.applib.layout.component.CssClassFaPosition;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeDecorator;
import org.apache.isis.viewer.common.model.decorator.fa.FontAwesomeUiModel;
import org.apache.isis.viewer.common.model.decorator.tooltip.TooltipDecorator;
@@ -122,7 +122,7 @@ public class Decorators {
public Component decorateWithAvatar(
final Label label,
- final IsisWebAppCommonContext commonContext) {
+ final IsisAppCommonContext commonContext) {
val profileIfAny = commonContext.lookupServiceElseFail(UserProfileUiModelProvider.class)
.getUserProfile();
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
index 216a2f0..f8fe66c 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.interactions.InteractionHead;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.incubator.viewer.vaadin.model.action.ActionLinkVaa;
import org.apache.isis.incubator.viewer.vaadin.ui.components.UiComponentFactoryVaa;
import org.apache.isis.incubator.viewer.vaadin.ui.components.collection.TableView;
@@ -60,7 +60,7 @@ implements BeforeEnterObserver {
private static final long serialVersionUID = 1L;
- private final transient IsisWebAppCommonContext commonContext;
+ private final transient IsisAppCommonContext commonContext;
private final transient UiComponentFactoryVaa uiComponentFactory;
private final transient HeaderUiModelProvider headerUiModelProvider;
private Div pageContent = new Div();
@@ -74,7 +74,7 @@ implements BeforeEnterObserver {
final UiComponentFactoryVaa uiComponentFactory,
final HeaderUiModelProvider headerUiModelProvider) {
- this.commonContext = IsisWebAppCommonContext.of(metaModelContext);
+ this.commonContext = IsisAppCommonContext.of(metaModelContext);
this.uiComponentFactory = uiComponentFactory;
this.headerUiModelProvider = headerUiModelProvider;
}
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView_createHeader.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView_createHeader.java
index 2ef7094..74df512 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView_createHeader.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView_createHeader.java
@@ -31,7 +31,7 @@ import com.vaadin.flow.component.menubar.MenuBar;
import com.vaadin.flow.component.orderedlayout.FlexComponent.Alignment;
import com.vaadin.flow.component.orderedlayout.FlexLayout;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.incubator.viewer.vaadin.model.action.ActionLinkFactoryVaa;
import org.apache.isis.incubator.viewer.vaadin.model.action.ActionLinkVaa;
import org.apache.isis.incubator.viewer.vaadin.model.decorator.Decorators;
@@ -46,7 +46,7 @@ import lombok.val;
final class MainView_createHeader {
static Component createHeader(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final HeaderUiModel headerUiModel,
final Consumer<ActionLinkVaa> subMenuEventHandler) {
@@ -115,7 +115,7 @@ final class MainView_createHeader {
// -- HELPER
private static Component createTitleOrLogo(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final BrandingUiModel brandingUiModel) {
@@ -136,7 +136,7 @@ final class MainView_createHeader {
}
private static void buildMenuModel(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final MenuUiModel menuUiModel,
final Consumer<MenuItemVaa> onNewMenuItem) {
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionLinkUiModelFactory.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionLinkUiModelFactory.java
index 3a41c0b..4b47030 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionLinkUiModelFactory.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionLinkUiModelFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.common.model.action;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
/**
* Creates an {@link ActionLinkUiModel}, a holder of the <em>Action's</em> meta-model
@@ -40,7 +40,7 @@ public interface ActionLinkUiModelFactory<T> {
* @return
*/
ActionLinkUiModel<T> newAction(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
String named,
ManagedAction managedAction);
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
index 1e0ac5e..1169d41 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
@@ -28,7 +28,7 @@ import java.util.function.Function;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.common.model.action.ActionLinkUiModelFactory;
import org.apache.isis.viewer.common.model.menuitem.MenuItemUiModel;
@@ -54,7 +54,7 @@ public class MenuUiModel implements Serializable {
public <T, M extends MenuItemUiModel<T, M>>
void buildMenuItems(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final ActionLinkUiModelFactory<T> menuActionFactory,
final Function<String, M> menuItemFactory,
final Consumer<M> onNewMenuItem) {
@@ -74,7 +74,7 @@ public class MenuUiModel implements Serializable {
}
public void buildMenuItems(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final MenuBuilder menuBuilder) {
val menuBars = commonContext.getMenuBarsService().menuBars();
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
index ae020cd..c8b1095 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.layout.menubars.bootstrap3.BS3Menu;
import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.common.model.action.ActionLinkUiModelFactory;
import org.apache.isis.viewer.common.model.menuitem.MenuItemUiModel;
import org.apache.isis.viewer.common.model.userprofile.UserProfileUiModelProvider;
@@ -39,7 +39,7 @@ final class MenuUiModel_buildMenuItems {
public static <T, M extends MenuItemUiModel<T, M>>
void buildMenuItems(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final BS3MenuBar menuBar,
final ActionLinkUiModelFactory<T> menuActionFactory,
final Function<String, M> menuItemFactory,
@@ -108,7 +108,7 @@ final class MenuUiModel_buildMenuItems {
*/
private static <T, M extends MenuItemUiModel<T, M>>
M processTopLevel(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final Function<String, M> menuItemFactory,
final BS3Menu menu) {
@@ -129,7 +129,7 @@ final class MenuUiModel_buildMenuItems {
}
private static String userProfileName(
- final IsisWebAppCommonContext commonContext) {
+ final IsisAppCommonContext commonContext) {
val userProfile = commonContext
.lookupServiceElseFail(UserProfileUiModelProvider.class)
.getUserProfile();
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/SimpleObjectUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/SimpleObjectUiModel.java
index b7580b3..2cb4a1a 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/SimpleObjectUiModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/SimpleObjectUiModel.java
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.common.model.object;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.Getter;
import lombok.NonNull;
@@ -28,7 +28,7 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public class SimpleObjectUiModel implements ObjectUiModel {
- private final IsisWebAppCommonContext commonContext;
+ private final IsisAppCommonContext commonContext;
@NonNull @Getter(onMethod = @__(@Override))
private final ManagedObject managedObject;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
index 900c335..1d425c4 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.model.common;
import org.apache.wicket.Session;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -29,12 +29,12 @@ import lombok.val;
*/
public class CommonContextUtils {
- public static IsisWebAppCommonContext getCommonContext() {
+ public static IsisAppCommonContext getCommonContext() {
val application = Session.get().getApplication();
- return ((IsisWebAppCommonContext.Provider) application).getCommonContext();
+ return ((IsisAppCommonContext.Provider) application).getCommonContext();
}
- public static IsisWebAppCommonContext computeIfAbsent(IsisWebAppCommonContext commonContext) {
+ public static IsisAppCommonContext computeIfAbsent(IsisAppCommonContext commonContext) {
return commonContext!=null
? commonContext
: getCommonContext();
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/modelhelpers/WhereAmIHelper.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/modelhelpers/WhereAmIHelper.java
index c302672..99a7ab3 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/modelhelpers/WhereAmIHelper.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/modelhelpers/WhereAmIHelper.java
@@ -24,7 +24,7 @@ import java.util.stream.Stream;
import org.apache.isis.core.metamodel.util.pchain.ParentChain;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -41,7 +41,7 @@ public class WhereAmIHelper {
private final LinkedList<Object> reversedChainOfParents = new LinkedList<>();
private final EntityModel startOfChain;
- private final IsisWebAppCommonContext commonContext;
+ private final IsisAppCommonContext commonContext;
private final boolean isWhereAmIEnabled;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
index bdc2d71..0e6ef7a 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.wicket.model.models;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
/**
* Model providing welcome text.
@@ -28,7 +28,7 @@ public class AboutModel extends ModelAbstract<String> {
private static final long serialVersionUID = 1L;
- public AboutModel(IsisWebAppCommonContext commonContext, String message) {
+ public AboutModel(IsisAppCommonContext commonContext, String message) {
super(commonContext);
setObject(message);
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 0d2b752..f134068 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -57,7 +57,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.specloader.specimpl.PendingParameterModel;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.common.model.action.form.FormPendingParamUiModel;
import org.apache.isis.viewer.common.model.action.form.FormUiModel;
import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
@@ -85,7 +85,7 @@ implements FormUiModel, FormExecutorContext, BookmarkableModel {
}
public static ActionModel ofPageParameters(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
PageParameters pageParameters) {
return PageParameterUtil.actionModelFor(commonContext, pageParameters);
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index b78a409..ce1a277 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -28,7 +28,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -41,7 +41,7 @@ public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>>
private transient PageParameters current;
- public BookmarkedPagesModel(IsisWebAppCommonContext commonContext) {
+ public BookmarkedPagesModel(IsisAppCommonContext commonContext) {
super(commonContext);
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index c19e613..c55dea2 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
@@ -341,7 +341,7 @@ implements LinksProvider, UiHintContainer {
private ActionModel actionModelHint;
private EntityCollectionModel(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
Variant type,
EntityModel entityModel,
Class<?> typeOf,
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index bd2db2c..0535644 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.viewer.common.model.object.ObjectUiModel;
import org.apache.isis.viewer.common.model.object.ObjectUiModel.HasRenderingHints;
@@ -78,14 +78,14 @@ implements HasRenderingHints, ObjectAdapterModel, UiHintContainer, ObjectUiModel
// -- FACTORIES
public static EntityModel ofParameters(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
PageParameters pageParameters) {
return ofMemento(commonContext, commonContext.mementoFor(rootOidFrom(pageParameters)));
}
public static EntityModel ofAdapter(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ManagedObject adapter) {
val adapterMemento = commonContext.mementoFor(adapter);
@@ -93,14 +93,14 @@ implements HasRenderingHints, ObjectAdapterModel, UiHintContainer, ObjectUiModel
}
public static EntityModel ofMemento(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ObjectMemento adapterMemento) {
return ofMemento(commonContext, adapterMemento, /*propertyScalarModels*/null);
}
private static EntityModel ofMemento(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ObjectMemento adapterMemento,
@Nullable Map<PropertyMemento, ScalarModel> propertyScalarModels) {
@@ -109,10 +109,10 @@ implements HasRenderingHints, ObjectAdapterModel, UiHintContainer, ObjectUiModel
}
/**
- * As used by TreeModel (same as {@link #ofAdapter(IsisWebAppCommonContext, ManagedObject)}
+ * As used by TreeModel (same as {@link #ofAdapter(IsisAppCommonContext, ManagedObject)}
*/
protected EntityModel(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ManagedObject adapter) {
this(commonContext,
@@ -124,13 +124,13 @@ implements HasRenderingHints, ObjectAdapterModel, UiHintContainer, ObjectUiModel
/**
* As used by ScalarModel
*/
- protected EntityModel(IsisWebAppCommonContext commonContext, Mode mode, RenderingHint renderingHint) {
+ protected EntityModel(IsisAppCommonContext commonContext, Mode mode, RenderingHint renderingHint) {
this(commonContext, null, _Maps.<PropertyMemento, ScalarModel>newHashMap(),
mode, renderingHint);
}
private EntityModel(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ObjectMemento adapterMemento,
@Nullable Map<PropertyMemento, ScalarModel> propertyScalarModels,
Mode mode,
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java
index b4c8ab7..c896312 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/FormExecutorContext.java
@@ -20,7 +20,7 @@
package org.apache.isis.viewer.wicket.model.models;
import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext.HasCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext.HasCommonContext;
import org.apache.isis.viewer.common.model.HasParentUiModel;
public interface FormExecutorContext
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ManagedObjectModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ManagedObjectModel.java
index 991866b..4916e66 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ManagedObjectModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ManagedObjectModel.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.NonNull;
@@ -52,12 +52,12 @@ extends ModelAbstract<ManagedObject> {
private ObjectMemento memento;
protected ManagedObjectModel(
- @NonNull IsisWebAppCommonContext commonContext) {
+ @NonNull IsisAppCommonContext commonContext) {
this(commonContext, null);
}
protected ManagedObjectModel(
- @NonNull IsisWebAppCommonContext commonContext,
+ @NonNull IsisAppCommonContext commonContext,
@Nullable ObjectMemento initialMemento) {
super(commonContext);
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
index 06c0aab..8529d2e 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
@@ -22,8 +22,8 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext.HasCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext.HasCommonContext;
import lombok.NonNull;
@@ -37,19 +37,19 @@ implements HasCommonContext {
private static final long serialVersionUID = 1L;
- @NonNull private transient IsisWebAppCommonContext commonContext;
+ @NonNull private transient IsisAppCommonContext commonContext;
- public ModelAbstract(IsisWebAppCommonContext commonContext) {
+ public ModelAbstract(IsisAppCommonContext commonContext) {
this.commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
- public ModelAbstract(IsisWebAppCommonContext commonContext, T t) {
+ public ModelAbstract(IsisAppCommonContext commonContext, T t) {
super(t);
this.commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
@Override
- public IsisWebAppCommonContext getCommonContext() {
+ public IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java
index effb51b..aa0f066 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PageParameterUtil.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
@@ -50,7 +50,7 @@ import lombok.experimental.UtilityClass;
@UtilityClass
public class PageParameterUtil {
- public static ActionModel actionModelFor(IsisWebAppCommonContext commonContext, PageParameters pageParameters) {
+ public static ActionModel actionModelFor(IsisAppCommonContext commonContext, PageParameters pageParameters) {
val entityModel = newEntityModelFrom(commonContext, pageParameters);
val actionMemento = newActionMementoFrom(commonContext, pageParameters);
val actionModel = ActionModel.of(entityModel, actionMemento);
@@ -137,7 +137,7 @@ public class PageParameterUtil {
}
private static ActionMemento newActionMementoFrom(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
PageParameters pageParameters) {
final ObjectSpecId owningSpec = ObjectSpecId.of(PageParameterNames.ACTION_OWNING_SPEC.getStringFrom(pageParameters));
@@ -183,7 +183,7 @@ public class PageParameterUtil {
}
private static EntityModel newEntityModelFrom(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
PageParameters pageParameters) {
val rootOid = oidFor(pageParameters);
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PendingModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PendingModel.java
index efb57e8..e60ed31 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PendingModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/PendingModel.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.NonNull;
@@ -68,7 +68,7 @@ final class PendingModel extends Model<ObjectMemento> {
// -- HELPER
- private IsisWebAppCommonContext getCommonContext() {
+ private IsisAppCommonContext getCommonContext() {
return ownerModel.getCommonContext();
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
index 71abcca..fde4955 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.wicket.model.models;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.common.model.menu.MenuUiModel;
/**
* Backing model for actions of application services menu bar (typically, as
@@ -36,7 +36,7 @@ public class ServiceActionsModel extends ModelAbstract<MenuUiModel> {
* @param menuBarSelect - may be null in special case of rendering the tertiary menu on the error page.
*/
public ServiceActionsModel(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final MenuUiModel menuUiModel) {
super(commonContext);
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
index 0c8a6d9..00bdbb9 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
/**
@@ -33,7 +33,7 @@ public class ValueModel extends ModelAbstract<ManagedObject> {
private final ObjectMemento adapterMemento;
- public ValueModel(IsisWebAppCommonContext commonContext, ManagedObject adapter) {
+ public ValueModel(IsisAppCommonContext commonContext, ManagedObject adapter) {
super(commonContext);
adapterMemento = super.getMementoService().mementoForObject(adapter);
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
index 6c4cab8..eef0a46 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
@@ -20,7 +20,7 @@
package org.apache.isis.viewer.wicket.model.models;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
/**
@@ -30,7 +30,7 @@ public class VoidModel extends ModelAbstract<Void> {
private static final long serialVersionUID = 1L;
- public VoidModel(IsisWebAppCommonContext commonContext) {
+ public VoidModel(IsisAppCommonContext commonContext) {
super(commonContext);
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
index 9d891ba..5489d50 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.wicket.model.models;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
/**
* Model providing welcome text.
@@ -28,7 +28,7 @@ public class WelcomeModel extends ModelAbstract<String> {
private static final long serialVersionUID = 1L;
- public WelcomeModel(IsisWebAppCommonContext commonContext, String message) {
+ public WelcomeModel(IsisAppCommonContext commonContext, String message) {
super(commonContext);
setObject(message);
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
index 4311d8b..b9f3fe2 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
@@ -27,7 +27,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.hint.HintStore;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
@@ -42,11 +42,11 @@ public class ComponentHintKey implements Serializable {
private static final long serialVersionUID = 1L;
- public static ComponentHintKey create(IsisWebAppCommonContext commonContext, Provider<Component> pathProvider, String key) {
+ public static ComponentHintKey create(IsisAppCommonContext commonContext, Provider<Component> pathProvider, String key) {
return new ComponentHintKey(commonContext.lookupServiceElseFail(HintStore.class), pathProvider, null, key, null);
}
- public static ComponentHintKey create(IsisWebAppCommonContext commonContext, Component path, String key) {
+ public static ComponentHintKey create(IsisAppCommonContext commonContext, Component path, String key) {
return new ComponentHintKey(commonContext.lookupServiceElseFail(HintStore.class), null, path, key, null);
}
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
index 87a8b3d..4aac70a 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -54,7 +54,7 @@ public class EntityModel_hintsTest {
public void setUp() throws Exception {
metaModelContext = MetaModelContext_forTesting.buildDefault();
- val commonContext = IsisWebAppCommonContext.of(metaModelContext);
+ val commonContext = IsisAppCommonContext.of(metaModelContext);
target = new EntityModel(commonContext, EntityModel.Mode.VIEW, EntityModel.RenderingHint.REGULAR);
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
index be6d00c..24918f9 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
import lombok.val;
@@ -62,7 +62,7 @@ public class ScalarModel_isScalarSubtypingAnyOf_Test {
.singleton(mockObjectAdapterMementoSupport)
.build();
- val commonContext = IsisWebAppCommonContext.of(metaModelContext);
+ val commonContext = IsisAppCommonContext.of(metaModelContext);
context.checking(new Expectations() {{
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
index fb5e645..70b8073 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
@@ -24,7 +24,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.Getter;
import lombok.Setter;
@@ -36,7 +36,7 @@ public abstract class ComponentFactoryAbstract implements ComponentFactory {
private static final long serialVersionUID = 1L;
- @Getter @Setter private transient IsisWebAppCommonContext commonContext;
+ @Getter @Setter private transient IsisAppCommonContext commonContext;
private final ComponentType componentType;
private final String name;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
index 85ed34c..41c75ae 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
@@ -33,13 +33,13 @@ import org.apache.wicket.util.time.Duration;
import org.apache.isis.viewer.wicket.model.models.VoidModel;
import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
public enum ActionResultResponseHandlingStrategy {
REDIRECT_TO_VOID {
@Override
public void handleResults(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ActionResultResponse resultResponse) {
final RequestCycle requestCycle = RequestCycle.get();
@@ -49,7 +49,7 @@ public enum ActionResultResponseHandlingStrategy {
REDIRECT_TO_PAGE {
@Override
public void handleResults(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ActionResultResponse resultResponse) {
// force any changes in state etc to happen now prior to the redirect;
@@ -66,7 +66,7 @@ public enum ActionResultResponseHandlingStrategy {
SCHEDULE_HANDLER {
@Override
public void handleResults(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ActionResultResponse resultResponse) {
final RequestCycle requestCycle = RequestCycle.get();
@@ -92,7 +92,7 @@ public enum ActionResultResponseHandlingStrategy {
OPEN_URL_IN_BROWSER {
@Override
public void handleResults(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ActionResultResponse resultResponse) {
final AjaxRequestTarget target = resultResponse.getTarget();
@@ -107,7 +107,7 @@ public enum ActionResultResponseHandlingStrategy {
};
public abstract void handleResults(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ActionResultResponse resultResponse);
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index 719a866..9bf3bb8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -39,7 +39,7 @@ import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
import org.apache.isis.viewer.wicket.ui.pages.value.ValuePage;
import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -132,7 +132,7 @@ public enum ActionResultResponseType {
}
private static ManagedObject determineActualAdapter(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ManagedObject resultAdapter) {
if (resultAdapter.getSpecification().isNotCollection()) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/LabelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/LabelBase.java
index 8b2fe47..a03364c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/LabelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/LabelBase.java
@@ -23,8 +23,8 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext.HasCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext.HasCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
/**
@@ -47,10 +47,10 @@ implements HasCommonContext {
private transient IsisConfiguration isisConfiguration;
private transient WebAppContextPath webAppContextPath;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
@Override
- public IsisWebAppCommonContext getCommonContext() {
+ public IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/WebComponentBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/WebComponentBase.java
index 91828f6..d16d27a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/WebComponentBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/WebComponentBase.java
@@ -23,8 +23,8 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext.HasCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext.HasCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
/**
@@ -47,10 +47,10 @@ implements HasCommonContext {
private transient IsisConfiguration isisConfiguration;
private transient WebAppContextPath webAppContextPath;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
@Override
- public IsisWebAppCommonContext getCommonContext() {
+ public IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
index e93a667..35d23c6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.commons.CloseableExtensions;
import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
public class JarManifestModel extends ModelAbstract<JarManifestModel> {
@@ -51,7 +51,7 @@ public class JarManifestModel extends ModelAbstract<JarManifestModel> {
* @param commonContext
* @param metaInfManifestIs provide using <tt>getServletContext().getResourceAsStream("/META-INF/MANIFEST.MF")</tt>
*/
- public JarManifestModel(IsisWebAppCommonContext commonContext, InputStream metaInfManifestIs) {
+ public JarManifestModel(IsisAppCommonContext commonContext, InputStream metaInfManifestIs) {
super(commonContext);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index 0e8a7d0..0dd31e2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -30,7 +30,7 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.isis.core.metamodel.interactions.managed.ManagedAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.common.model.action.ActionLinkUiModelFactory;
import org.apache.isis.viewer.common.model.menu.MenuUiModel;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
@@ -47,7 +47,7 @@ import lombok.experimental.UtilityClass;
public final class ServiceActionUtil {
static void addLeafItem(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
CssMenuItem menuItem,
ListItem<CssMenuItem> listItem,
MarkupContainer parent) {
@@ -75,7 +75,7 @@ public final class ServiceActionUtil {
}
static void addFolderItem(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
CssMenuItem subMenuItem,
ListItem<CssMenuItem> listItem,
MarkupContainer parent) {
@@ -110,7 +110,7 @@ public final class ServiceActionUtil {
@Override
public LinkAndLabel newAction(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
String named,
ManagedAction managedAction) {
@@ -131,7 +131,7 @@ public final class ServiceActionUtil {
public static void buildMenu(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final MenuUiModel menuUiModel,
final Consumer<CssMenuItem> onNewMenuItem) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
index 0333247..2cd08a7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import lombok.val;
@@ -72,7 +72,7 @@ public class AssociatedWithActionsHelper implements Serializable {
return parentAdapter.getSpecification();
}
- private ImmutableEnumSet<ActionType> inferActionTypes(IsisWebAppCommonContext commonContext) {
+ private ImmutableEnumSet<ActionType> inferActionTypes(IsisAppCommonContext commonContext) {
if (commonContext.getSystemEnvironment().isPrototyping()) {
return ActionType.USER_AND_PROTOTYPE;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
index 13d5a18..affc355 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable
import java.util.Locale;
import org.apache.isis.core.commons.internal.base._Timing;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import lombok.val;
@@ -37,7 +37,7 @@ import lombok.val;
*/
class PrototypingMessageProvider {
- private static IsisWebAppCommonContext commonContext = null;
+ private static IsisAppCommonContext commonContext = null;
public static String getTookTimingMessageModel() {
return isPrototyping()
@@ -47,7 +47,7 @@ class PrototypingMessageProvider {
// -- HELPER
- private static IsisWebAppCommonContext commonContext() {
+ private static IsisAppCommonContext commonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
index 5109ce8..6f3e98e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanel;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -46,20 +46,20 @@ public abstract class ColumnAbstract<T> extends AbstractColumn<T,String> {
private static final long serialVersionUID = 1L;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
private transient ComponentFactoryRegistry componentRegistry;
- public ColumnAbstract(IsisWebAppCommonContext commonContext, String columnName) {
+ public ColumnAbstract(IsisAppCommonContext commonContext, String columnName) {
this(commonContext, Model.of(columnName), null);
}
- public ColumnAbstract(IsisWebAppCommonContext commonContext, IModel<String> columnNameModel, String sortColumn) {
+ public ColumnAbstract(IsisAppCommonContext commonContext, IModel<String> columnNameModel, String sortColumn) {
super(columnNameModel, sortColumn);
this.commonContext = commonContext;
}
- public IsisWebAppCommonContext getCommonContext() {
+ public IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
index 69db3d5..9cad2c3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
@@ -28,7 +28,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -62,7 +62,7 @@ public final class ObjectAdapterPropertyColumn extends ColumnAbstract<ManagedObj
private final String describedAs;
public ObjectAdapterPropertyColumn(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
EntityCollectionModel.Variant collectionVariant,
IModel<String> columnNameModel,
String sortProperty,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
index 0b6b459..f5e9557 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
@@ -26,7 +26,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.viewer.common.model.object.ObjectUiModel.RenderingHint;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -49,7 +49,7 @@ public class ObjectAdapterTitleColumn extends ColumnAbstract<ManagedObject> {
}
public ObjectAdapterTitleColumn(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ObjectMemento parentAdapterMementoIfAny,
int maxTitleLength) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
index 4804cd1..c4b4ffe 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
@@ -30,7 +30,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.OnSelectionHandler;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.checkbox.ContainedToggleboxPanel;
@@ -43,12 +43,12 @@ public final class ObjectAdapterToggleboxColumn extends ColumnAbstract<ManagedOb
private static final long serialVersionUID = 1L;
- public ObjectAdapterToggleboxColumn(IsisWebAppCommonContext commonContext) {
+ public ObjectAdapterToggleboxColumn(IsisAppCommonContext commonContext) {
this(commonContext, null);
}
public ObjectAdapterToggleboxColumn(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
OnSelectionHandler onSelectionHandler) {
super(commonContext, "");
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 717301b..26a6bfd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengt
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
@@ -222,7 +222,7 @@ implements TextFieldValueModel.ScalarModelProvider {
textField.add(new IValidator<T>() {
private static final long serialVersionUID = 1L;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
@Override
public void validate(final IValidatable<T> validatable) {
@@ -240,7 +240,7 @@ implements TextFieldValueModel.ScalarModelProvider {
return getCommonContext().getObjectManager();
}
- private IsisWebAppCommonContext getCommonContext() {
+ private IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index 0582c09..c82335f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -32,7 +32,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.viewer.wicket.ui.components.scalars.DateConverter;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import de.agilecoders.wicket.core.util.Attributes;
@@ -54,7 +54,7 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
private final DateTimeConfig config;
public TextFieldWithDateTimePicker(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
String id,
IModel<T> model,
Class<T> type,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
index afdb817..5119a77 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.commons.internal.functions._Functions;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
@@ -204,12 +204,12 @@ class IsisToWicketTreeAdapter {
private final TreePath treePath;
- public TreeModel(IsisWebAppCommonContext commonContext, TreePath treePath) {
+ public TreeModel(IsisAppCommonContext commonContext, TreePath treePath) {
super(commonContext, (ManagedObject)null);
this.treePath = treePath;
}
- public TreeModel(IsisWebAppCommonContext commonContext, ManagedObject adapter, TreePath treePath) {
+ public TreeModel(IsisAppCommonContext commonContext, ManagedObject adapter, TreePath treePath) {
super(commonContext, Objects.requireNonNull(adapter));
this.treePath = treePath;
}
@@ -236,20 +236,20 @@ class IsisToWicketTreeAdapter {
private final Class<? extends TreeAdapter> treeAdapterClass;
private transient TreeAdapter wrappedTreeAdapter;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
private transient FactoryService factoryService;
private transient Function<Object, ManagedObject> pojoToAdapter;
private TreeModelTreeAdapter(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
Class<? extends TreeAdapter> treeAdapterClass) {
this.treeAdapterClass = treeAdapterClass;
init(commonContext);
}
- private void init(IsisWebAppCommonContext commonContext) {
+ private void init(IsisAppCommonContext commonContext) {
this.commonContext = commonContext;
this.factoryService = commonContext.lookupServiceElseFail(FactoryService.class);
this.pojoToAdapter = pojo ->
@@ -397,7 +397,7 @@ class IsisToWicketTreeAdapter {
private final TreePath treePath;
private final int hashCode;
- private final transient IsisWebAppCommonContext commonContext;
+ private final transient IsisAppCommonContext commonContext;
public LoadableDetachableTreeModel(TreeModel tModel) {
super(tModel);
@@ -476,7 +476,7 @@ class IsisToWicketTreeAdapter {
private static final long serialVersionUID = 648152234030889164L;
public static TreeExpansionModel of(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
Set<TreePath> expandedTreePaths) {
return new TreeExpansionModel(commonContext, expandedTreePaths);
@@ -506,7 +506,7 @@ class IsisToWicketTreeAdapter {
private final Set<TreeModel> expandedNodes;
private TreeExpansionModel(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
Set<TreePath> expandedTreePaths) {
this.expandedTreePaths = expandedTreePaths;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index 10631d3..9c41551 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -47,9 +47,9 @@ public class BreadcrumbModel implements Serializable {
private final Map<Bookmark, String> oidStrByBookmark = _Maps.newHashMap();
private final List<Bookmark> list = _Lists.newArrayList();
- private final transient IsisWebAppCommonContext commonContext;
+ private final transient IsisAppCommonContext commonContext;
- public BreadcrumbModel(IsisWebAppCommonContext commonContext) {
+ public BreadcrumbModel(IsisAppCommonContext commonContext) {
super();
this.commonContext = commonContext;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index e31f1ae..869c2cf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.security.authentication.AuthenticationSession;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -119,7 +119,7 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
private static final long serialVersionUID = 1L;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -141,7 +141,7 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
.getAuthenticationSessionElseFail();
}
- private IsisWebAppCommonContext getCommonContext() {
+ private IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
index 1aa762b..2151034 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.commons.internal.debug._Probe;
import org.apache.isis.core.commons.internal.debug._Probe.EntryPoint;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettingsAccessor;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
@@ -55,13 +55,13 @@ public abstract class ActionLink extends AjaxLink<ManagedObject> implements IAja
final AjaxDeferredBehaviour ajaxDeferredBehaviourIfAny;
- @Getter protected final transient IsisWebAppCommonContext commonContext;
+ @Getter protected final transient IsisAppCommonContext commonContext;
// public ActionLink(String id, ActionModel model) {
// this(id, model, null);
// }
- ActionLink(IsisWebAppCommonContext commonContext, String id, ActionModel model, ObjectAction action) {
+ ActionLink(IsisAppCommonContext commonContext, String id, ActionModel model, ObjectAction action) {
super(id, model);
this.commonContext = commonContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java
index 6f9d1cb..9618c5f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/LinkAndLabelFactoryAbstract.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
import org.apache.isis.core.security.authentication.logout.LogoutMenu.LoginRedirect;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettingsAccessor;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
@@ -321,7 +321,7 @@ implements Serializable {
return getCommonContext().getSpecificationLoader();
}
- protected IsisWebAppCommonContext getCommonContext() {
+ protected IsisAppCommonContext getCommonContext() {
return targetEntityModel.getCommonContext();
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
index 97a357c..714283f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -52,7 +52,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends ChoiceProvide
private static final String NULL_DISPLAY_TEXT = "";
@Getter private final ScalarModel scalarModel;
- @Getter private final transient IsisWebAppCommonContext commonContext;
+ @Getter private final transient IsisAppCommonContext commonContext;
@Getter private final transient WicketViewerSettings wicketViewerSettings;
public ObjectAdapterMementoProviderAbstract(ScalarModel scalarModel) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
index 02c46b4..42db074 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
import lombok.val;
@@ -48,7 +48,7 @@ public class ExceptionModel extends ModelAbstract<List<StackTraceDetail>> {
private final String mainMessage;
public static ExceptionModel create(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
Optional<Recognition> recognition,
Exception ex) {
@@ -64,7 +64,7 @@ public class ExceptionModel extends ModelAbstract<List<StackTraceDetail>> {
* @param recognizedMessageIfAny
* @param ex
*/
- private ExceptionModel(IsisWebAppCommonContext commonContext, String recognizedMessageIfAny, Exception ex) {
+ private ExceptionModel(IsisAppCommonContext commonContext, String recognizedMessageIfAny, Exception ex) {
super(commonContext);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
index 93d7def..52bcf7d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.security.authentication.MessageBroker;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
/**
@@ -47,9 +47,9 @@ import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
public class JGrowlBehaviour extends AbstractDefaultAjaxBehavior {
private static final long serialVersionUID = 1L;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
- public JGrowlBehaviour(IsisWebAppCommonContext commonContext) {
+ public JGrowlBehaviour(IsisAppCommonContext commonContext) {
this.commonContext = commonContext;
}
@@ -87,7 +87,7 @@ public class JGrowlBehaviour extends AbstractDefaultAjaxBehavior {
}
- protected IsisWebAppCommonContext getCommonContext() {
+ protected IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index 345657d..91d81b2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -25,8 +25,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext.HasCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext.HasCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
/**
@@ -42,7 +42,7 @@ implements HasCommonContext {
private transient IsisConfiguration isisConfiguration;
private transient WebAppContextPath webAppContextPath;
private transient PageClassRegistry pageClassRegistry;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
private transient IsisInteractionFactory isisInteractionFactory;
protected WebPageBase(PageParameters parameters) {
@@ -54,7 +54,7 @@ implements HasCommonContext {
}
@Override
- public IsisWebAppCommonContext getCommonContext() {
+ public IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index 43aaec0..1438d45 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
@@ -24,7 +24,7 @@ import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -35,11 +35,11 @@ public class EmailAvailableValidator extends ValidatorBase<String> {
private static final long serialVersionUID = 1L;
- public static EmailAvailableValidator exists(IsisWebAppCommonContext commonContext) {
+ public static EmailAvailableValidator exists(IsisAppCommonContext commonContext) {
return new EmailAvailableValidator(commonContext, true, "noSuchUserByEmail");
}
- public static EmailAvailableValidator doesntExist(IsisWebAppCommonContext commonContext) {
+ public static EmailAvailableValidator doesntExist(IsisAppCommonContext commonContext) {
return new EmailAvailableValidator(commonContext, false, "emailIsNotAvailable");
}
@@ -47,7 +47,7 @@ public class EmailAvailableValidator extends ValidatorBase<String> {
private final String resourceKey;
private EmailAvailableValidator(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
boolean emailExists,
String resourceKey) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
index 4c9ba8d..a6756fe 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
@@ -24,7 +24,7 @@ import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -36,11 +36,11 @@ public class UsernameAvailableValidator extends ValidatorBase<String> {
private static final long serialVersionUID = 1L;
- public static UsernameAvailableValidator instance(IsisWebAppCommonContext commonContext) {
+ public static UsernameAvailableValidator instance(IsisAppCommonContext commonContext) {
return new UsernameAvailableValidator(commonContext);
}
- private UsernameAvailableValidator(IsisWebAppCommonContext commonContext) {
+ private UsernameAvailableValidator(IsisAppCommonContext commonContext) {
super(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
index 0a39f6b..e3a468f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.ui.pages.actionprompt;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
@@ -56,7 +56,7 @@ public class ActionPromptPage extends PageAbstract {
// this(pageParameters, IsisContext.getSpecificationLoader());
// }
- public ActionPromptPage(IsisWebAppCommonContext commonContext, PageParameters pageParameters) {
+ public ActionPromptPage(IsisAppCommonContext commonContext, PageParameters pageParameters) {
this(pageParameters, buildModel(commonContext, pageParameters));
}
@@ -69,7 +69,7 @@ public class ActionPromptPage extends PageAbstract {
}
private static ActionModel buildModel(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
PageParameters pageParameters) {
return ActionModel.ofPageParameters(commonContext, pageParameters);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index f425f46..f470e4b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.facets.object.grid.GridFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.modelhelpers.WhereAmIHelper;
@@ -70,7 +70,7 @@ public class EntityPage extends PageAbstract {
* Specifically handled by <code>IsisWicketApplication#newPageFactory()</code>
*/
public static EntityPage bookmarked(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
PageParameters pageParameters) {
val entityModel = createEntityModel(commonContext, pageParameters);
@@ -85,7 +85,7 @@ public class EntityPage extends PageAbstract {
* @return An EntityModel for the requested OID
*/
private static EntityModel createEntityModel(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
PageParameters parameters) {
String oid = EntityModel.oidStr(parameters);
@@ -103,14 +103,14 @@ public class EntityPage extends PageAbstract {
* Ensures that any exception that might have occurred already (eg from an action invocation) is shown.
*/
public EntityPage(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ManagedObject adapter) {
this(PageParametersUtils.newPageParameters(), newEntityModel(commonContext, adapter));
}
private static EntityModel newEntityModel(
- IsisWebAppCommonContext commonContext,
+ IsisAppCommonContext commonContext,
ManagedObject adapter) {
val entityModel = EntityModel.ofAdapter(commonContext, adapter);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 7d7b18e..fd8a2d2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
public abstract class FormAbstract<T> extends Form<T>
implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
@@ -40,7 +40,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
private transient ComponentFactoryRegistry componentFactoryRegistry;
private transient PageClassRegistry pageClassRegistry;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
public FormAbstract(final String id) {
super(id);
@@ -50,7 +50,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
super(id, model);
}
- public IsisWebAppCommonContext getCommonContext() {
+ public IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index c54d214..62f8f3b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -55,7 +55,7 @@ import org.apache.isis.core.runtime.events.RuntimeEventService;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.MessageBroker;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
@@ -456,7 +456,7 @@ implements FormExecutor {
// -- DEPENDENCIES
- private IsisWebAppCommonContext getCommonContext() {
+ private IsisAppCommonContext getCommonContext() {
return model.getCommonContext();
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index fea5f5a..c980033 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -33,8 +33,8 @@ import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
import org.apache.isis.core.security.authentication.MessageBroker;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext.HasCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext.HasCommonContext;
import org.apache.isis.viewer.common.model.header.HeaderUiModel;
import org.apache.isis.viewer.common.model.header.HeaderUiModelProvider;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
@@ -65,7 +65,7 @@ implements HasCommonContext {
private transient PageClassRegistry pageClassRegistry;
private transient ImageResourceCache imageCache;
private transient MetaModelContext metaModelContext;
- private transient IsisWebAppCommonContext commonContext;
+ private transient IsisAppCommonContext commonContext;
private transient IsisInteractionFactory isisInteractionFactory;
private transient TranslationService translationService;
private transient LocaleProvider localeProvider;
@@ -84,7 +84,7 @@ implements HasCommonContext {
}
@Override
- public IsisWebAppCommonContext getCommonContext() {
+ public IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
index 5239aee..2236dd8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.ui.validation;
import org.apache.wicket.validation.IValidator;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.Getter;
@@ -33,9 +33,9 @@ public abstract class ValidatorBase<T> implements IValidator<T> {
private static final long serialVersionUID = 1L;
- @Getter protected final transient IsisWebAppCommonContext commonContext;
+ @Getter protected final transient IsisAppCommonContext commonContext;
- protected ValidatorBase(IsisWebAppCommonContext commonContext) {
+ protected ValidatorBase(IsisAppCommonContext commonContext) {
this.commonContext = commonContext;
}
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
index 9738c50..bc7f6ec 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
@@ -27,20 +27,20 @@ import org.junit.rules.ExpectedException;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
public class ComponentFactoryAbstractTest_init {
@Rule public ExpectedException thrown= ExpectedException.none();
private MetaModelContext metaModelContext;
- private IsisWebAppCommonContext commonContext;
+ private IsisAppCommonContext commonContext;
@Before
public void setUp() throws Exception {
metaModelContext = MetaModelContext_forTesting.buildDefault();
- commonContext = IsisWebAppCommonContext.of(metaModelContext);
+ commonContext = IsisAppCommonContext.of(metaModelContext);
}
@Test
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
index 080ae00..badfa7f 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanelFactory;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -53,7 +53,7 @@ public class CollectionContentsSelectorDropdownPanelTest {
public void setUp() throws Exception {
metaModelContext = MetaModelContext_forTesting.buildDefault();
- val commonContext = IsisWebAppCommonContext.of(metaModelContext);
+ val commonContext = IsisAppCommonContext.of(metaModelContext);
ajaxTableComponentFactory = new CollectionContentsAsAjaxTablePanelFactory() {
private static final long serialVersionUID = 1L; {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
index 594a0a6..526338c 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -55,7 +55,7 @@ public class ObjectAdapterMementoProviderForValueChoicesTest {
@Mock private SpecificationLoader mockSpecificationLoader;
@Mock private ObjectSpecification mockSpec;
@Mock private ScalarModel mockScalarModel;
- @Mock private IsisWebAppCommonContext mockCommonContext;
+ @Mock private IsisAppCommonContext mockCommonContext;
@Mock private WicketViewerSettings mockWicketViewerSettings;
@Before
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index 212e246..19ed128 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -38,8 +38,8 @@ import org.apache.isis.core.security.authentication.AuthenticationRequest;
import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext.HasCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext.HasCommonContext;
import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
@@ -66,7 +66,7 @@ implements BreadcrumbModelProvider, BookmarkedPagesModelProvider, HasCommonConte
return (AuthenticatedWebSessionForIsis) Session.get();
}
- @Getter protected transient IsisWebAppCommonContext commonContext;
+ @Getter protected transient IsisAppCommonContext commonContext;
private BreadcrumbModel breadcrumbModel;
private BookmarkedPagesModel bookmarkedPagesModel;
@@ -85,7 +85,7 @@ implements BreadcrumbModelProvider, BookmarkedPagesModelProvider, HasCommonConte
super(request);
}
- public void init(IsisWebAppCommonContext commonContext) {
+ public void init(IsisAppCommonContext commonContext) {
this.commonContext = commonContext;
bookmarkedPagesModel = new BookmarkedPagesModel(commonContext);
breadcrumbModel = new BreadcrumbModel(commonContext);
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
index 0a7df37..cfb003f 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ManagedObjects;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.RequiredArgsConstructor;
@@ -43,7 +43,7 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectMement
private static final long serialVersionUID = 1L;
- private final transient IsisWebAppCommonContext commonContext;
+ private final transient IsisAppCommonContext commonContext;
/**
* Converts string representation of {@link Oid} to
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index 1de1beb..5d6219b 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -56,7 +56,7 @@ import org.apache.isis.core.runtime.iactn.IsisInteractionFactory;
import org.apache.isis.core.runtime.session.IsisRequestCycle;
import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.MessageBroker;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
@@ -83,7 +83,7 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
new MetaDataKey<IsisRequestCycle>() {private static final long serialVersionUID = 1L; };
private PageClassRegistry pageClassRegistry;
- private IsisWebAppCommonContext commonContext;
+ private IsisAppCommonContext commonContext;
@Override
public synchronized void onBeginRequest(RequestCycle requestCycle) {
@@ -383,7 +383,7 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
// -- DEPENDENCIES
- public IsisWebAppCommonContext getCommonContext() {
+ public IsisAppCommonContext getCommonContext() {
return commonContext = CommonContextUtils.computeIfAbsent(commonContext);
}
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index 4241680..2b6056d 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -48,7 +48,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar.ComponentFactoryList;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.val;
@@ -87,7 +87,7 @@ public class ComponentFactoryRegistryDefault implements ComponentFactoryRegistry
componentFactoryRegistrar.addComponentFactories(componentFactories);
- val commonContext = IsisWebAppCommonContext.of(metaModelContext);
+ val commonContext = IsisAppCommonContext.of(metaModelContext);
for (val componentFactory : componentFactories) {
registerComponentFactory(commonContext, componentFactory);
@@ -97,7 +97,7 @@ public class ComponentFactoryRegistryDefault implements ComponentFactoryRegistry
}
private void registerComponentFactory(
- final IsisWebAppCommonContext commonContext,
+ final IsisAppCommonContext commonContext,
final ComponentFactory componentFactory) {
// handle dependency injection for factories
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index 4b00629..925edb5 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -70,7 +70,7 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettingsAccessor;
@@ -133,7 +133,7 @@ import net.ftlines.wicketsource.WicketSource;
public class IsisWicketApplication
extends AuthenticatedWebApplication
implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketViewerSettingsAccessor,
-IsisWebAppCommonContext.Provider {
+IsisAppCommonContext.Provider {
private static final long serialVersionUID = 1L;
@@ -146,7 +146,7 @@ IsisWebAppCommonContext.Provider {
@Inject private MetaModelContext metaModelContext;
- @Getter(onMethod = @__(@Override)) private IsisWebAppCommonContext commonContext; // shared
+ @Getter(onMethod = @__(@Override)) private IsisAppCommonContext commonContext; // shared
// injected manually
@Getter(onMethod = @__(@Override)) private ComponentFactoryRegistry componentFactoryRegistry;
@@ -220,7 +220,7 @@ IsisWebAppCommonContext.Provider {
requires(metaModelContext, "metaModelContext");
- commonContext = IsisWebAppCommonContext.of(metaModelContext);
+ commonContext = IsisAppCommonContext.of(metaModelContext);
configuration = commonContext.lookupServiceElseFail(IsisConfiguration.class);
componentFactoryRegistry = commonContext.lookupServiceElseFail(ComponentFactoryRegistry.class);
pageClassRegistry = commonContext.lookupServiceElseFail(PageClassRegistry.class);
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
index 50a2518..3b19dd0 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
@@ -26,7 +26,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -36,7 +36,7 @@ import lombok.val;
* Uses Wicket's default page factory, except for {@link EntityPage}s which require special instantiation:
* <p>
* Constructor
- * {@link EntityPage#EntityPage(IsisWebAppCommonContext, PageParameters)}
+ * {@link EntityPage#EntityPage(IsisAppCommonContext, PageParameters)}
* needs the common-context as argument.
*
* @since 2.0
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 4297442..e690eda 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.security.authentication.manager.AuthenticationManage
import org.apache.isis.core.security.authentication.standard.Authenticator;
import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.core.security.authentication.standard.SimpleSession;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
public class AuthenticatedWebSessionForIsis_Authenticate {
@@ -62,7 +62,7 @@ public class AuthenticatedWebSessionForIsis_Authenticate {
protected Request mockRequest;
private AuthenticationManager authMgr;
@Mock protected Authenticator mockAuthenticator;
- @Mock protected IsisWebAppCommonContext mockCommonContext;
+ @Mock protected IsisAppCommonContext mockCommonContext;
@Mock protected IsisInteractionFactory mockIsisInteractionFactory;
@Mock protected IsisInteractionTracker mockIsisInteractionTracker;
@Mock protected ServiceRegistry mockServiceRegistry;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index a172b62..fddfada 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.security.authentication.manager.AuthenticationManage
import org.apache.isis.core.security.authentication.standard.Authenticator;
import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
public class AuthenticatedWebSessionForIsis_SignIn {
@@ -57,7 +57,7 @@ public class AuthenticatedWebSessionForIsis_SignIn {
protected Request mockRequest;
private AuthenticationManager authMgr;
@Mock protected Authenticator mockAuthenticator;
- @Mock protected IsisWebAppCommonContext mockCommonContext;
+ @Mock protected IsisAppCommonContext mockCommonContext;
@Mock protected IsisInteractionFactory mockIsisInteractionFactory;
@Mock protected ServiceRegistry mockServiceRegistry;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index 46e9d76..dba265c 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisAppCommonContext;
public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
@@ -44,7 +44,7 @@ public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
@Mock protected Request mockRequest;
@Mock protected AuthenticationManager mockAuthMgr;
- @Mock protected IsisWebAppCommonContext mockCommonContext;
+ @Mock protected IsisAppCommonContext mockCommonContext;
@Mock protected IsisInteractionFactory mockIsisInteractionFactory;
@Mock protected ServiceRegistry mockServiceRegistry;