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/03/10 06:39:42 UTC
[isis] branch master updated: ISIS-2303: don't assume optionals are
same from 2 different calls
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 66c9391 ISIS-2303: don't assume optionals are same from 2 different calls
66c9391 is described below
commit 66c9391091ec568ff88aa7767ce880daed1da5ce
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Mar 10 07:39:29 2020 +0100
ISIS-2303: don't assume optionals are same from 2 different calls
---
.../viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java | 5 +++--
.../incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java | 2 +-
.../isis/incubator/viewer/vaadin/ui/pages/main/MainView.java | 8 +++-----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
index 5bc9d6e..48fc706 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/auth/VaadinAuthenticationHandler.java
@@ -123,8 +123,9 @@ public class VaadinAuthenticationHandler implements VaadinServiceInitListener {
val targetView = event.getNavigationTarget();
log.info("Detected a routing event to {}", targetView);
- if(currentAuthenticationSession().isPresent()) {
- isisSessionFactory.openSession(currentAuthenticationSession().get());
+ val authSession = currentAuthenticationSession().orElse(null);
+ if(authSession!=null) {
+ isisSessionFactory.openSession(authSession);
return; // access granted
}
if(!VaadinLoginView.class.equals(targetView)) {
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java
index e5d8514..c2b1035 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/login/VaadinLoginView.java
@@ -93,7 +93,7 @@ public class VaadinLoginView extends VerticalLayout {
private void addTitleAndLogo(IsisConfiguration isisConfiguration, WebAppContextPath webAppContextPath) {
//TODO application name/logo borrowed from Wicket's configuration
val applicationName = isisConfiguration.getViewer().getWicket().getApplication().getName();
- val applicationLogo = isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoHeader();
+ val applicationLogo = isisConfiguration.getViewer().getWicket().getApplication().getBrandLogoSignin();
applicationLogo.ifPresent(logoUrl->{
add(new Image(webAppContextPath.prependContextPathIfLocal(logoUrl), "logo"));
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
index f46b2fb..135e0f2 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/MainView.java
@@ -170,13 +170,11 @@ public class MainView extends VerticalLayout {
};
}
- public static List<MenuSectionUiModel> buildMenuModel(
+ private List<MenuSectionUiModel> buildMenuModel(
final IsisWebAppCommonContext commonContext,
final BS3MenuBars menuBars
) {
-
val menuSections = new ArrayList<MenuSectionUiModel>();
-
buildMenuModel(commonContext, menuBars.getPrimary(), menuSections::add);
@@ -188,8 +186,8 @@ public class MainView extends VerticalLayout {
}
- // partly copied from org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions.ServiceActionUtil.buildMenu
- private static void buildMenuModel(
+ // initially copied from org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions.ServiceActionUtil.buildMenu
+ private void buildMenuModel(
final IsisWebAppCommonContext commonContext,
final BS3MenuBar menuBar,
Consumer<MenuSectionUiModel> onMenuSection