You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/01/27 07:48:54 UTC
[isis] branch master updated: ISIS-2158: tiny simplification
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 4a611ff ISIS-2158: tiny simplification
4a611ff is described below
commit 4a611ff5515e21581feff9a6960b354191e9ddce
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 27 08:48:41 2020 +0100
ISIS-2158: tiny simplification
---
.../isis/viewer/wicket/ui/pages/home/HomePage.java | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
index 3038f1a..1bcf6a4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
@@ -29,15 +29,10 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.viewer.wicket.model.models.ActionModel;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.components.actions.ActionFormExecutorStrategy;
-import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
-import org.apache.isis.viewer.wicket.ui.panels.FormExecutorDefault;
import org.apache.isis.viewer.wicket.ui.util.Components;
import lombok.val;
@@ -69,11 +64,10 @@ public class HomePage extends PageAbstract {
val homePageAdapter = IsisSession.current()
.map(RuntimeContextBase::getHomePageSupplier)
.map(Supplier::get)
- .filter(x -> x != ManagedObject.empty())
- .orElse(null);
+ .orElse(ManagedObject.empty());
- if(homePageAdapter != null) {
- final RequestCycle requestCycle = RequestCycle.get();
+ if(homePageAdapter != ManagedObject.empty()) {
+ val requestCycle = RequestCycle.get();
requestCycle.setResponsePage(new EntityPage(getCommonContext(), homePageAdapter));
} else {
@@ -81,8 +75,8 @@ public class HomePage extends PageAbstract {
getComponentFactoryRegistry().addOrReplaceComponent(themeDiv, ComponentType.WELCOME, null);
}
- final BreadcrumbModelProvider session = (BreadcrumbModelProvider) getSession();
- final BreadcrumbModel breadcrumbModel = session.getBreadcrumbModel();
+ val breadcrumbModelProvider = (BreadcrumbModelProvider) getSession();
+ val breadcrumbModel = breadcrumbModelProvider.getBreadcrumbModel();
breadcrumbModel.visitedHomePage();
}