From f787add12bad1a6bb98b1e2daa2ee4d91f4e7308 Mon Sep 17 00:00:00 2001 From: Michael Herdt Date: Mon, 22 Feb 2021 08:51:30 +0100 Subject: [PATCH 1/3] Adjust UI initialization to new changes to use the UiErrorDelegater. Signed-off-by: Michael Herdt --- .../java/org/eclipse/hawkbit/app/AzureUI.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hawkbit-extended-runtimes/hawkbit-update-server-azure/src/main/java/org/eclipse/hawkbit/app/AzureUI.java b/hawkbit-extended-runtimes/hawkbit-update-server-azure/src/main/java/org/eclipse/hawkbit/app/AzureUI.java index b80637a..effa4c1 100644 --- a/hawkbit-extended-runtimes/hawkbit-update-server-azure/src/main/java/org/eclipse/hawkbit/app/AzureUI.java +++ b/hawkbit-extended-runtimes/hawkbit-update-server-azure/src/main/java/org/eclipse/hawkbit/app/AzureUI.java @@ -11,6 +11,7 @@ import org.eclipse.hawkbit.ui.AbstractHawkbitUI; import org.eclipse.hawkbit.ui.ErrorView; import org.eclipse.hawkbit.ui.UiProperties; +import org.eclipse.hawkbit.ui.components.ConditionalUiErrorHandler; import org.eclipse.hawkbit.ui.components.NotificationUnreadButton; import org.eclipse.hawkbit.ui.menu.DashboardMenu; import org.eclipse.hawkbit.ui.push.EventPushStrategy; @@ -26,6 +27,8 @@ import com.vaadin.spring.annotation.SpringUI; import com.vaadin.spring.navigator.SpringViewProvider; +import java.util.List; + /** * hawkBit UI implementation. */ @@ -35,11 +38,12 @@ public class AzureUI extends AbstractHawkbitUI { private static final long serialVersionUID = 1L; @Autowired - AzureUI(final EventPushStrategy pushStrategy, final UIEventBus eventBus, final UIEventProvider eventProvider, final SpringViewProvider viewProvider, - final ApplicationContext context, final DashboardMenu dashboardMenu, final ErrorView errorview, - final NotificationUnreadButton notificationUnreadButton, final UiProperties uiProperties, - final VaadinMessageSource i18n) { - super(pushStrategy, eventBus, eventProvider, viewProvider, context, dashboardMenu, errorview, notificationUnreadButton, - uiProperties, i18n); + AzureUI(final EventPushStrategy pushStrategy, final UIEventBus eventBus, final UIEventProvider eventProvider, + final SpringViewProvider viewProvider, final ApplicationContext context, final DashboardMenu dashboardMenu, + final ErrorView errorview, final NotificationUnreadButton notificationUnreadButton, + final UiProperties uiProperties, final VaadinMessageSource i18n, + final List uiErrorHandler) { + super(pushStrategy, eventBus, eventProvider, viewProvider, context, dashboardMenu, errorview, + notificationUnreadButton, uiProperties, i18n, uiErrorHandler); } } From 57668b70ed9199db29d4a8b959514f9b1016c8c2 Mon Sep 17 00:00:00 2001 From: Michael Herdt Date: Mon, 22 Feb 2021 14:58:10 +0100 Subject: [PATCH 2/3] Use hawkbit snapshot version Signed-off-by: Michael Herdt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73e460e..9ead678 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ - 0.3.0M7 + 0.3.0-SNAPSHOT 1.11.415 0.77.0-alpha From 1fc3deefc7678e9bea8df5a72b8068a38877c245 Mon Sep 17 00:00:00 2001 From: Michael Herdt Date: Wed, 3 Mar 2021 15:11:07 +0100 Subject: [PATCH 3/3] Switch hawkbit version back. Signed-off-by: Michael Herdt --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ead678..73e460e 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ - 0.3.0-SNAPSHOT + 0.3.0M7 1.11.415 0.77.0-alpha