You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2024/11/26 15:22:32 UTC
(causeway) 01/02: CAUSEWAY-3815: rename EntityPage -> DomainObjectPage (part 1)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 6129acf2ccb9980461ad6d604495c30934c8db6b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Nov 26 15:09:33 2024 +0100
CAUSEWAY-3815: rename EntityPage -> DomainObjectPage (part 1)
---
.../ui/viewer/FullCalendarWithEventHandling.java | 4 +--
.../testdomain/conf/Configuration_usingWicket.java | 18 ++++++------
.../viewers/common/wkt/InteractionTestWkt.java | 4 +--
viewers/wicket/ui/src/main/java/module-info.java | 2 +-
.../ui/actionresponse/ActionResultResponse.java | 4 +--
.../entityactions/ActionLinksPanel.java | 18 ++++++------
.../components/widgets/actionlink/ActionLink.java | 6 ++--
.../widgets/breadcrumbs/BreadcrumbPanel.java | 4 +--
.../viewer/wicket/ui/pages/home/HomePage.java | 4 +--
.../EntityPage.css => obj/DomainObjectPage.css} | 0
.../EntityPage.html => obj/DomainObjectPage.html} | 0
.../EntityPage.java => obj/DomainObjectPage.java} | 34 ++++++++--------------
.../wicket/ui/panels/PromptFormAbstract.java | 6 ++--
.../registries/pages/PageClassListDefault.java | 4 +--
.../wicket/viewer/wicketapp/_PageFactory.java | 16 +++++-----
15 files changed, 56 insertions(+), 68 deletions(-)
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/FullCalendarWithEventHandling.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/FullCalendarWithEventHandling.java
index 52302d0684e..aadc6556275 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/FullCalendarWithEventHandling.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/FullCalendarWithEventHandling.java
@@ -30,7 +30,7 @@ import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarRe
import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.FullCalendar;
import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.ClickedEvent;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
-import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@@ -73,7 +73,7 @@ implements HasMetaModelContext {
var pageParameters = entityModel.getPageParameters();
if(pageParameters!=null) {
- throw new RestartResponseException(EntityPage.class, pageParameters);
+ throw new RestartResponseException(DomainObjectPage.class, pageParameters);
}
// otherwise ignore
diff --git a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
index bc5fe0e8d26..a22b5e1936f 100644
--- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
+++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/conf/Configuration_usingWicket.java
@@ -61,7 +61,7 @@ import org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegi
import org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FieldFrame;
import org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.RegularFrame;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
import org.apache.causeway.viewer.wicket.viewer.CausewayModuleViewerWicketViewer;
import org.apache.causeway.viewer.wicket.viewer.wicketapp.CausewayWicketAjaxRequestListenerUtil;
@@ -279,13 +279,13 @@ public class Configuration_usingWicket {
}
/**
- * Renders the {@link EntityPage}.
+ * Renders the {@link DomainObjectPage}.
* @see #startPage(IPageProvider)
*/
- public EntityPage startEntityPage(final PageParameters pageParameters) {
- var entityPage = EntityPage.forPageParameters(pageParameters);
+ public DomainObjectPage startEntityPage(final PageParameters pageParameters) {
+ var entityPage = DomainObjectPage.forPageParameters(pageParameters);
var startedPage = startPage(entityPage);
- assertRenderedPage(EntityPage.class);
+ assertRenderedPage(DomainObjectPage.class);
return startedPage;
}
@@ -321,15 +321,15 @@ public class Configuration_usingWicket {
@Override
public <C extends IRequestablePage> C newPage(final Class<C> pageClass, final PageParameters parameters) {
- if(EntityPage.class.equals(pageClass)) {
- return _Casts.uncheckedCast(EntityPage.forPageParameters(parameters));
+ if(DomainObjectPage.class.equals(pageClass)) {
+ return _Casts.uncheckedCast(DomainObjectPage.forPageParameters(parameters));
}
return delegate.newPage(pageClass, parameters);
}
@Override
public <C extends IRequestablePage> C newPage(final Class<C> pageClass) {
- if(EntityPage.class.equals(pageClass)) {
+ if(DomainObjectPage.class.equals(pageClass)) {
throw _Exceptions.illegalArgument("cannot instantiate EntityPage without PageParameters");
}
return delegate.newPage(pageClass);
@@ -337,7 +337,7 @@ public class Configuration_usingWicket {
@Override
public <C extends IRequestablePage> boolean isBookmarkable(final Class<C> pageClass) {
- if(EntityPage.class.equals(pageClass)) {
+ if(DomainObjectPage.class.equals(pageClass)) {
return true;
}
return delegate.isBookmarkable(pageClass);
diff --git a/regressiontests/viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java b/regressiontests/viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java
index 2648e024d10..7fc1cbc89e2 100644
--- a/regressiontests/viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java
+++ b/regressiontests/viewers-common/src/test/java/org/apache/causeway/testdomain/viewers/common/wkt/InteractionTestWkt.java
@@ -56,7 +56,7 @@ import org.apache.causeway.viewer.commons.model.hints.RenderingHint;
import org.apache.causeway.viewer.wicket.model.models.PropertyModel;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
-import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
@SpringBootTest(
classes = {
@@ -106,7 +106,7 @@ class InteractionTestWkt extends InteractionTestAbstract {
@Test
void shouldHaveARequestCycle() {
- var entityPage = EntityPage.forPageParameters(pageParameters);
+ var entityPage = DomainObjectPage.forPageParameters(pageParameters);
wktTester.startPage(entityPage);
assertNotNull(RequestCycle.get());
diff --git a/viewers/wicket/ui/src/main/java/module-info.java b/viewers/wicket/ui/src/main/java/module-info.java
index 6bfac44f3e5..17b7ff63992 100644
--- a/viewers/wicket/ui/src/main/java/module-info.java
+++ b/viewers/wicket/ui/src/main/java/module-info.java
@@ -100,7 +100,7 @@ module org.apache.causeway.viewer.wicket.ui {
exports org.apache.causeway.viewer.wicket.ui.pages.common.serversentevents.js;
exports org.apache.causeway.viewer.wicket.ui.pages.common.sidebar.css;
exports org.apache.causeway.viewer.wicket.ui.pages.common.viewer.js;
- exports org.apache.causeway.viewer.wicket.ui.pages.entity;
+ exports org.apache.causeway.viewer.wicket.ui.pages.obj;
exports org.apache.causeway.viewer.wicket.ui.pages.error;
exports org.apache.causeway.viewer.wicket.ui.pages.home;
exports org.apache.causeway.viewer.wicket.ui.pages.login;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponse.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponse.java
index f8140dd1b69..702db5d3cc1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponse.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponse.java
@@ -27,7 +27,7 @@ import org.springframework.lang.Nullable;
import org.apache.causeway.applib.value.OpenUrlStrategy;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
-import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
import lombok.Getter;
import lombok.NonNull;
@@ -49,7 +49,7 @@ public class ActionResultResponse {
public static ActionResultResponse toEntityPage(final @NonNull ManagedObject entityOrViewmodel) {
var pageRedirectRequest = PageRedirectRequest.forPageClassAndBookmark(
- EntityPage.class, entityOrViewmodel.refreshBookmark().orElseThrow());
+ DomainObjectPage.class, entityOrViewmodel.refreshBookmark().orElseThrow());
return ActionResultResponse.toPage(pageRedirectRequest);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionlinks/entityactions/ActionLinksPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionlinks/entityactions/ActionLinksPanel.java
index 9466bba4661..61054192420 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionlinks/entityactions/ActionLinksPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionlinks/entityactions/ActionLinksPanel.java
@@ -60,7 +60,7 @@ extends MenuablePanelAbstract {
}
};
abstract ActionLinksPanel newPanel(String id, Can<ActionLink> links);
- final ActionStyle actionStyle;
+ final ActionStyle actionStyle;
}
@@ -79,7 +79,7 @@ extends MenuablePanelAbstract {
}
return Wkt.add(markupContainer, panel.get());
}
-
+
public static Optional<ActionLinksPanel> actionLinks(
final String id,
final Can<ActionModel> links,
@@ -92,15 +92,15 @@ extends MenuablePanelAbstract {
protected ActionLinksPanel(
final String id,
- final Can<ActionLink> menuables,
+ final Can<ActionLink> actionLinks,
final Style style) {
- super(id, menuables);
+ super(id, actionLinks);
setOutputMarkupId(true);
var container = Wkt.add(this, Wkt.containerWithVisibility(ID_ADDITIONAL_LINK_LIST,
this::hasAnyVisibleLink));
- Wkt.listViewAdd(container, ID_ADDITIONAL_LINK_ITEM, listOfLinkAndLabels(), item->{
+ Wkt.listViewAdd(container, ID_ADDITIONAL_LINK_ITEM, listOfActionLinks(), item->{
var linkAndLabel = item.getModelObject();
item.addOrReplace(WktLinks
.asActionLink(item, ID_ADDITIONAL_LINK_TITLE, linkAndLabel, style.actionStyle));
@@ -117,16 +117,16 @@ extends MenuablePanelAbstract {
}
- protected final Stream<ActionLink> streamLinkAndLabels() {
+ protected final Stream<ActionLink> streamActionLinks() {
return menuablesModel().streamMenuables(ActionLink.class);
}
- protected final List<ActionLink> listOfLinkAndLabels() {
- return streamLinkAndLabels().collect(Collectors.toList());
+ protected final List<ActionLink> listOfActionLinks() {
+ return streamActionLinks().collect(Collectors.toList());
}
public final boolean hasAnyVisibleLink() {
- return streamLinkAndLabels().anyMatch(actionLink->actionLink.isVisible());
+ return streamActionLinks().anyMatch(ActionLink::isVisible);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/actionlink/ActionLink.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/actionlink/ActionLink.java
index 99a91cad03a..c4895ab5b18 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/actionlink/ActionLink.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/actionlink/ActionLink.java
@@ -45,7 +45,7 @@ import org.apache.causeway.viewer.wicket.ui.app.registry.ComponentFactoryRegistr
import org.apache.causeway.viewer.wicket.ui.app.registry.HasComponentFactoryRegistry;
import org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeFragmentFactory.FrameFragment;
import org.apache.causeway.viewer.wicket.ui.components.layout.bs.BSGridPanelFactory;
-import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
import org.apache.causeway.viewer.wicket.ui.panels.FormExecutorDefault;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
@@ -188,7 +188,7 @@ implements HasMetaModelContext, Menuable, HasManagedAction {
// -- HELPER
private void executeWithoutParams() {
- var actionModel = this.getActionModel();
+ var actionModel = getActionModel();
// on non-recoverable exception throws
var outcome = FormExecutorDefault
@@ -209,7 +209,7 @@ implements HasMetaModelContext, Menuable, HasManagedAction {
getTransactionService().flushTransaction();
// "redirect-after-post"
- RequestCycle.get().setResponsePage(EntityPage.class,
+ RequestCycle.get().setResponsePage(DomainObjectPage.class,
PageParameterUtils.createPageParametersForBookmark(bookmark));
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index 0f1c289db26..33a3da5ba2d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -38,7 +38,7 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.ui.errors.JGrowlUtil;
-import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
public class BreadcrumbPanel
@@ -134,7 +134,7 @@ extends PanelAbstract<Void, IModel<Void>> {
breadcrumbModel.remove(oidStr);
return;
}
- setResponsePage(EntityPage.class, selectedModel.getPageParametersWithoutUiHints());
+ setResponsePage(DomainObjectPage.class, selectedModel.getPageParametersWithoutUiHints());
}
private MetaModelContext getMetaModelContext() {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/home/HomePage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/home/HomePage.java
index f4b9e423e7b..6353a1aa252 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/home/HomePage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/home/HomePage.java
@@ -28,7 +28,7 @@ import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
-import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
/**
@@ -62,7 +62,7 @@ public class HomePage extends PageAbstract {
getComponentFactoryRegistry().addOrReplaceComponent(themeDiv, UiComponentType.WELCOME, null);
} else {
var requestCycle = RequestCycle.get();
- var page = EntityPage.forAdapter(homePageAdapter);
+ var page = DomainObjectPage.forAdapter(homePageAdapter);
requestCycle.setResponsePage(page);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.css b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.html b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.html
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.html
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.java
similarity index 90%
rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.java
index e4d5411123d..4369e3a9aa2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/obj/DomainObjectPage.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.pages.entity;
+package org.apache.causeway.viewer.wicket.ui.pages.obj;
import java.util.Optional;
import java.util.function.BiFunction;
@@ -38,8 +38,6 @@ import org.apache.causeway.applib.services.publishing.spi.PageRenderSubscriber;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.functional.Try;
-import org.apache.causeway.commons.internal.debug._Debug;
-import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
@@ -59,11 +57,11 @@ import org.apache.causeway.viewer.wicket.ui.util.Wkt;
*/
@AuthorizeInstantiation(UserMemento.AUTHORIZED_USER_ROLE)
//@Log4j2
-public class EntityPage extends PageAbstract {
+public class DomainObjectPage extends PageAbstract {
private static final long serialVersionUID = 144368606134796079L;
- private static final CssResourceReference ENTITY_PAGE_CSS =
- new CssResourceReference(EntityPage.class, "EntityPage.css");
+ private static final CssResourceReference DOMAIN_OBJECT_PAGE_CSS =
+ new CssResourceReference(DomainObjectPage.class, "DomainObjectPage.css");
private final UiObjectWkt model;
@@ -79,18 +77,14 @@ public class EntityPage extends PageAbstract {
* @param pageParameters The page parameters with the OID
* @return An EntityModel for the requested OID
*/
- public static EntityPage forPageParameters(final PageParameters pageParameters) {
-
- _Debug.onCondition(XrayUi.isXrayEnabled(), ()->{
- _Debug.log("new EntityPage from PageParameters %s", pageParameters);
- });
+ public static DomainObjectPage forPageParameters(final PageParameters pageParameters) {
var bookmark = PageParameterUtils.toBookmark(pageParameters);
if(!bookmark.isPresent()) {
throw new RestartResponseException(Application.get().getHomePage());
}
- return new EntityPage(
+ return new DomainObjectPage(
pageParameters,
UiObjectWkt.ofPageParameters(pageParameters));
}
@@ -98,21 +92,17 @@ public class EntityPage extends PageAbstract {
/**
* Ensures that any exception that might have occurred already (eg from an action invocation) is shown.
*/
- public static EntityPage forAdapter(
+ public static DomainObjectPage forAdapter(
final ManagedObject adapter) {
- _Debug.onCondition(XrayUi.isXrayEnabled(), ()->{
- _Debug.log("new EntityPage from Adapter %s", adapter.getSpecification());
- });
-
- return new EntityPage(
+ return new DomainObjectPage(
PageParameterUtils.createPageParametersForObject(adapter),
UiObjectWkt.ofAdapter(adapter));
}
// -- CONSTRUCTOR
- private EntityPage(
+ private DomainObjectPage(
final PageParameters pageParameters,
final UiObjectWkt entityModel) {
super(pageParameters, null/*titleString*/, UiComponentType.ENTITY);
@@ -128,7 +118,7 @@ public class EntityPage extends PageAbstract {
@Override
public void renderHead(final IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(ENTITY_PAGE_CSS));
+ response.render(CssHeaderItem.forReference(DOMAIN_OBJECT_PAGE_CSS));
}
@Override
@@ -226,7 +216,7 @@ public class EntityPage extends PageAbstract {
@Override
public void onRendering(final Can<PageRenderSubscriber> pageRenderSubscribers) {
onRenderingOrRendered(pageRenderSubscribers, (pageRenderSubscriber, bookmark) -> {
- pageRenderSubscriber.onRenderingDomainObject(bookmark);;
+ pageRenderSubscriber.onRenderingDomainObject(bookmark);
return null;
});
}
@@ -234,7 +224,7 @@ public class EntityPage extends PageAbstract {
@Override
public void onRendered(final Can<PageRenderSubscriber> pageRenderSubscribers) {
onRenderingOrRendered(pageRenderSubscribers, (pageRenderSubscriber, bookmark) -> {
- pageRenderSubscriber.onRenderedDomainObject(bookmark);;
+ pageRenderSubscriber.onRenderedDomainObject(bookmark);
return null;
});
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
index 50472b99097..7398ec5b06e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PromptFormAbstract.java
@@ -45,7 +45,7 @@ import org.apache.causeway.viewer.wicket.model.models.PropertyModel;
import org.apache.causeway.viewer.wicket.ui.components.attributes.AttributeModelChangeListener;
import org.apache.causeway.viewer.wicket.ui.components.attributes.AttributePanel;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
-import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.Wkt.EventTopic;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
@@ -187,8 +187,8 @@ implements AttributeModelChangeListener {
} catch(org.apache.wicket.WicketRuntimeException ex) {
return null;
}
- if (page instanceof EntityPage) {
- EntityPage entityPage = (EntityPage) page;
+ if (page instanceof DomainObjectPage) {
+ DomainObjectPage entityPage = (DomainObjectPage) page;
return entityPage.getUiHintContainerIfAny();
}
return null;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
index 8da984fc5df..6a271ba1043 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
@@ -36,9 +36,9 @@ import org.apache.causeway.viewer.wicket.ui.pages.about.AboutPage;
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.password_reset.PasswordResetPage;
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.register.RegisterPage;
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.signup.RegistrationFormPage;
-import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.causeway.viewer.wicket.ui.pages.home.HomePage;
import org.apache.causeway.viewer.wicket.ui.pages.login.WicketSignInPage;
+import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
import org.apache.causeway.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
import org.apache.causeway.viewer.wicket.ui.pages.value.ValuePage;
import org.apache.causeway.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
@@ -84,7 +84,7 @@ public class PageClassListDefault implements PageClassList {
* For subclassing if required.
*/
protected Class<? extends Page> getEntityPageClass() {
- return EntityPage.class;
+ return DomainObjectPage.class;
}
/**
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/_PageFactory.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/_PageFactory.java
index be47a175184..e1f1ae0345d 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/_PageFactory.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/_PageFactory.java
@@ -25,20 +25,18 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.models.PageType;
-import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.causeway.viewer.wicket.ui.pages.obj.DomainObjectPage;
import lombok.RequiredArgsConstructor;
/**
- *
- * Uses Wicket's default page factory, except for {@link EntityPage}s which require special instantiation:
+ * Uses Wicket's default page factory, except for {@link DomainObjectPage}s which require special instantiation:
* <p>
* Constructor
- * {@link EntityPage#EntityPage(MetaModelContext, PageParameters)}
+ * {@link DomainObjectPage#DomainObjectPage(MetaModelContext, PageParameters)}
* needs the common-context as argument.
*
* @since 2.0
- *
*/
@RequiredArgsConstructor
class _PageFactory implements IPageFactory {
@@ -49,8 +47,8 @@ class _PageFactory implements IPageFactory {
@Override
public <C extends IRequestablePage> C newPage(final Class<C> pageClass, final PageParameters parameters) {
- if(EntityPage.class.equals(pageClass)) {
- return _Casts.uncheckedCast(EntityPage.forPageParameters(parameters));
+ if(DomainObjectPage.class.equals(pageClass)) {
+ return _Casts.uncheckedCast(DomainObjectPage.forPageParameters(parameters));
}
return delegate.newPage(pageClass, parameters);
@@ -59,7 +57,7 @@ class _PageFactory implements IPageFactory {
@Override
public <C extends IRequestablePage> C newPage(final Class<C> pageClass) {
- if(EntityPage.class.equals(pageClass)) {
+ if(DomainObjectPage.class.equals(pageClass)) {
//TODO whenever this happens we should redirect to home,
// almost certainly the session has timed out
@@ -73,7 +71,7 @@ class _PageFactory implements IPageFactory {
@Override
public <C extends IRequestablePage> boolean isBookmarkable(final Class<C> pageClass) {
- if(EntityPage.class.equals(pageClass)) {
+ if(DomainObjectPage.class.equals(pageClass)) {
return true;
}