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:42:39 UTC
[isis] branch master updated: ISIS-2303: 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 c139b7f ISIS-2303: simplification
c139b7f is described below
commit c139b7f6a3d3ecf4eb80d1f434682b4b9c81fed6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Mar 10 07:42:31 2020 +0100
ISIS-2303: simplification
---
.../isis/incubator/viewer/vaadin/ui/pages/main/MainView.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
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 135e0f2..5d6367d 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
@@ -78,14 +78,13 @@ public class MainView extends VerticalLayout {
final SpecificationLoader specificationLoader,
final MetaModelContext metaModelContext,
final IsisConfiguration isisConfiguration,
- final VaadinAuthenticationHandler vaadinAuthenticationHandler
+ final VaadinAuthenticationHandler vaadinAuthenticationHandler,
+ final MenuBarsServiceBS3 menuBarsService
) {
this.vaadinAuthenticationHandler = vaadinAuthenticationHandler;
- val isisWebAppCommonContext = IsisWebAppCommonContext.of(metaModelContext);
-
- val menuBarsService = metaModelContext.getServiceRegistry()
- .lookupServiceElseFail(MenuBarsServiceBS3.class);
+ val commonContext = IsisWebAppCommonContext.of(metaModelContext);
+
val bs3MenuBars = menuBarsService.menuBars(Type.DEFAULT);
val menuBar = new MenuBar();
@@ -97,7 +96,7 @@ public class MainView extends VerticalLayout {
add(message);
add(actionResult);
- val menuSectionUiModels = buildMenuModel(isisWebAppCommonContext, bs3MenuBars);
+ val menuSectionUiModels = buildMenuModel(commonContext, bs3MenuBars);
log.warn("menu model:\n ");
menuSectionUiModels.forEach(m -> log.warn("\t{}", m));