From fbc16a42746a60bcad9cacb997429b23ac9ca6aa Mon Sep 17 00:00:00 2001 From: asharani-murugesh Date: Thu, 11 Feb 2016 12:06:44 +0100 Subject: [PATCH 1/2] Signed-off-by: asharani-murugesh --- .../footer/TargetFilterCountMessageLabel.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java index 1c8382223..c3e55f8a0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java @@ -71,12 +71,14 @@ public class TargetFilterCountMessageLabel extends Label { @EventBusListenerMethod(scope = EventScope.SESSION) void onEvent(final CustomFilterUIEvent custFUIEvent) { - if (custFUIEvent == CustomFilterUIEvent.FILTER_TARGET_BY_QUERY - || custFUIEvent == CustomFilterUIEvent.TARGET_DETAILS_VIEW + if (custFUIEvent == CustomFilterUIEvent.TARGET_DETAILS_VIEW || custFUIEvent == CustomFilterUIEvent.CREATE_NEW_FILTER_CLICK || custFUIEvent == CustomFilterUIEvent.EXIT_CREATE_OR_UPDATE_FILTRER_VIEW) { displayTargetFilterMessage(); } + else if (custFUIEvent == CustomFilterUIEvent.FILTER_TARGET_BY_QUERY){ + this.getUI().access(() -> displayTargetFilterMessage()); + } } private void applyStyle() { From e84b5938533be765e9bd2a85a524ce2e79ba3c18 Mon Sep 17 00:00:00 2001 From: asharani-murugesh Date: Thu, 11 Feb 2016 13:26:57 +0100 Subject: [PATCH 2/2] Safely getting access to the UI thread to modify the target count label Signed-off-by: asharani-murugesh --- .../filtermanagement/footer/TargetFilterCountMessageLabel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java index c3e55f8a0..c6bcc879e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/footer/TargetFilterCountMessageLabel.java @@ -29,6 +29,7 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; import com.vaadin.spring.annotation.ViewScope; import com.vaadin.ui.Label; +import com.vaadin.ui.UI; /** * @author Venugopal Boodidadinne(RBEI/BSJ) @@ -74,7 +75,7 @@ public class TargetFilterCountMessageLabel extends Label { if (custFUIEvent == CustomFilterUIEvent.TARGET_DETAILS_VIEW || custFUIEvent == CustomFilterUIEvent.CREATE_NEW_FILTER_CLICK || custFUIEvent == CustomFilterUIEvent.EXIT_CREATE_OR_UPDATE_FILTRER_VIEW) { - displayTargetFilterMessage(); + UI.getCurrent().access(()->displayTargetFilterMessage()); } else if (custFUIEvent == CustomFilterUIEvent.FILTER_TARGET_BY_QUERY){ this.getUI().access(() -> displayTargetFilterMessage());