From 4d8df60d20eb7c584b8f13eba66a88dfee0fef42 Mon Sep 17 00:00:00 2001 From: Michael Herdt Date: Mon, 22 Feb 2021 08:50:45 +0100 Subject: [PATCH 1/3] Adjust UI initialization to new changes to use the UiErrorDelegater. Signed-off-by: Michael Herdt --- .../main/java/org/eclipse/hawkbit/app/MyUI.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.java b/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.java index 8e4b1b7..6185945 100644 --- a/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.java +++ b/hawkbit-custom-theme-example/src/main/java/org/eclipse/hawkbit/app/MyUI.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; @@ -28,6 +29,8 @@ import com.vaadin.spring.annotation.SpringUI; import com.vaadin.spring.navigator.SpringViewProvider; +import java.util.List; + /** * Example hawkBit UI implementation. * @@ -46,11 +49,12 @@ public class MyUI extends AbstractHawkbitUI { private static final long serialVersionUID = 1L; @Autowired - MyUI(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); + MyUI(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 308bfc216894fa11f13f106a223b362b977d1300 Mon Sep 17 00:00:00 2001 From: Michael Herdt Date: Mon, 22 Feb 2021 14:53:50 +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 ab2bd4c..a59d62a 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ - 0.3.0M7 + 0.3.0-SNAPSHOT 10.1.0 From ce284527f56e3970f96b3bc0804c2cfda5499b93 Mon Sep 17 00:00:00 2001 From: Michael Herdt Date: Wed, 3 Mar 2021 15:12:30 +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 a59d62a..ab2bd4c 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ - 0.3.0-SNAPSHOT + 0.3.0M7 10.1.0