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 2022/09/15 09:38:11 UTC
[isis] branch master updated: ISIS-3198: rename EntityModel->UiObjectWkt
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 495991a2f2 ISIS-3198: rename EntityModel->UiObjectWkt
495991a2f2 is described below
commit 495991a2f2ba5abde2c662457af5df74555a7604
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 15 11:38:05 2022 +0200
ISIS-3198: rename EntityModel->UiObjectWkt
---
.../common/ui/custom/WhereInTheWorldPanel.java | 6 ++---
.../ui/custom/WhereInTheWorldPanelFactory.java | 6 ++---
.../wkt/viewer/FullCalendarWithEventHandling.java | 4 ++--
.../viewers/common/wkt/InteractionTestWkt.java | 4 ++--
.../commons/model/object/HasUiParentObject.java | 2 +-
.../wicket/model/modelhelpers/WhereAmIHelper.java | 16 ++++++-------
.../wicket/model/models/ActionModelImpl.java | 8 +++----
.../wicket/model/models/BookmarkTreeNode.java | 14 +++++------
.../wicket/model/models/BookmarkedPagesModel.java | 2 +-
.../wicket/model/models/EntityCollectionModel.java | 6 ++---
.../models/EntityCollectionModelParented.java | 6 ++---
.../wicket/model/models/FormExecutorContext.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 10 ++++----
.../wicket/model/models/ScalarParameterModel.java | 2 +-
.../wicket/model/models/ScalarPropertyModel.java | 8 +++----
.../models/{EntityModel.java => UiObjectWkt.java} | 24 +++++++++----------
.../interaction/act/ActionInteractionWkt.java | 4 ++--
.../wicket/model/util/PageParameterUtils.java | 4 ++--
...l_hintsTest.java => UiObjectWkt_hintsTest.java} | 8 +++----
.../entityactions/LinkAndLabelFactory.java | 6 ++---
.../serviceactions/ServiceActionUtil.java | 4 ++--
.../ajaxtable/IsisAjaxDataTable.java | 4 ++--
.../ajaxtable/IsisAjaxHeadersToolbar.java | 4 ++--
.../ajaxtable/IsisAjaxNavigationToolbar.java | 4 ++--
.../ajaxtable/columns/GenericPropertyColumn.java | 4 ++--
.../ajaxtable/columns/GenericTitleColumn.java | 4 ++--
.../icons/CollectionContentsAsIconsPanel.java | 4 ++--
.../entity/EntityComponentFactoryAbstract.java | 10 ++++----
.../entity/collection/EntityCollectionPanel.java | 8 +++----
.../collection/EntityCollectionPanelFactory.java | 4 ++--
.../components/entity/fieldset/PropertyGroup.java | 14 +++++------
.../entity/header/EntityHeaderPanel.java | 12 +++++-----
.../entity/header/EntityHeaderPanelFactory.java | 4 ++--
.../entity/icontitle/EntityIconAndTitlePanel.java | 4 ++--
.../icontitle/EntityIconTitleAndCopyLinkPanel.java | 4 ++--
.../EntityIconTitleAndCopyLinkPanelFactory.java | 4 ++--
.../ui/components/layout/bs/BSGridPanel.java | 6 ++---
.../components/layout/bs/BSGridPanelFactory.java | 6 ++---
.../ui/components/layout/bs/clearfix/ClearFix.java | 6 ++---
.../wicket/ui/components/layout/bs/col/Col.java | 8 +++----
.../wicket/ui/components/layout/bs/row/Row.java | 6 ++---
.../components/layout/bs/tabs/TabGroupPanel.java | 8 +++----
.../ui/components/layout/bs/tabs/TabPanel.java | 12 +++++-----
.../ui/components/property/PropertyEditPanel.java | 4 ++--
.../PropertyEditPromptHeaderPanel.java | 4 ++--
.../components/tree/IsisToWicketTreeAdapter.java | 4 ++--
.../ui/components/unknown/UnknownModelPanel.java | 6 ++---
.../widgets/breadcrumbs/BreadcrumbModel.java | 24 +++++++++----------
.../widgets/breadcrumbs/BreadcrumbPanel.java | 28 +++++++++++-----------
.../widgets/buttons/ToggleButtonsPanel.java | 4 ++--
.../EntityLinkSimplePanelFactory.java | 4 ++--
.../widgets/zclip/ZeroClipboardPanel.java | 6 ++---
.../wicket/ui/errors/ExceptionStackTracePanel.java | 4 ++--
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 4 ++--
.../viewer/wicket/ui/pages/entity/EntityPage.java | 16 ++++++-------
55 files changed, 196 insertions(+), 198 deletions(-)
diff --git a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java
index 6d126bbeff..1202d06896 100644
--- a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java
+++ b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanel.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
import org.apache.isis.viewer.commons.model.object.UiObject;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import demoapp.dom.featured.customui.geocoding.GeoapifyClient;
@@ -38,7 +38,7 @@ import lombok.val;
//tag::class[]
public class WhereInTheWorldPanel
-extends PanelAbstract<ManagedObject, EntityModel> {
+extends PanelAbstract<ManagedObject, UiObjectWkt> {
private static final long serialVersionUID = 1L; // <.>
@@ -46,7 +46,7 @@ extends PanelAbstract<ManagedObject, EntityModel> {
public WhereInTheWorldPanel(
final String id,
- final EntityModel model,
+ final UiObjectWkt model,
final GeoapifyClient geoapifyClient) {
super(id, model);
this.geoapifyClient = geoapifyClient;
diff --git a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java
index 130399c183..c343f95ce1 100644
--- a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java
+++ b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/custom/WhereInTheWorldPanelFactory.java
@@ -26,7 +26,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
import demoapp.dom.featured.customui.geocoding.GeoapifyClient;
@@ -47,7 +47,7 @@ public class WhereInTheWorldPanelFactory extends EntityComponentFactoryAbstract
}
@Override
- protected ApplicationAdvice doAppliesTo(EntityModel entityModel) { // <.>
+ protected ApplicationAdvice doAppliesTo(UiObjectWkt entityModel) { // <.>
final ManagedObject managedObject = entityModel.getObject(); // <.>
final Object domainObject = managedObject.getPojo(); // <.>
return ApplicationAdvice.appliesIf(
@@ -56,7 +56,7 @@ public class WhereInTheWorldPanelFactory extends EntityComponentFactoryAbstract
@Override
public Component createComponent(final String id, final IModel<?> model) {
- EntityModel entityModel = (EntityModel) model; // <.>
+ UiObjectWkt entityModel = (UiObjectWkt) model; // <.>
return new WhereInTheWorldPanel(id, entityModel, geoapifyClient); // <.>
}
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
index 3d4b90a230..0617b213ee 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
@@ -29,7 +29,7 @@ import org.apache.isis.extensions.fullcalendar.wkt.fullcalendar.CalendarConfig;
import org.apache.isis.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
import org.apache.isis.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
import org.apache.isis.extensions.fullcalendar.wkt.fullcalendar.callback.ClickedEvent;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.util.WktContext;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
@@ -73,7 +73,7 @@ final class FullCalendarWithEventHandling extends FullCalendar {
val managedObject = objectManager
.loadObject(ProtoObject.resolveElseFail(specificationLoader, bookmark));
- final EntityModel entityModel = EntityModel.ofAdapter(commonContext, managedObject);
+ final UiObjectWkt entityModel = UiObjectWkt.ofAdapter(commonContext, managedObject);
val pageParameters = entityModel.getPageParameters();
if(pageParameters!=null) {
diff --git a/regressiontests/stable-viewers-common/src/test/java/org/apache/isis/testdomain/viewers/common/wkt/InteractionTestWkt.java b/regressiontests/stable-viewers-common/src/test/java/org/apache/isis/testdomain/viewers/common/wkt/InteractionTestWkt.java
index 5dcf7c94e3..04eca1588b 100644
--- a/regressiontests/stable-viewers-common/src/test/java/org/apache/isis/testdomain/viewers/common/wkt/InteractionTestWkt.java
+++ b/regressiontests/stable-viewers-common/src/test/java/org/apache/isis/testdomain/viewers/common/wkt/InteractionTestWkt.java
@@ -48,7 +48,7 @@ import org.apache.isis.testdomain.model.interaction.InteractionDemo;
import org.apache.isis.testdomain.util.interaction.InteractionTestAbstract;
import org.apache.isis.viewer.commons.model.decorators.DisablingDecorator.DisablingDecorationModel;
import org.apache.isis.viewer.commons.model.object.UiObject.RenderingHint;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
import org.apache.isis.viewer.wicket.model.util.PageParameterUtils;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
@@ -112,7 +112,7 @@ class InteractionTestWkt extends InteractionTestAbstract {
void propertyModels_shouldBeInSyncWithInteractionAPI() {
val objectSpec = domainObject.getSpecification();
- val entityModel = EntityModel.ofAdapter(commonContext, domainObject);
+ val entityModel = UiObjectWkt.ofAdapter(commonContext, domainObject);
assertEquals(domainObject.getBookmark().get(), entityModel.getOwnerBookmark());
assertEquals(domainObject.getTitle(), entityModel.getTitle());
diff --git a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/object/HasUiParentObject.java b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/object/HasUiParentObject.java
index aab9e0291d..c0e3138986 100644
--- a/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/object/HasUiParentObject.java
+++ b/viewers/commons/model/src/main/java/org/apache/isis/viewer/commons/model/object/HasUiParentObject.java
@@ -23,7 +23,7 @@ import org.apache.isis.core.metamodel.object.ManagedObject;
public interface HasUiParentObject<T extends UiObject> {
/**
- * The owning entity/viewmodel/service that is declaring this action or property.
+ * The owning entity/viewmodel/service that is declaring this action, param or property.
*/
T getParentUiModel();
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 cae8e0abeb..ea1eb3fb33 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
@@ -23,7 +23,7 @@ import java.util.stream.Stream;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.util.pchain.ParentChain;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import lombok.val;
@@ -34,17 +34,17 @@ import lombok.val;
*/
public class WhereAmIHelper {
- public static WhereAmIHelper of(final EntityModel startOfChain) {
+ public static WhereAmIHelper of(final UiObjectWkt startOfChain) {
return new WhereAmIHelper(startOfChain);
}
private final LinkedList<Object> reversedChainOfParents = new LinkedList<>();
- private final EntityModel startOfChain;
+ private final UiObjectWkt startOfChain;
private final MetaModelContext commonContext;
private final boolean isWhereAmIEnabled;
- public WhereAmIHelper(final EntityModel startOfChain) {
+ public WhereAmIHelper(final UiObjectWkt startOfChain) {
this.startOfChain = startOfChain;
this.commonContext = startOfChain.getMetaModelContext();
@@ -64,7 +64,7 @@ public class WhereAmIHelper {
*
* @return the immutable start node of the navigable parent chain
*/
- public EntityModel getStartOfChain() {
+ public UiObjectWkt getStartOfChain() {
return startOfChain;
}
@@ -83,7 +83,7 @@ public class WhereAmIHelper {
* Streams the linked nodes of this model's navigable parent chain in reverse order.
* @return reversed order stream of linked parent nodes, which does not include the start node
*/
- public Stream<EntityModel> streamParentChainReversed() {
+ public Stream<UiObjectWkt> streamParentChainReversed() {
if(!isWhereAmIEnabled)
return Stream.empty(); //[ahuber] unexpected call, we could log a warning
@@ -93,9 +93,9 @@ public class WhereAmIHelper {
// -- HELPER
- private EntityModel toEntityModel(final Object domainObject) {
+ private UiObjectWkt toEntityModel(final Object domainObject) {
val objectAdapter = commonContext.getObjectManager().adapt(domainObject);
- return EntityModel.ofAdapter(commonContext, objectAdapter);
+ return UiObjectWkt.ofAdapter(commonContext, objectAdapter);
}
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModelImpl.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModelImpl.java
index a6d4d12c52..82e350bd3f 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModelImpl.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModelImpl.java
@@ -56,7 +56,7 @@ implements ActionModel {
// -- FACTORY METHODS
public static ActionModelImpl forEntity(
- final EntityModel parentEntityModel,
+ final UiObjectWkt parentEntityModel,
final Identifier actionIdentifier,
final Where where,
final ScalarPropertyModel associatedWithPropertyIfAny,
@@ -76,7 +76,7 @@ implements ActionModel {
private final ActionInteractionWkt delegate;
- private ActionModelImpl(final EntityModel parentEntityModel, final ActionInteractionWkt delegate) {
+ private ActionModelImpl(final UiObjectWkt parentEntityModel, final ActionInteractionWkt delegate) {
super(parentEntityModel);
this.delegate = delegate;
}
@@ -119,8 +119,8 @@ implements ActionModel {
}
@Override
- public EntityModel getParentUiModel() {
- return (EntityModel) super.getTarget();
+ public UiObjectWkt getParentUiModel() {
+ return (UiObjectWkt) super.getTarget();
}
@Override
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
index 49fd83f231..ccd99bae4e 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -107,23 +107,23 @@ public class BookmarkTreeNode implements Serializable {
* @return - whether the provided candidate is found or was added to this node's tree.
*/
public boolean matches(final BookmarkableModel candidateBookmarkableModel) {
- if(candidateBookmarkableModel instanceof EntityModel) {
- return matchAndUpdateTitleFor((EntityModel) candidateBookmarkableModel);
+ if(candidateBookmarkableModel instanceof UiObjectWkt) {
+ return matchAndUpdateTitleFor((UiObjectWkt) candidateBookmarkableModel);
}
return false;
}
/**
- * Whether or not the provided {@link EntityModel} matches that contained
+ * Whether or not the provided {@link UiObjectWkt} matches that contained
* within this node, or any of its children.
*
* <p>
* If it does match, then the matched node's title is updated to that of the provided
- * {@link EntityModel}.
+ * {@link UiObjectWkt}.
*
* @return - whether the provided candidate is found or was added to this node's tree.
*/
- private boolean matchAndUpdateTitleFor(final EntityModel candidateEntityModel) {
+ private boolean matchAndUpdateTitleFor(final UiObjectWkt candidateEntityModel) {
// match only on the oid string
final String candidateOidStr = oidStrFrom(candidateEntityModel);
@@ -180,8 +180,8 @@ public class BookmarkTreeNode implements Serializable {
val whetherAdded = _Refs.booleanRef(false);
// TODO: this ought to be move into a responsibility of BookmarkableModel, perhaps, rather than downcasting
- if(candidateBookmarkableModel instanceof EntityModel) {
- val entityModel = (EntityModel) candidateBookmarkableModel;
+ if(candidateBookmarkableModel instanceof UiObjectWkt) {
+ val entityModel = (UiObjectWkt) candidateBookmarkableModel;
val candidateAdapter = entityModel.getObject();
candidateAdapter.getSpecification()
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 b2d458dce5..9d73f61b41 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
@@ -126,7 +126,7 @@ public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>>
rootNodes.remove(rootNode);
}
- public void remove(final EntityModel entityModel) {
+ public void remove(final UiObjectWkt entityModel) {
val bookmark = entityModel.getOwnerBookmark();
rootNodes.removeIf(node->node.getOidNoVer().equals(bookmark));
}
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 a7258145d8..7e16f7c8ba 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
@@ -49,15 +49,15 @@ extends
* <p>
* This deals with both persisted and transient objects.
*/
- STANDALONE(EntityModel.RenderingHint.STANDALONE_PROPERTY_COLUMN, 25),
+ STANDALONE(UiObjectWkt.RenderingHint.STANDALONE_PROPERTY_COLUMN, 25),
/**
* A collection of an entity (eg Order/OrderDetail).
*/
- PARENTED(EntityModel.RenderingHint.PARENTED_PROPERTY_COLUMN, 12),
+ PARENTED(UiObjectWkt.RenderingHint.PARENTED_PROPERTY_COLUMN, 12),
;
- @Getter private final EntityModel.RenderingHint columnRenderingHint;
+ @Getter private final UiObjectWkt.RenderingHint columnRenderingHint;
@Getter private final int pageSizeDefault;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModelParented.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModelParented.java
index 23f698d5ea..b8c645e04f 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModelParented.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModelParented.java
@@ -42,12 +42,12 @@ implements
// TODO parent object model, maybe should not be exposed
// maybe could be resolved in the process of decoupling the ActionModel from Wicket
- @Getter private final @NonNull EntityModel entityModel;
+ @Getter private final @NonNull UiObjectWkt entityModel;
// -- FACTORIES
public static EntityCollectionModelParented forParentObjectModel(
- final @NonNull EntityModel entityModel) {
+ final @NonNull UiObjectWkt entityModel) {
val collMetaModel =
Optional.ofNullable(entityModel.getCollectionLayoutData())
@@ -68,7 +68,7 @@ implements
protected EntityCollectionModelParented(
final @NonNull DataTableModelWkt delegate,
- final @NonNull EntityModel parentObjectModel) { //TODO maybe instead use the delegate (?)
+ final @NonNull UiObjectWkt parentObjectModel) { //TODO maybe instead use the delegate (?)
super(delegate, Variant.PARENTED);
this.entityModel = parentObjectModel;
}
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 87ef8a308d..0b0ea86d31 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
@@ -26,7 +26,7 @@ import org.apache.isis.viewer.commons.model.object.HasUiParentObject;
public interface FormExecutorContext
extends
- HasUiParentObject<EntityModel>,
+ HasUiParentObject<UiObjectWkt>,
HasMetaModelContext {
PromptStyle getPromptStyle();
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 7c483ca6e5..2c7fbb8e4c 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -82,7 +82,7 @@ implements HasRenderingHints, UiScalar, LinksProvider, FormExecutorContext {
public boolean isProperty() { return paramOrProp == EitherParamOrProp.PROPERTY; }
public boolean isParameter() { return paramOrProp == EitherParamOrProp.PARAMETER; }
- private final EntityModel parentEntityModel;
+ private final UiObjectWkt parentEntityModel;
@Getter(onMethod = @__(@Override))
@Setter(onMethod = @__(@Override))
@@ -98,7 +98,7 @@ implements HasRenderingHints, UiScalar, LinksProvider, FormExecutorContext {
* value (if any) of that action parameter.
*/
protected ScalarModel(
- final EntityModel parentEntityModel) {
+ final UiObjectWkt parentEntityModel) {
this(EitherParamOrProp.PARAMETER,
parentEntityModel, ScalarRepresentation.EDITING, RenderingHint.REGULAR);
}
@@ -109,7 +109,7 @@ implements HasRenderingHints, UiScalar, LinksProvider, FormExecutorContext {
* property.
*/
protected ScalarModel(
- final EntityModel parentEntityModel,
+ final UiObjectWkt parentEntityModel,
final ScalarRepresentation viewOrEdit,
final UiObject.RenderingHint renderingHint) {
this(EitherParamOrProp.PROPERTY,
@@ -118,7 +118,7 @@ implements HasRenderingHints, UiScalar, LinksProvider, FormExecutorContext {
private ScalarModel(
final @NonNull EitherParamOrProp paramOrProp,
- final @NonNull EntityModel parentEntityModel,
+ final @NonNull UiObjectWkt parentEntityModel,
final @NonNull ScalarRepresentation viewOrEdit,
final @NonNull UiObject.RenderingHint renderingHint) {
@@ -179,7 +179,7 @@ implements HasRenderingHints, UiScalar, LinksProvider, FormExecutorContext {
}
@Override
- public final EntityModel getParentUiModel() {
+ public final UiObjectWkt getParentUiModel() {
return parentEntityModel;
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
index 479630423a..b26b0b1370 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarParameterModel.java
@@ -52,7 +52,7 @@ implements UiParameter {
*/
private ScalarParameterModel(
final ParameterUiModelWkt delegate) {
- super(EntityModel.ofAdapter(delegate.getMetaModelContext(), delegate.getOwner()));
+ super(UiObjectWkt.ofAdapter(delegate.getMetaModelContext(), delegate.getOwner()));
this.delegate = delegate;
}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
index 2cbf109059..44a466dd63 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarPropertyModel.java
@@ -44,7 +44,7 @@ implements UiProperty {
public static ScalarPropertyModel wrap(
final PropertyUiModelWkt delegate,
final ScalarRepresentation viewOrEdit,
- final EntityModel.RenderingHint renderingHint) {
+ final UiObjectWkt.RenderingHint renderingHint) {
return new ScalarPropertyModel(delegate, viewOrEdit, renderingHint);
}
@@ -56,8 +56,8 @@ implements UiProperty {
private ScalarPropertyModel(
final PropertyUiModelWkt delegate,
final ScalarRepresentation viewOrEdit,
- final EntityModel.RenderingHint renderingHint) {
- super(EntityModel.ofAdapter(delegate.getMetaModelContext(), delegate.getOwner()),
+ final UiObjectWkt.RenderingHint renderingHint) {
+ super(UiObjectWkt.ofAdapter(delegate.getMetaModelContext(), delegate.getOwner()),
viewOrEdit, renderingHint);
this.delegate = delegate;
}
@@ -65,7 +65,7 @@ implements UiProperty {
/** @return new instance bound to the same delegate */
public ScalarPropertyModel copyHaving(
final ScalarRepresentation viewOrEdit,
- final EntityModel.RenderingHint renderingHint) {
+ final UiObjectWkt.RenderingHint renderingHint) {
return wrap(delegate, viewOrEdit, renderingHint);
}
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/UiObjectWkt.java
similarity index 94%
rename from viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/UiObjectWkt.java
index 5c3b9c046e..ae0e8273cc 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/UiObjectWkt.java
@@ -36,7 +36,6 @@ import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.spec.feature.memento.PropertyMemento;
import org.apache.isis.viewer.commons.model.object.UiObject;
-import org.apache.isis.viewer.commons.model.object.UiObject.HasRenderingHints;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.models.interaction.BookmarkedObjectWkt;
import org.apache.isis.viewer.wicket.model.models.interaction.HasBookmarkedOwnerAbstract;
@@ -55,37 +54,36 @@ import lombok.extern.log4j.Log4j2;
* Backing model to represent a domain object as {@link ManagedObject}.
*/
@Log4j2
-public class EntityModel
+public class UiObjectWkt
extends HasBookmarkedOwnerAbstract<ManagedObject>
implements
- HasRenderingHints,
+ UiObject,
ObjectAdapterModel,
UiHintContainer,
- UiObject,
BookmarkableModel {
private static final long serialVersionUID = 1L;
// -- FACTORIES
- public static EntityModel ofPageParameters(
+ public static UiObjectWkt ofPageParameters(
final MetaModelContext commonContext,
final PageParameters pageParameters) {
val bookmark = PageParameterUtils.toBookmark(pageParameters).orElse(null);
return ofBookmark(commonContext, bookmark);
}
- public static EntityModel ofAdapter(
+ public static UiObjectWkt ofAdapter(
final @NonNull MetaModelContext commonContext,
final @Nullable ManagedObject adapter) {
- return new EntityModel(BookmarkedObjectWkt.ofAdapter(commonContext, adapter),
+ return new UiObjectWkt(BookmarkedObjectWkt.ofAdapter(commonContext, adapter),
ScalarRepresentation.VIEWING, RenderingHint.REGULAR);
}
- public static EntityModel ofBookmark(
+ public static UiObjectWkt ofBookmark(
final @NonNull MetaModelContext commonContext,
final @Nullable Bookmark bookmark) {
- return new EntityModel(BookmarkedObjectWkt.ofBookmark(commonContext, bookmark),
+ return new UiObjectWkt(BookmarkedObjectWkt.ofBookmark(commonContext, bookmark),
ScalarRepresentation.VIEWING, RenderingHint.REGULAR);
}
@@ -94,14 +92,14 @@ implements
/**
* As used by TreeModel (same as {@link #ofAdapter(MetaModelContext, ManagedObject)}
*/
- protected EntityModel(
+ protected UiObjectWkt(
final MetaModelContext commonContext,
final ManagedObject adapter) {
this(BookmarkedObjectWkt.ofAdapter(commonContext, adapter),
ScalarRepresentation.VIEWING, RenderingHint.REGULAR);
}
- private EntityModel(
+ private UiObjectWkt(
final @NonNull BookmarkedObjectWkt bookmarkedObject,
final ScalarRepresentation mode,
final RenderingHint renderingHint) {
@@ -224,7 +222,7 @@ implements
// -- VIEW OR EDIT
@Override
- public EntityModel toEditMode() {
+ public UiObjectWkt toEditMode() {
setMode(ScalarRepresentation.EDITING);
propertyScalarModels().values()
.forEach(ScalarPropertyModel::toEditMode);
@@ -232,7 +230,7 @@ implements
}
@Override
- public EntityModel toViewMode() {
+ public UiObjectWkt toViewMode() {
setMode(ScalarRepresentation.VIEWING);
propertyScalarModels().values()
.forEach(ScalarPropertyModel::toViewMode);
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
index 9c648b3ff8..7c757249d5 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/interaction/act/ActionInteractionWkt.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.interactions.managed.ActionInteraction;
import org.apache.isis.core.metamodel.interactions.managed.ParameterNegotiationModel;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.InlinePromptContext;
import org.apache.isis.viewer.wicket.model.models.ScalarParameterModel;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
@@ -73,7 +73,7 @@ extends HasBookmarkedOwnerAbstract<ActionInteraction> {
private @Nullable EntityCollectionModel associatedWithCollectionIfAny;
public static ActionInteractionWkt forEntity(
- final EntityModel parentEntityModel,
+ final UiObjectWkt parentEntityModel,
final Identifier actionIdentifier,
final Where where,
final ScalarPropertyModel associatedWithPropertyIfAny,
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/PageParameterUtils.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/PageParameterUtils.java
index 7144c892ce..e5fdcbbd88 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/PageParameterUtils.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/PageParameterUtils.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.util.Facets;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ObjectAdapterModel;
import lombok.NonNull;
@@ -140,7 +140,7 @@ public class PageParameterUtils {
return
ManagedObjects.isIdentifiable(adapter)
&& !ManagedObjects.isNullOrUnspecifiedOrEmpty(adapter)
- ? EntityModel.ofAdapter(
+ ? UiObjectWkt.ofAdapter(
callingEntityModel.getMetaModelContext(),
Facets.projected(adapter))
.getPageParametersWithoutUiHints()
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/test/EntityModel_hintsTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
similarity index 97%
rename from viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/test/EntityModel_hintsTest.java
rename to viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
index 6604e83863..d54f0bc887 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/test/EntityModel_hintsTest.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/test/UiObjectWkt_hintsTest.java
@@ -43,18 +43,18 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.HasMetaModelContext;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-class EntityModel_hintsTest {
+class UiObjectWkt_hintsTest {
MarkupContainer mockParent;
Component mockComponent1;
Component mockComponent2;
- EntityModel target;
+ UiObjectWkt target;
MetaModelContext metaModelContext;
HintStore_forTesting hintStore;
@@ -98,7 +98,7 @@ class EntityModel_hintsTest {
ThreadContext.setApplication(new WicketAppStup(metaModelContext));
- target = EntityModel.ofBookmark(metaModelContext,
+ target = UiObjectWkt.ofBookmark(metaModelContext,
Bookmark.forLogicalTypeNameAndIdentifier("hi", "there"));
mockParent = Mockito.mock(MarkupContainer.class);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java
index 50274cd702..994fb74a27 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/LinkAndLabelFactory.java
@@ -29,7 +29,7 @@ import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.ActionModelImpl;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModelParented;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ScalarParameterModel;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
@@ -44,7 +44,7 @@ public interface LinkAndLabelFactory
extends Function<ObjectAction, LinkAndLabel> {
public static LinkAndLabelFactory forMenu(
- final EntityModel serviceModel) {
+ final UiObjectWkt serviceModel) {
return action -> LinkAndLabel.of(
ActionModelImpl.forEntity(
serviceModel,
@@ -55,7 +55,7 @@ extends Function<ObjectAction, LinkAndLabel> {
}
public static LinkAndLabelFactory forEntity(
- final EntityModel parentEntityModel) {
+ final UiObjectWkt parentEntityModel) {
guardAgainstNotBookmarkable(parentEntityModel.getBookmarkedOwner());
return action -> LinkAndLabel.of(
ActionModelImpl.forEntity(
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 d6f2d30379..5302a456c1 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
@@ -31,7 +31,7 @@ import org.apache.isis.viewer.commons.applib.services.menu.MenuItemDto;
import org.apache.isis.viewer.commons.applib.services.menu.MenuUiModel;
import org.apache.isis.viewer.commons.applib.services.menu.MenuVisitor;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelFactory;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import org.apache.isis.viewer.wicket.ui.util.WktDecorators;
@@ -134,7 +134,7 @@ public final class ServiceActionUtil {
private LinkAndLabel newActionLink(
final ManagedAction managedAction) {
- val serviceModel = EntityModel.ofAdapter(commonContext, managedAction.getOwner());
+ val serviceModel = UiObjectWkt.ofAdapter(commonContext, managedAction.getOwner());
return LinkAndLabelFactory.forMenu(serviceModel)
.apply(managedAction.getAction());
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxDataTable.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxDataTable.java
index 7eb19d462b..f4f95f682f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxDataTable.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxDataTable.java
@@ -38,7 +38,7 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.isis.core.metamodel.object.ManagedObjects;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.interaction.coll.DataRowWkt;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.GenericToggleboxColumn;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -214,7 +214,7 @@ public class IsisAjaxDataTable extends DataTable<DataRow, String> {
}
private UiHintContainer getUiHintContainer() {
- return UiHintContainer.Util.hintContainerOf(this, EntityModel.class);
+ return UiHintContainer.Util.hintContainerOf(this, UiObjectWkt.class);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
index b23e93761a..f83cd3270e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxHeadersToolbar.java
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
/**
* Adapted from Wicket's own {@link AjaxFallbackHeadersToolbar}.
@@ -86,7 +86,7 @@ extends IsisAjaxHeadersToolbarAbstract<String> {
}
private UiHintContainer getUiHintContainer() {
- return UiHintContainer.Util.hintContainerOf(this, EntityModel.class);
+ return UiHintContainer.Util.hintContainerOf(this, UiObjectWkt.class);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
index 4a1c542d82..b44bcda7bc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.HasCommonContext;
import org.apache.isis.viewer.wicket.model.util.WktContext;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.GenericToggleboxColumn;
@@ -110,7 +110,7 @@ implements HasCommonContext {
}
private UiHintContainer getUiHintContainer() {
- return UiHintContainer.Util.hintContainerOf(this, EntityModel.class);
+ return UiHintContainer.Util.hintContainerOf(this, UiObjectWkt.class);
}
private transient MetaModelContext mmc;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java
index 30d8ff91c8..135161bb68 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanel;
@@ -109,7 +109,7 @@ extends GenericColumnAbstract {
val domainObject = rowModel.getObject().getRowElement();
val property = domainObject.getSpecification().getPropertyElseFail(propertyId);
- val entityModel = EntityModel.ofAdapter(super.getMetaModelContext(), domainObject);
+ val entityModel = UiObjectWkt.ofAdapter(super.getMetaModelContext(), domainObject);
val scalarModel = entityModel
.getPropertyModel(
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java
index 9be473c2e2..c616652433 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericTitleColumn.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.object.ManagedObjects;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
import org.apache.isis.viewer.commons.model.object.UiObject.RenderingHint;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel.Variant;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -88,7 +88,7 @@ extends GenericColumnAbstract {
return componentFactory.createComponent(id, valueModel);
}
- val entityModel = EntityModel.ofAdapter(super.getMetaModelContext(), adapter);
+ val entityModel = UiObjectWkt.ofAdapter(super.getMetaModelContext(), adapter);
entityModel.setRenderingHint(variant.isParented()
? RenderingHint.PARENTED_TITLE_COLUMN
: RenderingHint.STANDALONE_TITLE_COLUMN);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java
index 8f933d58f5..e80d82acd2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/icons/CollectionContentsAsIconsPanel.java
@@ -23,7 +23,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataTableModel;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.entity.header.EntityHeaderPanel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -58,7 +58,7 @@ extends PanelAbstract<DataTableModel, EntityCollectionModel> {
add(entityInstances);
for (val adapter : visibleAdapters) {
final String childId = entityInstances.newChildId();
- final EntityModel entityModel = EntityModel.ofAdapter(super.getMetaModelContext(), adapter);
+ final UiObjectWkt entityModel = UiObjectWkt.ofAdapter(super.getMetaModelContext(), adapter);
final EntityHeaderPanel entitySummaryPanel = new EntityHeaderPanel(childId, entityModel);
entityInstances.add(entitySummaryPanel);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
index 907e65151b..38222c315c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
@@ -22,7 +22,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
import lombok.val;
@@ -30,7 +30,7 @@ import lombok.val;
/**
* Convenience adapter for a number of {@link ComponentFactoryAbstract component
* factory}s that where the created {@link Component} are backed by an
- * {@link EntityModel}.
+ * {@link UiObjectWkt}.
*/
public abstract class EntityComponentFactoryAbstract extends ComponentFactoryAbstract {
@@ -53,10 +53,10 @@ public abstract class EntityComponentFactoryAbstract extends ComponentFactoryAbs
@Override
protected ApplicationAdvice appliesTo(final IModel<?> model) {
- if (!(model instanceof EntityModel)) {
+ if (!(model instanceof UiObjectWkt)) {
return ApplicationAdvice.DOES_NOT_APPLY;
}
- final EntityModel entityModel = (EntityModel) model;
+ final UiObjectWkt entityModel = (UiObjectWkt) model;
// hit a scenario on a redirect-and-post strategy where the component is rendered not on an
// EntityPage but instead using a custom home page. The hacky override in entity page (in EntityPage#onBeforeRender)
// is therefore not called. resulting in a concurrency exception.
@@ -77,7 +77,7 @@ public abstract class EntityComponentFactoryAbstract extends ComponentFactoryAbs
/**
* optional hook.
*/
- protected ApplicationAdvice doAppliesTo(final EntityModel entityModel) {
+ protected ApplicationAdvice doAppliesTo(final UiObjectWkt entityModel) {
return ApplicationAdvice.APPLIES;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
index 6a7ae00daf..6d50c9a698 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.util.Facets;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModelParented;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.util.ComponentHintKey;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
@@ -51,10 +51,10 @@ import lombok.val;
/**
* {@link PanelAbstract Panel} representing the properties of an entity, as per
- * the provided {@link EntityModel}.
+ * the provided {@link UiObjectWkt}.
*/
public class EntityCollectionPanel
-extends PanelAbstract<ManagedObject, EntityModel>
+extends PanelAbstract<ManagedObject, UiObjectWkt>
implements HasDynamicallyVisibleContent {
private static final long serialVersionUID = 1L;
@@ -76,7 +76,7 @@ implements HasDynamicallyVisibleContent {
private final WebMarkupContainer div;
- public EntityCollectionPanel(final String id, final EntityModel entityModel) {
+ public EntityCollectionPanel(final String id, final UiObjectWkt entityModel) {
super(id, entityModel);
this.div = new WebMarkupContainer(ID_COLLECTION_GROUP);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
index 67adad5f08..8cc70b96fe 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanelFactory.java
@@ -22,7 +22,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
@@ -39,7 +39,7 @@ public class EntityCollectionPanelFactory extends EntityComponentFactoryAbstract
@Override
public Component createComponent(final String id, final IModel<?> model) {
- final EntityModel entityModel = (EntityModel) model;
+ final UiObjectWkt entityModel = (UiObjectWkt) model;
return new EntityCollectionPanel(id, entityModel);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
index 3baceab617..4a59f2ab0c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.util.Facets;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
@@ -51,7 +51,7 @@ import org.apache.isis.viewer.wicket.ui.util.WktComponents;
import lombok.val;
-public class PropertyGroup extends PanelAbstract<ManagedObject, EntityModel> implements HasDynamicallyVisibleContent {
+public class PropertyGroup extends PanelAbstract<ManagedObject, UiObjectWkt> implements HasDynamicallyVisibleContent {
private static final long serialVersionUID = 1L;
private static final String ID_MEMBER_GROUP = "memberGroup";
@@ -67,7 +67,7 @@ public class PropertyGroup extends PanelAbstract<ManagedObject, EntityModel> imp
private final Can<ScalarPanelAbstract> childScalarPanels;
private final List<Component> childComponents;
- public PropertyGroup(final String id, final EntityModel model, final FieldSet fieldSet) {
+ public PropertyGroup(final String id, final UiObjectWkt model, final FieldSet fieldSet) {
super(id, model);
this.fieldSet = fieldSet;
@@ -82,8 +82,8 @@ public class PropertyGroup extends PanelAbstract<ManagedObject, EntityModel> imp
}
@Override
- public EntityModel getModel() {
- return (EntityModel) getDefaultModel();
+ public UiObjectWkt getModel() {
+ return (UiObjectWkt) getDefaultModel();
}
private List<Component> buildGui() {
@@ -180,13 +180,13 @@ public class PropertyGroup extends PanelAbstract<ManagedObject, EntityModel> imp
}
private Component addPropertyToForm(
- final EntityModel entityModel,
+ final UiObjectWkt entityModel,
final OneToOneAssociation property,
final WebMarkupContainer container,
final Consumer<LinkAndLabel> onAssociatedAction) {
final ScalarModel scalarModel =
- entityModel.getPropertyModel(property, ScalarRepresentation.VIEWING, EntityModel.RenderingHint.REGULAR);
+ entityModel.getPropertyModel(property, ScalarRepresentation.VIEWING, UiObjectWkt.RenderingHint.REGULAR);
final Component scalarNameAndValueComponent = getComponentFactoryRegistry()
.addOrReplaceComponent(container, ID_PROPERTY, UiComponentType.SCALAR_NAME_AND_VALUE, scalarModel);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
index 9ce5e0a6b6..231f4a836b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
@@ -24,7 +24,7 @@ import org.apache.isis.commons.collections.Can;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelFactory;
@@ -34,20 +34,20 @@ import lombok.val;
/**
* {@link PanelAbstract Panel} representing the summary details (title, icon and
- * actions) of an entity, as per the provided {@link EntityModel}.
+ * actions) of an entity, as per the provided {@link UiObjectWkt}.
*/
public class EntityHeaderPanel
-extends PanelAbstract<ManagedObject, EntityModel> {
+extends PanelAbstract<ManagedObject, UiObjectWkt> {
private static final long serialVersionUID = 1L;
private static final String ID_ENTITY_ACTIONS = "entityActions";
- public EntityHeaderPanel(final String id, final EntityModel entityModel) {
+ public EntityHeaderPanel(final String id, final UiObjectWkt entityModel) {
super(id, entityModel);
}
- public EntityModel getEntityModel() {
+ public UiObjectWkt getEntityModel() {
return getModel();
}
@@ -71,7 +71,7 @@ extends PanelAbstract<ManagedObject, EntityModel> {
private void buildEntityActionsGui() {
- final EntityModel model = getModel();
+ final UiObjectWkt model = getModel();
val adapter = model.getObject();
if (adapter != null) {
val topLevelActions = ObjectAction.Util.streamTopBarActions(adapter)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
index 57e110f79b..631d3aa652 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanelFactory.java
@@ -22,7 +22,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
@@ -39,7 +39,7 @@ public class EntityHeaderPanelFactory extends EntityComponentFactoryAbstract {
@Override
public Component createComponent(final String id, final IModel<?> model) {
- final EntityModel entityModel = (EntityModel) model;
+ final UiObjectWkt entityModel = (UiObjectWkt) model;
return new EntityHeaderPanel(id, entityModel);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index c154d034e4..70d8311885 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.object.ManagedObjects;
import org.apache.isis.core.metamodel.object.MmTitleUtil;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ObjectAdapterModel;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.model.util.PageParameterUtils;
@@ -44,7 +44,7 @@ import lombok.val;
/**
* {@link PanelAbstract Panel} representing the icon and title of an entity,
- * as per the provided {@link EntityModel}.
+ * as per the provided {@link UiObjectWkt}.
*/
public class EntityIconAndTitlePanel
extends PanelAbstract<ManagedObject, ObjectAdapterModel> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
index a001657c91..45ae5803f6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanel.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.ui.components.entity.icontitle;
import org.apache.wicket.MarkupContainer;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.widgets.zclip.ZeroClipboardPanel;
import lombok.val;
@@ -35,7 +35,7 @@ public class EntityIconTitleAndCopyLinkPanel extends EntityIconAndTitlePanel {
private static final String ID_COPY_LINK = "copyLink";
- public EntityIconTitleAndCopyLinkPanel(final String id, final EntityModel entityModel) {
+ public EntityIconTitleAndCopyLinkPanel(final String id, final UiObjectWkt entityModel) {
super(id, entityModel);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
index 4d626360a9..411d422123 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconTitleAndCopyLinkPanelFactory.java
@@ -22,7 +22,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
/**
@@ -38,7 +38,7 @@ public class EntityIconTitleAndCopyLinkPanelFactory extends EntityComponentFacto
@Override
public Component createComponent(final String id, final IModel<?> model) {
- final EntityModel entityModel = (EntityModel) model;
+ final UiObjectWkt entityModel = (UiObjectWkt) model;
return new EntityIconTitleAndCopyLinkPanel(id, entityModel);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
index aa7b77a606..d7f1eceddb 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
@@ -27,13 +27,13 @@ import org.apache.isis.applib.layout.grid.bootstrap.BSGrid;
import org.apache.isis.applib.layout.grid.bootstrap.BSRow;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.layout.bs.row.Row;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
public class BSGridPanel
-extends PanelAbstract<ManagedObject, EntityModel> {
+extends PanelAbstract<ManagedObject, UiObjectWkt> {
private static final long serialVersionUID = 1L;
@@ -65,7 +65,7 @@ extends PanelAbstract<ManagedObject, EntityModel> {
}
- public BSGridPanel(final String id, final EntityModel entityModel, final BSGrid bsGrid) {
+ public BSGridPanel(final String id, final UiObjectWkt entityModel, final BSGrid bsGrid) {
super(id, entityModel);
this.bsPage = bsGrid;
buildGui();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java
index bec3f24c5c..44b439646a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanelFactory.java
@@ -23,7 +23,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.metamodel.util.Facets;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.EntityComponentFactoryAbstract;
@@ -41,7 +41,7 @@ public class BSGridPanelFactory extends EntityComponentFactoryAbstract {
}
@Override protected ApplicationAdvice appliesTo(final IModel<?> model) {
- final EntityModel entityModel = (EntityModel) model;
+ final UiObjectWkt entityModel = (UiObjectWkt) model;
val objectAdapter = entityModel.getObject();
val objectSpec = entityModel.getTypeOfSpecification();
@@ -53,7 +53,7 @@ public class BSGridPanelFactory extends EntityComponentFactoryAbstract {
@Override
public Component createComponent(final String id, final IModel<?> model) {
- final EntityModel entityModel = (EntityModel) model;
+ final UiObjectWkt entityModel = (UiObjectWkt) model;
val objectAdapter = entityModel.getObject();
val objectSpec = entityModel.getTypeOfSpecification();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java
index 3d6b5d14e4..39aee9d9e3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/clearfix/ClearFix.java
@@ -22,12 +22,12 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.isis.applib.layout.grid.bootstrap.BSClearFix;
import org.apache.isis.core.metamodel.object.ManagedObject;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
public class ClearFix
-extends PanelAbstract<ManagedObject, EntityModel> {
+extends PanelAbstract<ManagedObject, UiObjectWkt> {
private static final long serialVersionUID = 1L;
@@ -37,7 +37,7 @@ extends PanelAbstract<ManagedObject, EntityModel> {
public ClearFix(
final String id,
- final EntityModel entityModel,
+ final UiObjectWkt entityModel,
final BSClearFix bsClearFix) {
super(id, entityModel);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java
index de6c0bb86b..78f6d44224 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/col/Col.java
@@ -38,7 +38,7 @@ import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelFactory;
@@ -53,7 +53,7 @@ import org.apache.isis.viewer.wicket.ui.util.WktComponents;
import lombok.val;
public class Col
-extends PanelAbstract<ManagedObject, EntityModel>
+extends PanelAbstract<ManagedObject, UiObjectWkt>
implements HasDynamicallyVisibleContent {
private static final long serialVersionUID = 1L;
@@ -69,7 +69,7 @@ implements HasDynamicallyVisibleContent {
public Col(
final String id,
- final EntityModel entityModel, final BSCol bsCol) {
+ final UiObjectWkt entityModel, final BSCol bsCol) {
super(id, entityModel);
@@ -245,7 +245,7 @@ implements HasDynamicallyVisibleContent {
final RepeatingViewWithDynamicallyVisibleContent collectionRv =
new RepeatingViewWithDynamicallyVisibleContent(ID_COLLECTIONS);
- final EntityModel entityModel = getModel();
+ final UiObjectWkt entityModel = getModel();
final CollectionLayoutData snapshot = entityModel.getCollectionLayoutData();
for (CollectionLayoutData collection : collections) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java
index ddfd15b446..685e65cd79 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/row/Row.java
@@ -25,7 +25,7 @@ import org.apache.isis.applib.layout.grid.bootstrap.BSCol;
import org.apache.isis.applib.layout.grid.bootstrap.BSRow;
import org.apache.isis.applib.layout.grid.bootstrap.BSRowContent;
import org.apache.isis.core.metamodel.object.ManagedObject;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.layout.bs.clearfix.ClearFix;
import org.apache.isis.viewer.wicket.ui.components.layout.bs.col.Col;
import org.apache.isis.viewer.wicket.ui.components.layout.bs.col.RepeatingViewWithDynamicallyVisibleContent;
@@ -35,7 +35,7 @@ import org.apache.isis.viewer.wicket.ui.util.Wkt;
import org.apache.isis.viewer.wicket.ui.util.WktComponents;
public class Row
-extends PanelAbstract<ManagedObject, EntityModel>
+extends PanelAbstract<ManagedObject, UiObjectWkt>
implements HasDynamicallyVisibleContent {
private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@ implements HasDynamicallyVisibleContent {
public Row(
final String id,
- final EntityModel entityModel,
+ final UiObjectWkt entityModel,
final BSRow bsRow) {
super(id, entityModel);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
index 389ea0362c..f82590a215 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
@@ -31,7 +31,7 @@ import org.apache.wicket.model.Model;
import org.apache.isis.applib.layout.grid.bootstrap.BSTab;
import org.apache.isis.applib.layout.grid.bootstrap.BSTabGroup;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.util.ComponentHintKey;
import org.apache.isis.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
@@ -50,9 +50,9 @@ implements HasDynamicallyVisibleContent {
// the view metadata
private final ComponentHintKey selectedTabHintKey;
- private final EntityModel entityModel;
+ private final UiObjectWkt entityModel;
- private static List<ITab> tabsFor(final EntityModel entityModel, final BSTabGroup bsTabGroup) {
+ private static List<ITab> tabsFor(final UiObjectWkt entityModel, final BSTabGroup bsTabGroup) {
final List<ITab> tabs = new ArrayList<>();
final List<BSTab> tablist = _NullSafe.stream(bsTabGroup.getTabs())
@@ -79,7 +79,7 @@ implements HasDynamicallyVisibleContent {
return tabs;
}
- public TabGroupPanel(final String id, final EntityModel entityModel, final BSTabGroup bsTabGroup) {
+ public TabGroupPanel(final String id, final UiObjectWkt entityModel, final BSTabGroup bsTabGroup) {
super(id, tabsFor(entityModel, bsTabGroup));
this.entityModel = entityModel;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
index af5209e555..78abba012f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.layout.grid.bootstrap.BSRow;
import org.apache.isis.applib.layout.grid.bootstrap.BSTab;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.wicket.model.hints.HasUiHintDisambiguator;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.layout.bs.col.RepeatingViewWithDynamicallyVisibleContent;
import org.apache.isis.viewer.wicket.ui.components.layout.bs.row.Row;
import org.apache.isis.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
@@ -33,7 +33,7 @@ import org.apache.isis.viewer.wicket.ui.util.Wkt;
import org.apache.isis.viewer.wicket.ui.util.WktComponents;
public class TabPanel
-extends PanelAbstract<ManagedObject, EntityModel>
+extends PanelAbstract<ManagedObject, UiObjectWkt>
implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
private static final long serialVersionUID = 1L;
@@ -43,11 +43,11 @@ implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
private final BSTab bsTab;
- public TabPanel(final String id, final EntityModel model, final BSTab bsTab) {
+ public TabPanel(final String id, final UiObjectWkt model, final BSTab bsTab) {
this(id, model, bsTab, null);
}
- public TabPanel(final String id, final EntityModel model, final BSTab bsTab, final RepeatingViewWithDynamicallyVisibleContent repeatingViewWithDynamicallyVisibleContent) {
+ public TabPanel(final String id, final UiObjectWkt model, final BSTab bsTab, final RepeatingViewWithDynamicallyVisibleContent repeatingViewWithDynamicallyVisibleContent) {
super(id);
this.bsTab = bsTab;
@@ -63,7 +63,7 @@ implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
return bsTab.getName();
}
- protected void buildGui(final EntityModel model, final BSTab bsTab, final RepeatingViewWithDynamicallyVisibleContent rvIfAny) {
+ protected void buildGui(final UiObjectWkt model, final BSTab bsTab, final RepeatingViewWithDynamicallyVisibleContent rvIfAny) {
final WebMarkupContainer div = new WebMarkupContainer(ID_TAB_PANEL);
@@ -81,7 +81,7 @@ implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
}
- public static RepeatingViewWithDynamicallyVisibleContent newRows(final EntityModel model, final BSTab bsTab) {
+ public static RepeatingViewWithDynamicallyVisibleContent newRows(final UiObjectWkt model, final BSTab bsTab) {
final RepeatingViewWithDynamicallyVisibleContent rv = new RepeatingViewWithDynamicallyVisibleContent(ID_ROWS);
for(final BSRow bsRow: bsTab.getRows()) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
index 5b6453bf39..64b152f54e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
@@ -23,9 +23,9 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.components.actions.ActionParametersPanel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -52,7 +52,7 @@ extends PanelAbstract<ManagedObject, ScalarPropertyModel> {
super(id, scalarModel.copyHaving(
ScalarRepresentation.EDITING,
- EntityModel.RenderingHint.REGULAR));
+ UiObjectWkt.RenderingHint.REGULAR));
buildGui(scalarModel);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
index db6fde4f07..f4eda35955 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/propertyheader/PropertyEditPromptHeaderPanel.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.ui.components.propertyheader;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarPropertyModel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -41,7 +41,7 @@ extends PanelAbstract<ManagedObject, ScalarPropertyModel> {
getComponentFactoryRegistry().addOrReplaceComponent(
this,
UiComponentType.ENTITY_ICON_AND_TITLE,
- EntityModel.ofAdapter(model.getMetaModelContext(), targetAdapter));
+ UiObjectWkt.ofAdapter(model.getMetaModelContext(), targetAdapter));
Wkt.labelAdd(this, ID_PROPERTY_NAME, model::getFriendlyName)
.setEscapeModelStrings(true);
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 512a1554f3..63c27008d6 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
@@ -50,7 +50,7 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.core.metamodel.object.ManagedObjects;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
import org.apache.isis.viewer.wicket.model.util.WktContext;
@@ -202,7 +202,7 @@ class IsisToWicketTreeAdapter {
/**
* Extending the EntityModel to also provide a TreePath.
*/
- private static class TreeModel extends EntityModel {
+ private static class TreeModel extends UiObjectWkt {
private static final long serialVersionUID = 8916044984628849300L;
private final TreePath treePath;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
index dd8888b5f1..8cc35105c8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/unknown/UnknownModelPanel.java
@@ -22,7 +22,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.metamodel.object.ManagedObjects;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -55,8 +55,8 @@ extends PanelAbstract<Object, IModel<Object>> {
private void buildMessageForModel(final StringBuilder buf, final IModel<?> model) {
buf.append(model.getClass().getSimpleName()).append(" ");
- if(model instanceof EntityModel) {
- val entityModel = (EntityModel) model;
+ if(model instanceof UiObjectWkt) {
+ val entityModel = (UiObjectWkt) model;
val objectAdapter = entityModel.getObject();
if(objectAdapter != null) {
buf.append("??? objectAdapter oid: " + ManagedObjects.bookmark(objectAdapter).orElse(null));
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 18245b702a..1348389496 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
@@ -30,7 +30,7 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
public class BreadcrumbModel implements Serializable {
@@ -49,10 +49,10 @@ public class BreadcrumbModel implements Serializable {
this.commonContext = commonContext;
}
- public List<EntityModel> getList() {
- List<EntityModel> entityModels = _Lists.newArrayList();
+ public List<UiObjectWkt> getList() {
+ List<UiObjectWkt> entityModels = _Lists.newArrayList();
for (Bookmark bookmark : list) {
- EntityModel entityModel = toEntityModel(bookmark);
+ UiObjectWkt entityModel = toEntityModel(bookmark);
entityModels.add(entityModel);
}
return Collections.unmodifiableList(entityModels);
@@ -67,11 +67,11 @@ public class BreadcrumbModel implements Serializable {
mostRecentlyVisitedOidStr = null;
}
- public EntityModel getMostRecentlyVisited() {
+ public UiObjectWkt getMostRecentlyVisited() {
return mostRecentlyVisitedOidStr != null ? lookup(mostRecentlyVisitedOidStr) : null;
}
- public void visited(final EntityModel entityModel) {
+ public void visited(final UiObjectWkt entityModel) {
// ignore view models
if(entityModel.getTypeOfSpecification().isViewModel()) {
@@ -88,7 +88,7 @@ public class BreadcrumbModel implements Serializable {
trimTo(MAX_SIZE);
}
- private String oidStrFrom(final EntityModel entityModel) {
+ private String oidStrFrom(final UiObjectWkt entityModel) {
final PageParameters pageParameters = entityModel.getPageParametersWithoutUiHints();
return oidStrFrom(pageParameters);
}
@@ -107,7 +107,7 @@ public class BreadcrumbModel implements Serializable {
}
}
- private void addToStart(final String oidStr, final EntityModel entityModel) {
+ private void addToStart(final String oidStr, final UiObjectWkt entityModel) {
Bookmark bookmark = entityModel.getOwnerBookmark();
bookmarkByOidStr.put(oidStr, bookmark);
oidStrByBookmark.put(bookmark, oidStr);
@@ -125,7 +125,7 @@ public class BreadcrumbModel implements Serializable {
}
}
- public EntityModel lookup(final String oidStr) {
+ public UiObjectWkt lookup(final String oidStr) {
if(oidStr == null) {
return null;
}
@@ -152,7 +152,7 @@ public class BreadcrumbModel implements Serializable {
}
}
- public void remove(final EntityModel entityModel) {
+ public void remove(final UiObjectWkt entityModel) {
Bookmark bookmark = entityModel.getOwnerBookmark();
final String oidStr = oidStrByBookmark.get(bookmark);
if(oidStr != null) {
@@ -160,8 +160,8 @@ public class BreadcrumbModel implements Serializable {
}
}
- protected EntityModel toEntityModel(final Bookmark bookmark) {
- return EntityModel.ofBookmark(commonContext, bookmark);
+ protected UiObjectWkt toEntityModel(final Bookmark bookmark) {
+ return UiObjectWkt.ofBookmark(commonContext, bookmark);
}
private void remove(final String oid, final Bookmark bookmark) {
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 e490e2ab09..f774bdd6c6 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
@@ -37,7 +37,7 @@ import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -63,22 +63,22 @@ extends PanelAbstract<Void, IModel<Void>> {
.map(BreadcrumbModelProvider::getBreadcrumbModel)
.orElseGet(()->new BreadcrumbModel(getMetaModelContext())); // for testing
- final IModel<EntityModel> entityModel = new Model<>();
- ChoiceProvider<EntityModel> choiceProvider = new ChoiceProvider<EntityModel>() {
+ final IModel<UiObjectWkt> entityModel = new Model<>();
+ ChoiceProvider<UiObjectWkt> choiceProvider = new ChoiceProvider<UiObjectWkt>() {
private static final long serialVersionUID = 1L;
@Override
- public String getDisplayValue(final EntityModel choice) {
+ public String getDisplayValue(final UiObjectWkt choice) {
return titleFor(choice);
}
- private String titleFor(final EntityModel model) {
+ private String titleFor(final UiObjectWkt model) {
return model.getManagedObject().getTitle();
}
@Override
- public String getIdValue(final EntityModel choice) {
+ public String getIdValue(final UiObjectWkt choice) {
try {
final PageParameters pageParameters = choice.getPageParametersWithoutUiHints();
final String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
@@ -97,12 +97,12 @@ extends PanelAbstract<Void, IModel<Void>> {
}
@Override
- public void query(final String term, final int page, final Response<EntityModel> response) {
- final List<EntityModel> breadCrumbList = _Lists.newArrayList(breadcrumbModel.getList());
- final List<EntityModel> checkedList = _Lists.filter(breadCrumbList,
- new Predicate<EntityModel>() {
+ public void query(final String term, final int page, final Response<UiObjectWkt> response) {
+ final List<UiObjectWkt> breadCrumbList = _Lists.newArrayList(breadcrumbModel.getList());
+ final List<UiObjectWkt> checkedList = _Lists.filter(breadCrumbList,
+ new Predicate<UiObjectWkt>() {
@Override
- public boolean test(final EntityModel input) {
+ public boolean test(final UiObjectWkt input) {
final Object id = getIdValue(input);
return id != null;
}
@@ -111,12 +111,12 @@ extends PanelAbstract<Void, IModel<Void>> {
}
@Override
- public Collection<EntityModel> toChoices(final Collection<String> ids) {
+ public Collection<UiObjectWkt> toChoices(final Collection<String> ids) {
return breadcrumbModel.getList();
}
};
- final Select2Choice<EntityModel> breadcrumbChoice =
+ final Select2Choice<UiObjectWkt> breadcrumbChoice =
new Select2Choice<>(ID_BREADCRUMBS, entityModel, choiceProvider);
breadcrumbChoice.add(
@@ -127,7 +127,7 @@ extends PanelAbstract<Void, IModel<Void>> {
@Override
protected void onUpdate(final AjaxRequestTarget target) {
final String oidStr = breadcrumbChoice.getInput();
- final EntityModel selectedModel = breadcrumbModel.lookup(oidStr);
+ final UiObjectWkt selectedModel = breadcrumbModel.lookup(oidStr);
if(selectedModel == null) {
val configuration = getMetaModelContext().getConfiguration();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
index 3efef28d8d..dcb5da3f62 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
@@ -23,14 +23,14 @@ import java.io.Serializable;
import org.apache.wicket.Component;
import org.apache.isis.core.metamodel.object.ManagedObject;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
/**
* Abstraction of show/hide, ie two buttons only one of which is visible.
*/
public class ToggleButtonsPanel
-extends PanelAbstract<ManagedObject, EntityModel> {
+extends PanelAbstract<ManagedObject, UiObjectWkt> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
index 347000a0c1..bd62e2f0a6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanelFactory.java
@@ -23,7 +23,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.metamodel.object.ManagedObject;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
@@ -37,7 +37,7 @@ public class EntityLinkSimplePanelFactory extends ComponentFactoryAbstract {
@Override
public ApplicationAdvice appliesTo(final IModel<?> model) {
- if (model instanceof EntityModel) {
+ if (model instanceof UiObjectWkt) {
return ApplicationAdvice.APPLIES;
}
if (model instanceof ScalarModel) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
index d213d870e7..a6f0218dcf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/zclip/ZeroClipboardPanel.java
@@ -26,8 +26,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
import org.apache.isis.core.metamodel.object.ManagedObject;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.ObjectAdapterModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -60,9 +60,9 @@ extends PanelAbstract<ManagedObject, ObjectAdapterModel> {
ObjectAdapterModel model = getModel();
addSimpleClipboardModalWindow();
- EntityModel.RenderingHint renderingHint = model.getRenderingHint();
+ UiObjectWkt.RenderingHint renderingHint = model.getRenderingHint();
ScalarRepresentation mode = model.getMode();
- setVisible(renderingHint == EntityModel.RenderingHint.REGULAR && mode == ScalarRepresentation.VIEWING);
+ setVisible(renderingHint == UiObjectWkt.RenderingHint.REGULAR && mode == ScalarRepresentation.VIEWING);
// disable, since currently not honoured if used as a URL (think that session hints are taking precedence).
// (see ISIS-1660 to resurrect)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
index 98335c4a06..5402ed73a0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
@@ -35,7 +35,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.isis.applib.services.error.Ticket;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
@@ -119,7 +119,7 @@ public class ExceptionStackTracePanel extends Panel {
final BreadcrumbModelProvider session = (BreadcrumbModelProvider) getSession();
final BreadcrumbModel breadcrumbModel = session.getBreadcrumbModel();
- final EntityModel entityModel = breadcrumbModel.getMostRecentlyVisited();
+ final UiObjectWkt entityModel = breadcrumbModel.getMostRecentlyVisited();
final Class<? extends Page> pageClass;
final PageParameters pageParameters;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 9df584dc14..47557bc1fd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -58,7 +58,7 @@ import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
import org.apache.isis.viewer.wicket.model.models.BookmarkableModel;
import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.model.util.PageParameterUtils;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
@@ -389,7 +389,7 @@ implements ActionPromptProvider {
.ifPresent(bm->bm.bookmarkPage(model));
}
- protected void removeAnyBookmark(final EntityModel model) {
+ protected void removeAnyBookmark(final UiObjectWkt model) {
getBookmarkedPagesModel()
.ifPresent(bm->bm.remove(model));
}
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 16f2aa0408..b94d0ef012 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
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.util.Facets;
import org.apache.isis.viewer.commons.model.components.UiComponentType;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.modelhelpers.WhereAmIHelper;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.UiObjectWkt;
import org.apache.isis.viewer.wicket.model.util.PageParameterUtils;
import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
@@ -60,7 +60,7 @@ public class EntityPage extends PageAbstract {
private static final CssResourceReference ENTITY_PAGE_CSS =
new CssResourceReference(EntityPage.class, "EntityPage.css");
- private final EntityModel model;
+ private final UiObjectWkt model;
// -- FACTORIES
@@ -89,7 +89,7 @@ public class EntityPage extends PageAbstract {
return new EntityPage(
pageParameters,
- EntityModel.ofPageParameters(commonContext, pageParameters));
+ UiObjectWkt.ofPageParameters(commonContext, pageParameters));
}
/**
@@ -105,14 +105,14 @@ public class EntityPage extends PageAbstract {
return new EntityPage(
PageParameterUtils.createPageParametersForObject(adapter),
- EntityModel.ofAdapter(commonContext, adapter));
+ UiObjectWkt.ofAdapter(commonContext, adapter));
}
// -- CONSTRUCTOR
private EntityPage(
final PageParameters pageParameters,
- final EntityModel entityModel) {
+ final UiObjectWkt entityModel) {
super(pageParameters, null/*titleString*/, UiComponentType.ENTITY);
this.model = entityModel;
}
@@ -207,7 +207,7 @@ public class EntityPage extends PageAbstract {
@Override
public void onNewRequestCycle() {
- val entityModel = (EntityModel) getUiHintContainerIfAny();
+ val entityModel = (UiObjectWkt) getUiHintContainerIfAny();
ManagedObjects.refreshViewmodel(entityModel.getObject(),
()->PageParameterUtils
.toBookmark(getPageParameters())
@@ -216,12 +216,12 @@ public class EntityPage extends PageAbstract {
// -- HELPER
- private void addBreadcrumbIfShown(final EntityModel entityModel) {
+ private void addBreadcrumbIfShown(final UiObjectWkt entityModel) {
getBreadcrumbModel()
.ifPresent(breadcrumbModel->breadcrumbModel.visited(entityModel));
}
- private void removeAnyBreadcrumb(final EntityModel entityModel) {
+ private void removeAnyBreadcrumb(final UiObjectWkt entityModel) {
getBreadcrumbModel()
.ifPresent(breadcrumbModel->breadcrumbModel.remove(entityModel));
}