From 01bab2984d3b1810a37984b409de9335fe96d5e7 Mon Sep 17 00:00:00 2001 From: kaizimmerm Date: Wed, 23 Nov 2016 22:47:06 +0100 Subject: [PATCH] Switch to Ui Scope Signed-off-by: kaizimmerm --- .../org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java | 4 ++-- .../hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java | 4 ++-- .../hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java | 4 ++-- .../hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java | 4 ++-- .../artifacts/footer/UploadViewConfirmationWindowLayout.java | 4 ++-- .../ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java | 4 ++-- .../hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java | 4 ++-- .../hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java | 4 ++-- .../ui/artifacts/smtable/SoftwareModuleTableHeader.java | 4 ++-- .../ui/artifacts/smtable/SoftwareModuleTableLayout.java | 4 ++-- .../ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java | 4 ++-- .../hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java | 4 ++-- .../hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java | 4 ++-- .../hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java | 4 ++-- .../hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java | 4 ++-- .../eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java | 4 ++-- .../hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java | 4 ++-- .../detailslayout/DistributionSetMetadatadetailslayout.java | 4 ++-- .../detailslayout/SoftwareModuleMetadatadetailslayout.java | 4 ++-- .../hawkbit/ui/common/tagdetails/DistributionTagToken.java | 4 ++-- .../eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java | 4 ++-- .../eclipse/hawkbit/ui/distributions/DistributionsView.java | 4 ++-- .../disttype/CreateUpdateDistSetTypeLayout.java | 4 ++-- .../ui/distributions/disttype/DSTypeFilterButtonClick.java | 4 ++-- .../ui/distributions/disttype/DSTypeFilterButtons.java | 4 ++-- .../ui/distributions/disttype/DSTypeFilterHeader.java | 4 ++-- .../ui/distributions/disttype/DSTypeFilterLayout.java | 4 ++-- .../ui/distributions/dstable/DistributionSetDetails.java | 4 ++-- .../ui/distributions/dstable/DistributionSetTable.java | 4 ++-- .../ui/distributions/dstable/DistributionSetTableHeader.java | 4 ++-- .../ui/distributions/dstable/DistributionSetTableLayout.java | 4 ++-- .../ui/distributions/dstable/DsMetadataPopupLayout.java | 4 ++-- .../distributions/event/DistributionsViewAcceptCriteria.java | 4 ++-- .../ui/distributions/footer/DSDeleteActionsLayout.java | 4 ++-- .../footer/DistributionsConfirmationWindowLayout.java | 4 ++-- .../ui/distributions/smtable/SwMetadataPopupLayout.java | 4 ++-- .../hawkbit/ui/distributions/smtable/SwModuleDetails.java | 4 ++-- .../hawkbit/ui/distributions/smtable/SwModuleTable.java | 4 ++-- .../ui/distributions/smtable/SwModuleTableHeader.java | 4 ++-- .../ui/distributions/smtable/SwModuleTableLayout.java | 4 ++-- .../ui/distributions/smtype/DistSMTypeFilterButtonClick.java | 4 ++-- .../ui/distributions/smtype/DistSMTypeFilterButtons.java | 4 ++-- .../ui/distributions/smtype/DistSMTypeFilterHeader.java | 4 ++-- .../ui/distributions/smtype/DistSMTypeFilterLayout.java | 4 ++-- .../ui/filtermanagement/AutoCompleteTextFieldComponent.java | 4 ++-- .../ui/filtermanagement/CreateOrUpdateFilterHeader.java | 4 ++-- .../ui/filtermanagement/CreateOrUpdateFilterTable.java | 4 ++-- .../ui/filtermanagement/DistributionSetSelectTable.java | 4 ++-- .../ui/filtermanagement/DistributionSetSelectWindow.java | 4 ++-- .../hawkbit/ui/filtermanagement/FilterManagementView.java | 4 ++-- .../hawkbit/ui/filtermanagement/TargetFilterHeader.java | 4 ++-- .../hawkbit/ui/filtermanagement/TargetFilterTable.java | 5 ++--- .../footer/TargetFilterCountMessageLabel.java | 4 ++-- .../org/eclipse/hawkbit/ui/management/DeploymentView.java | 4 ++-- .../ui/management/actionhistory/ActionHistoryComponent.java | 4 ++-- .../ui/management/actionhistory/ActionHistoryHeader.java | 4 ++-- .../ui/management/actionhistory/ActionHistoryTable.java | 4 ++-- .../dstable/DistributionAddUpdateWindowLayout.java | 4 ++-- .../hawkbit/ui/management/dstable/DistributionDetails.java | 4 ++-- .../hawkbit/ui/management/dstable/DistributionTable.java | 4 ++-- .../ui/management/dstable/DistributionTableHeader.java | 4 ++-- .../ui/management/dstable/DistributionTableLayout.java | 4 ++-- .../dstag/CreateUpdateDistributionTagLayoutWindow.java | 4 ++-- .../ui/management/dstag/DistributionTagButtonClick.java | 4 ++-- .../hawkbit/ui/management/dstag/DistributionTagButtons.java | 4 ++-- .../hawkbit/ui/management/dstag/DistributionTagHeader.java | 4 ++-- .../hawkbit/ui/management/dstag/DistributionTagLayout.java | 4 ++-- .../ui/management/event/DistributionTagDropEvent.java | 4 ++-- .../ui/management/event/ManagementViewAcceptCriteria.java | 4 ++-- .../ui/management/footer/ActionTypeOptionGroupLayout.java | 4 ++-- .../hawkbit/ui/management/footer/CountMessageLabel.java | 4 ++-- .../hawkbit/ui/management/footer/DeleteActionsLayout.java | 4 ++-- .../footer/ManangementConfirmationWindowLayout.java | 4 ++-- .../management/targettable/TargetAddUpdateWindowLayout.java | 4 ++-- .../ui/management/targettable/TargetBulkTokenTags.java | 4 ++-- .../management/targettable/TargetBulkUpdateWindowLayout.java | 4 ++-- .../hawkbit/ui/management/targettable/TargetDetails.java | 4 ++-- .../hawkbit/ui/management/targettable/TargetTable.java | 4 ++-- .../hawkbit/ui/management/targettable/TargetTableHeader.java | 4 ++-- .../hawkbit/ui/management/targettable/TargetTableLayout.java | 4 ++-- .../targettag/CreateUpdateTargetTagLayoutWindow.java | 4 ++-- .../targettag/CustomTargetTagFilterButtonClick.java | 4 ++-- .../ui/management/targettag/FilterByStatusLayout.java | 4 ++-- .../ui/management/targettag/MultipleTargetFilter.java | 4 ++-- .../ui/management/targettag/TargetFilterQueryButtons.java | 4 ++-- .../ui/management/targettag/TargetTagFilterButtonClick.java | 4 ++-- .../ui/management/targettag/TargetTagFilterButtons.java | 4 ++-- .../ui/management/targettag/TargetTagFilterHeader.java | 4 ++-- .../ui/management/targettag/TargetTagFilterLayout.java | 4 ++-- .../java/org/eclipse/hawkbit/ui/rollout/RolloutView.java | 4 ++-- .../ui/rollout/rollout/AddUpdateRolloutWindowLayout.java | 4 ++-- .../eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java | 4 ++-- .../hawkbit/ui/rollout/rollout/RolloutListHeader.java | 4 ++-- .../eclipse/hawkbit/ui/rollout/rollout/RolloutListView.java | 4 ++-- .../ui/rollout/rolloutgroup/RolloutGroupListGrid.java | 4 ++-- .../ui/rollout/rolloutgroup/RolloutGroupsListHeader.java | 4 ++-- .../ui/rollout/rolloutgroup/RolloutGroupsListView.java | 4 ++-- .../RolloutGroupTargetsCountLabelMessage.java | 4 ++-- .../rolloutgrouptargets/RolloutGroupTargetsListGrid.java | 4 ++-- .../rolloutgrouptargets/RolloutGroupTargetsListHeader.java | 4 ++-- .../rolloutgrouptargets/RolloutGroupTargetsListView.java | 4 ++-- .../tenantconfiguration/AuthenticationConfigurationView.java | 4 ++-- .../DefaultDistributionSetTypeLayout.java | 4 ++-- .../ui/tenantconfiguration/PollingConfigurationView.java | 4 ++-- .../TenantConfigurationDashboardView.java | 4 ++-- .../AnonymousDownloadAuthenticationConfigurationItem.java | 4 ++-- .../CertificateAuthenticationConfigurationItem.java | 4 ++-- .../GatewaySecurityTokenAuthenticationConfigurationItem.java | 4 ++-- .../TargetSecurityTokenAuthenticationConfigurationItem.java | 4 ++-- .../java/org/eclipse/hawkbit/ui/utils/UINotification.java | 4 ++-- 110 files changed, 220 insertions(+), 221 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java index ffbb3b7bd..524925882 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java @@ -37,7 +37,7 @@ import com.vaadin.server.Page; import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.server.Page.BrowserWindowResizeListener; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.GridLayout; @@ -51,7 +51,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringView(name = UploadArtifactView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class UploadArtifactView extends VerticalLayout implements View, BrowserWindowResizeListener { public static final String VIEW_NAME = "spUpload"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java index f9713ef2e..f0dd3cc1a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsLayout.java @@ -51,7 +51,7 @@ import com.vaadin.data.Container; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; @@ -70,7 +70,7 @@ import com.vaadin.ui.themes.ValoTheme; */ @SpringComponent -@ViewScope +@UIScope public class ArtifactDetailsLayout extends VerticalLayout { private static final long serialVersionUID = -5189069028037133891L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java index 2fabb3bb9..1dba95d15 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadViewAcceptCriteria.java @@ -17,7 +17,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.google.common.collect.Maps; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; /** @@ -25,7 +25,7 @@ import com.vaadin.ui.Component; * */ @SpringComponent -@ViewScope +@UIScope public class UploadViewAcceptCriteria extends AbstractAcceptCriteria { private static final long serialVersionUID = 5158811326115667378L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java index 3caea342b..42eb6088b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/SMDeleteActionsLayout.java @@ -25,7 +25,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.Table; import com.vaadin.ui.Table.TableTransferable; @@ -36,7 +36,7 @@ import com.vaadin.ui.UI; * */ @SpringComponent -@ViewScope +@UIScope public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout { private static final long serialVersionUID = -3273982053389866299L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java index 3d875e450..ec4df46ae 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java @@ -31,7 +31,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Table.Align; @@ -43,7 +43,7 @@ import com.vaadin.ui.Table.Align; * */ @SpringComponent -@ViewScope +@UIScope public class UploadViewConfirmationWindowLayout extends AbstractConfirmationWindowLayout { private static final long serialVersionUID = 1804036019105286988L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java index 6d615ead4..8ec87254f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java @@ -34,7 +34,7 @@ import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.ComboBox; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.FormLayout; @@ -47,7 +47,7 @@ import com.vaadin.ui.themes.ValoTheme; * Generates window for Software module add or update. */ @SpringComponent -@ViewScope +@UIScope public class SoftwareModuleAddUpdateWindow extends CustomComponent { private static final long serialVersionUID = -5217675246477211483L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java index 6dd0b8983..61009037d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; @@ -40,7 +40,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDetailsLayout { private static final long serialVersionUID = -4900381301076646366L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java index 13f3addf5..999e3bc2f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java @@ -43,7 +43,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Table; import com.vaadin.ui.UI; @@ -51,7 +51,7 @@ import com.vaadin.ui.UI; /** * Header of Software module table. */ -@ViewScope +@UIScope @SpringComponent public class SoftwareModuleTable extends AbstractNamedVersionTable { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java index 223a0e3fc..b49282b93 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java @@ -21,7 +21,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DropHandler; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -33,7 +33,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class SoftwareModuleTableHeader extends AbstractTableHeader { private static final long serialVersionUID = 242961845006626297L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java index 421fbc89c..cde264ea9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableLayout.java @@ -14,13 +14,13 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software module table layout. (Upload Management) */ @SpringComponent -@ViewScope +@UIScope public class SoftwareModuleTableLayout extends AbstractTableLayout { private static final long serialVersionUID = 6464291374980641235L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java index f45b785b5..0c24f5e63 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java @@ -33,7 +33,7 @@ import org.vaadin.addons.lazyquerycontainer.BeanQueryFactory; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.TextField; @@ -45,7 +45,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class CreateUpdateSoftwareTypeLayout extends CreateUpdateTypeLayout { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java index 4a4006c2a..0184f5d86 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; /** @@ -29,7 +29,7 @@ import com.vaadin.ui.Button; * */ @SpringComponent -@ViewScope +@UIScope public class SMTypeFilterButtonClick extends AbstractFilterSingleButtonClick implements Serializable { private static final long serialVersionUID = 3707945900524967887L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java index ce494fb69..b66a023b4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java @@ -29,14 +29,14 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software module type filter buttons. * */ @SpringComponent -@ViewScope +@UIScope public class SMTypeFilterButtons extends AbstractFilterButtons { private static final long serialVersionUID = 169198312654380358L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java index cb7dfba33..d040e4a15 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java @@ -19,7 +19,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -28,7 +28,7 @@ import com.vaadin.ui.Window; * Software module type filter buttons header. */ @SpringComponent -@ViewScope +@UIScope public class SMTypeFilterHeader extends AbstractFilterHeader { private static final long serialVersionUID = -4855810338059032342L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java index 6bd57d945..e03cb16ad 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterLayout.java @@ -20,7 +20,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software module type filter buttons layout. @@ -29,7 +29,7 @@ import com.vaadin.spring.annotation.ViewScope; * */ @SpringComponent -@ViewScope +@UIScope public class SMTypeFilterLayout extends AbstractFilterLayout { private static final long serialVersionUID = 1581066345157393665L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java index 2808d0619..f5a813228 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java @@ -59,7 +59,7 @@ import com.vaadin.server.Page; import com.vaadin.server.StreamVariable; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.DragAndDropWrapper; @@ -74,7 +74,7 @@ import com.vaadin.ui.VerticalLayout; /** * Upload files layout. */ -@ViewScope +@UIScope @SpringComponent public class UploadLayout extends VerticalLayout { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java index 31ff2b589..06e0ba2c1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java @@ -39,7 +39,7 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.window.WindowMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Grid; @@ -58,7 +58,7 @@ import elemental.json.JsonValue; /** * Shows upload status during upload. */ -@ViewScope +@UIScope @SpringComponent public class UploadStatusInfoWindow extends Window { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java index b4fd28f3c..cd7085b99 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java @@ -25,7 +25,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Table; @@ -39,7 +39,7 @@ import com.vaadin.ui.themes.ValoTheme; */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetMetadatadetailslayout extends Table { private static final long serialVersionUID = 2913758299611837718L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java index 5ad02876d..49fc1b0a0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java @@ -25,7 +25,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Table; import com.vaadin.ui.UI; @@ -38,7 +38,7 @@ import com.vaadin.ui.themes.ValoTheme; */ @SpringComponent -@ViewScope +@UIScope public class SoftwareModuleMetadatadetailslayout extends Table { private static final long serialVersionUID = 2913758299611838818L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java index 50153a27d..4f0c17529 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java @@ -29,14 +29,14 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.google.common.collect.Sets; import com.vaadin.data.Item; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Implementation of target/ds tag token layout. * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagToken extends AbstractTagToken { private static final long serialVersionUID = -8022738301736043396L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java index c72c3ff1b..bce5bf1f9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java @@ -23,7 +23,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Implementation of Target tag token. @@ -31,7 +31,7 @@ import com.vaadin.spring.annotation.ViewScope; * */ @SpringComponent -@ViewScope +@UIScope public class TargetTagToken extends AbstractTargetTagToken { private static final long serialVersionUID = 7124887018280196721L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java index ab41bc579..147ccc555 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java @@ -37,7 +37,7 @@ import com.vaadin.server.Page; import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.server.Page.BrowserWindowResizeListener; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI; @@ -50,7 +50,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringView(name = DistributionsView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class DistributionsView extends VerticalLayout implements View, BrowserWindowResizeListener { public static final String VIEW_NAME = "distributions"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java index dbeda7f17..0b5a9ed67 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java @@ -42,7 +42,7 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.AbstractSelect.ItemDescriptionGenerator; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -58,7 +58,7 @@ import com.vaadin.ui.themes.ValoTheme; * Window for create update Distribution Set Type. */ @SpringComponent -@ViewScope +@UIScope public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java index 7284b1a9a..4a538dbec 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; /** @@ -30,7 +30,7 @@ import com.vaadin.ui.Button; */ @SpringComponent -@ViewScope +@UIScope public class DSTypeFilterButtonClick extends AbstractFilterSingleButtonClick implements Serializable { private static final long serialVersionUID = -584783755917528648L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java index 02caa4ba2..c585496c1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java @@ -27,13 +27,13 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Distribution Set Type filter buttons. */ @SpringComponent -@ViewScope +@UIScope public class DSTypeFilterButtons extends AbstractFilterButtons { private static final long serialVersionUID = 771251569981876005L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java index 5e19657d2..c09c1a9cd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java @@ -19,7 +19,7 @@ import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; @@ -27,7 +27,7 @@ import com.vaadin.ui.UI; * Distribution Set Type filter buttons header. */ @SpringComponent -@ViewScope +@UIScope public class DSTypeFilterHeader extends AbstractFilterHeader { private static final long serialVersionUID = 3433417459392880222L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterLayout.java index ff7ba5ab7..fdb2c6f0a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterLayout.java @@ -20,7 +20,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Distribution Set Type filter buttons layout. @@ -30,7 +30,7 @@ import com.vaadin.spring.annotation.ViewScope; */ @SpringComponent -@ViewScope +@UIScope public class DSTypeFilterLayout extends AbstractFilterLayout { private static final long serialVersionUID = 2689002932344750781L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java index fa5008523..22521c27d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java @@ -43,7 +43,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.data.Item; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -60,7 +60,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDetailsLayout { private static final long serialVersionUID = -4595004466943546669L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java index 51bc1caf4..e9ea42a0a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java @@ -66,7 +66,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.Table; @@ -76,7 +76,7 @@ import com.vaadin.ui.UI; * Distribution set table. */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetTable extends AbstractNamedVersionTable { private static final long serialVersionUID = -7731776093470487988L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java index 12749bc09..549be4eb7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java @@ -23,7 +23,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DropHandler; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -32,7 +32,7 @@ import com.vaadin.ui.Window; * Distribution table header. */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetTableHeader extends AbstractTableHeader { private static final long serialVersionUID = -3483238438474530748L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java index e15189f6a..2aea99210 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableLayout.java @@ -14,13 +14,13 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * DistributionSet table layout */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetTableLayout extends AbstractTableLayout { private static final long serialVersionUID = 6464291374980641235L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java index 26a1bc8b0..396076ce6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetadataPopupLayout.java @@ -22,13 +22,13 @@ import org.springframework.beans.factory.annotation.Autowired; import com.google.common.collect.Lists; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Pop up layout to display distribution metadata. */ @SpringComponent -@ViewScope +@UIScope public class DsMetadataPopupLayout extends AbstractMetadataPopupLayout { private static final long serialVersionUID = -7778944849012048106L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionsViewAcceptCriteria.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionsViewAcceptCriteria.java index 10782dbf3..f7831c85b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionsViewAcceptCriteria.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/event/DistributionsViewAcceptCriteria.java @@ -18,7 +18,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.google.common.collect.Maps; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; /** @@ -26,7 +26,7 @@ import com.vaadin.ui.Component; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionsViewAcceptCriteria extends AbstractAcceptCriteria { private static final long serialVersionUID = -7686564967583118935L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DSDeleteActionsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DSDeleteActionsLayout.java index 2bdaf7341..e1566e73b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DSDeleteActionsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DSDeleteActionsLayout.java @@ -36,7 +36,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.Table; import com.vaadin.ui.Table.TableTransferable; @@ -49,7 +49,7 @@ import com.vaadin.ui.UI; * */ @org.springframework.stereotype.Component -@ViewScope +@UIScope public class DSDeleteActionsLayout extends AbstractDeleteActionsLayout { private static final long serialVersionUID = 3494052985006132714L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java index e56a91db2..86e8a6af8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java @@ -39,7 +39,7 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Table.Align; @@ -52,7 +52,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @org.springframework.stereotype.Component -@ViewScope +@UIScope public class DistributionsConfirmationWindowLayout extends AbstractConfirmationWindowLayout { private static final long serialVersionUID = 3641621131320823058L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java index cee06b822..a8eae2252 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwMetadataPopupLayout.java @@ -23,13 +23,13 @@ import org.eclipse.hawkbit.ui.distributions.event.MetadataEvent.MetadataUIEvent; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Pop up layout to display software module metadata. */ @SpringComponent -@ViewScope +@UIScope public class SwMetadataPopupLayout extends AbstractMetadataPopupLayout { private static final long serialVersionUID = -1252090014161012563L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java index 221d57a6a..9afd488c8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; @@ -39,7 +39,7 @@ import com.vaadin.ui.Window; * details style . */ @SpringComponent -@ViewScope +@UIScope public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLayout { private static final long serialVersionUID = -1052279281066089812L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java index e8504e7a4..1a4fb2cba 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java @@ -48,7 +48,7 @@ import com.vaadin.server.FontAwesome; import com.vaadin.server.Page; import com.vaadin.shared.ui.window.WindowMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.JavaScript; @@ -61,7 +61,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class SwModuleTable extends AbstractNamedVersionTable { private static final long serialVersionUID = 6785314784507424750L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java index 732dc94c0..0b45e30a3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java @@ -22,7 +22,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DropHandler; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -32,7 +32,7 @@ import com.vaadin.ui.Window; * style . */ @SpringComponent -@ViewScope +@UIScope public class SwModuleTableHeader extends AbstractTableHeader { private static final long serialVersionUID = 242961845006626297L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableLayout.java index 9d298207a..061d14078 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableLayout.java @@ -14,13 +14,13 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Implementation of software module Layout */ @SpringComponent -@ViewScope +@UIScope public class SwModuleTableLayout extends AbstractTableLayout { private static final long serialVersionUID = 6464291374980641235L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java index 6f29ed661..a12374da7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; /** @@ -30,7 +30,7 @@ import com.vaadin.ui.Button; */ @SpringComponent -@ViewScope +@UIScope public class DistSMTypeFilterButtonClick extends AbstractFilterSingleButtonClick implements Serializable { private static final long serialVersionUID = -4166632002904286983L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java index 378080692..e8a0679e3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java @@ -34,12 +34,12 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software Module Type filter buttons. */ -@ViewScope +@UIScope @SpringComponent public class DistSMTypeFilterButtons extends AbstractFilterButtons { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java index c09931ef4..08d7d1c38 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java @@ -20,7 +20,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -29,7 +29,7 @@ import com.vaadin.ui.Window; * Software Module Type filter buttons header. */ @SpringComponent -@ViewScope +@UIScope public class DistSMTypeFilterHeader extends AbstractFilterHeader { private static final long serialVersionUID = -8763788280848718344L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterLayout.java index 04c42f3b7..23368e2cd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterLayout.java @@ -20,7 +20,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software Module Type filter layout. @@ -30,7 +30,7 @@ import com.vaadin.spring.annotation.ViewScope; */ @SpringComponent -@ViewScope +@UIScope public class DistSMTypeFilterLayout extends AbstractFilterLayout { private static final long serialVersionUID = 3042297420534417538L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java index 66afc502e..3e52d36dd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java @@ -31,7 +31,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.AbstractTextField.TextChangeEventMode; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; @@ -44,7 +44,7 @@ import com.vaadin.ui.UI; * suggestions in a suggestion-pop-up window while typing. */ @SpringComponent -@ViewScope +@UIScope public class AutoCompleteTextFieldComponent extends HorizontalLayout { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java index 97a1ff046..fa04355b3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java @@ -41,7 +41,7 @@ import com.vaadin.event.FieldEvents.TextChangeEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -57,7 +57,7 @@ import com.vaadin.ui.themes.ValoTheme; * A Vaadin layout for create or update the target filter. */ @SpringComponent -@ViewScope +@UIScope public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button.ClickListener { private static final long serialVersionUID = 7474232427119031474L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java index e009989cb..5a4861496 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java @@ -41,7 +41,7 @@ import com.vaadin.data.Item; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Table; @@ -53,7 +53,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class CreateOrUpdateFilterTable extends Table { private static final long serialVersionUID = 6887304217281629713L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java index efa591579..c3cf991b3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java @@ -35,7 +35,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.data.Container; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Table; import com.vaadin.ui.themes.ValoTheme; @@ -43,7 +43,7 @@ import com.vaadin.ui.themes.ValoTheme; * Table for selecting a distribution set. */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetSelectTable extends Table { private static final long serialVersionUID = -4307487829435471759L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java index 9ba409938..cc48cf7af 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java @@ -31,7 +31,7 @@ import com.vaadin.data.Property; import com.vaadin.server.FontAwesome; import com.vaadin.server.Sizeable; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; @@ -46,7 +46,7 @@ import com.vaadin.ui.Window; * query. */ @SpringComponent -@ViewScope +@UIScope public class DistributionSetSelectWindow implements CommonDialogWindow.SaveDialogCloseListener, Property.ValueChangeListener { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java index 88f7c003d..6348b89ad 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java @@ -23,7 +23,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.UI; @@ -36,7 +36,7 @@ import com.vaadin.ui.VerticalLayout; */ @SpringView(name = FilterManagementView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class FilterManagementView extends VerticalLayout implements View { private static final long serialVersionUID = 8751545414237389386L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterHeader.java index 5b3320d00..0dc5a1301 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterHeader.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventBus; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; @@ -39,7 +39,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringComponent -@ViewScope +@UIScope public class TargetFilterHeader extends VerticalLayout { private static final long serialVersionUID = -7022704971955491673L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java index 8dc037449..74649f5bd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTable.java @@ -16,7 +16,6 @@ import java.util.Map; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import org.eclipse.hawkbit.repository.DistributionSetManagement; import org.eclipse.hawkbit.repository.TargetFilterQueryManagement; import org.eclipse.hawkbit.repository.model.TargetFilterQuery; import org.eclipse.hawkbit.ui.common.ConfirmationDialog; @@ -44,7 +43,7 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Link; @@ -57,7 +56,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class TargetFilterTable extends Table { private static final long serialVersionUID = -4307487829435474759L; 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 88e6cb0fb..7f195233b 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 @@ -26,7 +26,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; import com.vaadin.ui.UI; @@ -37,7 +37,7 @@ import com.vaadin.ui.UI; * on pinning. */ @SpringComponent -@ViewScope +@UIScope public class TargetFilterCountMessageLabel extends Label { private static final long serialVersionUID = -7188528790042766877L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java index e260a3bf4..f55a7dbf6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java @@ -39,7 +39,7 @@ import com.vaadin.server.Page; import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.server.Page.BrowserWindowResizeListener; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.UI; @@ -50,7 +50,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringView(name = DeploymentView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class DeploymentView extends VerticalLayout implements View, BrowserWindowResizeListener { public static final String VIEW_NAME = "deployment"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryComponent.java index 25448fbe1..21a4a531d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryComponent.java @@ -21,7 +21,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; @@ -31,7 +31,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringComponent -@ViewScope +@UIScope public class ActionHistoryComponent extends VerticalLayout { private static final long serialVersionUID = -3766179797384539821L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java index 22551f28c..ee9748ce5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java @@ -25,7 +25,7 @@ import org.vaadin.spring.events.EventBus; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -36,7 +36,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringComponent -@ViewScope +@UIScope public class ActionHistoryHeader extends VerticalLayout { private static final long serialVersionUID = -6276188234115774351L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java index 5ae0fcb8d..300beaea9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java @@ -56,7 +56,7 @@ import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; @@ -72,7 +72,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class ActionHistoryTable extends TreeTable { private static final long serialVersionUID = -1631514704696786653L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java index b7ddcf773..b172ef617 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java @@ -46,7 +46,7 @@ import org.vaadin.spring.events.EventBus; import com.google.common.collect.Sets; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.CheckBox; import com.vaadin.ui.ComboBox; import com.vaadin.ui.CustomComponent; @@ -59,7 +59,7 @@ import com.vaadin.ui.themes.ValoTheme; * WindowContent for adding/editing a Distribution */ @SpringComponent -@ViewScope +@UIScope public class DistributionAddUpdateWindowLayout extends CustomComponent { private static final long serialVersionUID = -5602182034230568435L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java index b838881a9..5d844736b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; @@ -38,7 +38,7 @@ import com.vaadin.ui.Window; * Distribution set details layout. */ @SpringComponent -@ViewScope +@UIScope public class DistributionDetails extends AbstractNamedVersionedEntityTableDetailsLayout { private static final long serialVersionUID = 350360207334118826L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java index a8d207a4c..7c3190d97 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java @@ -65,7 +65,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.DragAndDropWrapper; @@ -77,7 +77,7 @@ import com.vaadin.ui.UI; * Distribution set table. */ @SpringComponent -@ViewScope +@UIScope public class DistributionTable extends AbstractNamedVersionTable { private static final long serialVersionUID = -1928335256399519494L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java index d4f56b5c6..b5498ad45 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java @@ -22,7 +22,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DropHandler; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -33,7 +33,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTableHeader extends AbstractTableHeader { private static final long serialVersionUID = 7597766804650170127L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java index 0d9a782a1..85ca66d35 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableLayout.java @@ -14,13 +14,13 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Software module table layout. */ @SpringComponent -@ViewScope +@UIScope public class DistributionTableLayout extends AbstractTableLayout { private static final long serialVersionUID = 6464291374980641235L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java index aa2103ae5..31e1cef1b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java @@ -25,14 +25,14 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.UI; /** * Class for Create/Update Tag Layout of distribution set */ @SpringComponent -@ViewScope +@UIScope public class CreateUpdateDistributionTagLayoutWindow extends AbstractCreateUpdateTagLayout { private static final long serialVersionUID = 444276149954167545L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java index c30f57b06..52b4c3e6c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; /** @@ -24,7 +24,7 @@ import com.vaadin.ui.Button; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagButtonClick extends AbstractFilterMultiButtonClick { /** diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java index 00e701450..a0c4c3175 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java @@ -35,7 +35,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.data.Item; import com.vaadin.event.dd.DropHandler; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.UI; /** @@ -43,7 +43,7 @@ import com.vaadin.ui.UI; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagButtons extends AbstractFilterButtons { private static final String NO_TAG = "NO TAG"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java index 6229ff4ff..c04f3d978 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java @@ -18,7 +18,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.UI; import com.vaadin.ui.Window; @@ -28,7 +28,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagHeader extends AbstractFilterHeader { private static final long serialVersionUID = -1439667766337270066L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagLayout.java index 4a9b90696..b58b32f61 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagLayout.java @@ -20,14 +20,14 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagLayout extends AbstractFilterLayout { /** diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTagDropEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTagDropEvent.java index 4034aa8fd..b12a616d3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTagDropEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/DistributionTagDropEvent.java @@ -31,7 +31,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.Table; @@ -42,7 +42,7 @@ import com.vaadin.ui.Table.TableTransferable; * */ @SpringComponent -@ViewScope +@UIScope public class DistributionTagDropEvent implements DropHandler { private static final long serialVersionUID = 7338133229709850212L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/ManagementViewAcceptCriteria.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/ManagementViewAcceptCriteria.java index 5627291f3..784f31e20 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/ManagementViewAcceptCriteria.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/event/ManagementViewAcceptCriteria.java @@ -18,7 +18,7 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.google.common.collect.Maps; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; /** @@ -28,7 +28,7 @@ import com.vaadin.ui.Component; * */ @SpringComponent -@ViewScope +@UIScope public class ManagementViewAcceptCriteria extends AbstractAcceptCriteria { private static final long serialVersionUID = 1718217664674701006L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ActionTypeOptionGroupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ActionTypeOptionGroupLayout.java index fb5d37557..d3124eaeb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ActionTypeOptionGroupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ActionTypeOptionGroupLayout.java @@ -27,7 +27,7 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.DateField; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -39,7 +39,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class ActionTypeOptionGroupLayout extends HorizontalLayout { private static final long serialVersionUID = -5624576558669213864L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java index 6d5cb8d13..53ac04c88 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/CountMessageLabel.java @@ -36,7 +36,7 @@ import com.google.common.base.Optional; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; /** @@ -46,7 +46,7 @@ import com.vaadin.ui.Label; * */ @SpringComponent -@ViewScope +@UIScope public class CountMessageLabel extends Label { private static final long serialVersionUID = -1533826352473259653L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/DeleteActionsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/DeleteActionsLayout.java index 96bf52a3f..c7e259ebb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/DeleteActionsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/DeleteActionsLayout.java @@ -33,7 +33,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Table; @@ -45,7 +45,7 @@ import com.vaadin.ui.UI; * */ @SpringComponent -@ViewScope +@UIScope public class DeleteActionsLayout extends AbstractDeleteActionsLayout { private static final long serialVersionUID = -8112907467821886253L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java index 4f8b8cfc3..b41877c31 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/footer/ManangementConfirmationWindowLayout.java @@ -43,7 +43,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Table.Align; @@ -54,7 +54,7 @@ import com.vaadin.ui.Table.Align; * */ @SpringComponent -@ViewScope +@UIScope public class ManangementConfirmationWindowLayout extends AbstractConfirmationWindowLayout { private static final long serialVersionUID = 2114943830055679554L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java index 478b7e17f..81cbc8f5c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java @@ -34,7 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.FormLayout; import com.vaadin.ui.TextArea; @@ -45,7 +45,7 @@ import com.vaadin.ui.Window; * Add and Update Target. */ @SpringComponent -@ViewScope +@UIScope public class TargetAddUpdateWindowLayout extends CustomComponent { private static final long serialVersionUID = -6659290471705262389L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java index bbcba62ff..dd159cfe2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java @@ -14,14 +14,14 @@ import org.eclipse.hawkbit.repository.model.TargetTag; import org.eclipse.hawkbit.ui.common.tagdetails.AbstractTargetTagToken; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Target tag layout in bulk upload popup. * */ @SpringComponent -@ViewScope +@UIScope public class TargetBulkTokenTags extends AbstractTargetTagToken { private static final long serialVersionUID = 4159616629565523717L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java index d7272a395..ebc02e376 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java @@ -42,7 +42,7 @@ import com.vaadin.data.Container; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; @@ -64,7 +64,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class TargetBulkUpdateWindowLayout extends CustomComponent { @Autowired diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java index 13608ca90..fb3af6852 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java @@ -29,7 +29,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; @@ -45,7 +45,7 @@ import com.vaadin.ui.themes.ValoTheme; * Target details layout. */ @SpringComponent -@ViewScope +@UIScope public class TargetDetails extends AbstractTableDetailsLayout { private static final long serialVersionUID = 4571732743399605843L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java index 238a9e709..9fc41a2cd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java @@ -84,7 +84,7 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.DragAndDropWrapper; @@ -97,7 +97,7 @@ import com.vaadin.ui.themes.ValoTheme; * Concrete implementation of Target table. */ @SpringComponent -@ViewScope +@UIScope public class TargetTable extends AbstractTable { private static final Logger LOG = LoggerFactory.getLogger(TargetTable.class); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java index 98bbdca30..12a0d8167 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java @@ -38,7 +38,7 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -53,7 +53,7 @@ import com.vaadin.ui.themes.ValoTheme; * Target table header layout. */ @SpringComponent -@ViewScope +@UIScope public class TargetTableHeader extends AbstractTableHeader { private static final long serialVersionUID = -8647521126666320022L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java index 8c3ec3a1a..070d29d0a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableLayout.java @@ -17,13 +17,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Target table layout. */ @SpringComponent -@ViewScope +@UIScope public class TargetTableLayout extends AbstractTableLayout { private static final long serialVersionUID = 2248703121998709112L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayoutWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayoutWindow.java index ddbf4562c..e40549bbf 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayoutWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayoutWindow.java @@ -23,14 +23,14 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * * Class for Create / Update Tag Layout of target */ @SpringComponent -@ViewScope +@UIScope public class CreateUpdateTargetTagLayoutWindow extends AbstractCreateUpdateTagLayout { private static final long serialVersionUID = 2446682350481560235L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CustomTargetTagFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CustomTargetTagFilterButtonClick.java index ac85b928b..a1f315fba 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CustomTargetTagFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CustomTargetTagFilterButtonClick.java @@ -20,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -31,7 +31,7 @@ import com.vaadin.ui.Button.ClickEvent; * */ @SpringComponent -@ViewScope +@UIScope public class CustomTargetTagFilterButtonClick extends AbstractFilterSingleButtonClick implements Serializable { private static final long serialVersionUID = -6173433602055291533L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java index 09d82d360..10705eff6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java @@ -28,7 +28,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -41,7 +41,7 @@ import com.vaadin.ui.VerticalLayout; * */ @SpringComponent -@ViewScope +@UIScope public class FilterByStatusLayout extends VerticalLayout implements Button.ClickListener { private static final long serialVersionUID = -6930348859189929850L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java index 6eac40455..4312ce83b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java @@ -23,7 +23,7 @@ import org.vaadin.spring.events.EventBus; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Accordion; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -41,7 +41,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class MultipleTargetFilter extends Accordion implements SelectedTabChangeListener { private static final long serialVersionUID = -2887693289126893943L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java index f74a29fdc..0c5667630 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java @@ -32,7 +32,7 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.data.Item; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Table; import com.vaadin.ui.themes.ValoTheme; @@ -41,7 +41,7 @@ import com.vaadin.ui.themes.ValoTheme; * Target filter query{#link {@link TargetFilterQuery} buttons layout. */ @SpringComponent -@ViewScope +@UIScope public class TargetFilterQueryButtons extends Table { private static final long serialVersionUID = 9188095103191937850L; protected static final String FILTER_BUTTON_COLUMN = "filterButton"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java index a5a6b4b91..2b134d6ef 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java @@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; /** @@ -30,7 +30,7 @@ import com.vaadin.ui.Button; */ @SpringComponent -@ViewScope +@UIScope public class TargetTagFilterButtonClick extends AbstractFilterMultiButtonClick implements Serializable { private static final long serialVersionUID = -6173433602055291533L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java index ba9b2f8b8..2eee0e553 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java @@ -47,7 +47,7 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.Page; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.Table; @@ -57,7 +57,7 @@ import com.vaadin.ui.UI; * Target Tag filter buttons table. */ @SpringComponent -@ViewScope +@UIScope public class TargetTagFilterButtons extends AbstractFilterButtons { private static final String NO_TAG = "NO TAG"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java index f2bcf5b63..0f3c0d5ee 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java @@ -18,14 +18,14 @@ import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; /** * Target Tag filter by Tag Header. */ @SpringComponent -@ViewScope +@UIScope public class TargetTagFilterHeader extends AbstractFilterHeader { private static final long serialVersionUID = 3046367045669148009L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterLayout.java index 74699729a..be6dd5ab6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterLayout.java @@ -18,7 +18,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Target Tag filter layout. @@ -29,7 +29,7 @@ import com.vaadin.spring.annotation.ViewScope; */ @SpringComponent -@ViewScope +@UIScope public class TargetTagFilterLayout extends AbstractTargetTagFilterLayout { private static final long serialVersionUID = 2153612878428575009L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java index 1d514c545..74b859d55 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java @@ -25,14 +25,14 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.VerticalLayout; /** * Rollout management view. */ @SpringView(name = RolloutView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class RolloutView extends VerticalLayout implements View { private static final long serialVersionUID = -6199789714170913988L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java index 0706feea9..a7b86d834 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java @@ -62,7 +62,7 @@ import com.vaadin.data.validator.IntegerRangeValidator; import com.vaadin.data.validator.NullValidator; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.ComboBox; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; @@ -75,7 +75,7 @@ import com.vaadin.ui.themes.ValoTheme; * Rollout add or update popup layout. */ @SpringComponent -@ViewScope +@UIScope public class AddUpdateRolloutWindowLayout extends GridLayout { private static final long serialVersionUID = 2999293468801479916L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java index 0e870a6e5..6d8d46e19 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java @@ -71,7 +71,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.converter.Converter; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.UI; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; import com.vaadin.ui.renderers.HtmlRenderer; @@ -80,7 +80,7 @@ import com.vaadin.ui.renderers.HtmlRenderer; * Rollout list grid component. */ @SpringComponent -@ViewScope +@UIScope public class RolloutListGrid extends AbstractGrid { private static final long serialVersionUID = 4060904914954370524L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java index 02478fd44..d0b8d5fcd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java @@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.vaadin.spring.events.EventBus; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -34,7 +34,7 @@ import com.vaadin.ui.Window; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutListHeader extends AbstractGridHeader { private static final long serialVersionUID = 2365400733081333174L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListView.java index 84aba0aff..ce2f9befb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListView.java @@ -14,7 +14,7 @@ import org.eclipse.hawkbit.ui.common.grid.AbstractGridLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; /** @@ -23,7 +23,7 @@ import com.vaadin.ui.Label; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutListView extends AbstractGridLayout { private static final long serialVersionUID = -2703552177439393208L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java index aa0a27192..5e197fe99 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java @@ -45,7 +45,7 @@ import com.vaadin.data.Container; import com.vaadin.data.util.converter.Converter; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickListener; import com.vaadin.ui.renderers.HtmlRenderer; @@ -56,7 +56,7 @@ import com.vaadin.ui.renderers.HtmlRenderer; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupListGrid extends AbstractGrid { private static final long serialVersionUID = 4060904914954370524L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java index c5aa3848d..683083b74 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java @@ -25,7 +25,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -37,7 +37,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupsListHeader extends AbstractGridHeader { private static final long serialVersionUID = 5077741997839715209L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListView.java index 7d7561274..42ba2a6e1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListView.java @@ -14,7 +14,7 @@ import org.eclipse.hawkbit.ui.common.grid.AbstractGridLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; /** @@ -22,7 +22,7 @@ import com.vaadin.ui.Label; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupsListView extends AbstractGridLayout { private static final long serialVersionUID = 7252345838154270259L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsCountLabelMessage.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsCountLabelMessage.java index 7f09d8633..87a6ec520 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsCountLabelMessage.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsCountLabelMessage.java @@ -26,14 +26,14 @@ import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.server.FontAwesome; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; /** * Count message label for the targets of the rollout group. */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupTargetsCountLabelMessage extends Label { private static final long serialVersionUID = -3876685878918411453L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java index f80a3337d..0bc28fbb9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java @@ -38,7 +38,7 @@ import com.vaadin.data.Container; import com.vaadin.data.util.converter.Converter; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * @@ -46,7 +46,7 @@ import com.vaadin.spring.annotation.ViewScope; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupTargetsListGrid extends AbstractGrid { private static final long serialVersionUID = -2244756637458984597L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListHeader.java index 62c6142a3..d3c3488e0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListHeader.java @@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventScope; import org.vaadin.spring.events.annotation.EventBusListenerMethod; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; @@ -38,7 +38,7 @@ import com.vaadin.ui.themes.ValoTheme; * */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupTargetsListHeader extends AbstractGridHeader { private static final long serialVersionUID = 5613986489156507581L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListView.java index 672da2f29..173cd5f60 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListView.java @@ -14,14 +14,14 @@ import org.eclipse.hawkbit.ui.common.grid.AbstractGridLayout; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; /** * Rollout Group Targets List View. */ @SpringComponent -@ViewScope +@UIScope public class RolloutGroupTargetsListView extends AbstractGridLayout { private static final long serialVersionUID = 26089134783467012L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java index 55bb526b5..f3e7cdad1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java @@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.CheckBox; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; @@ -34,7 +34,7 @@ import com.vaadin.ui.VerticalLayout; * View to configure the authentication mode. */ @SpringComponent -@ViewScope +@UIScope public class AuthenticationConfigurationView extends BaseConfigurationView implements ConfigurationGroup, ConfigurationItem.ConfigurationItemChangeListener, ValueChangeListener { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java index 8cbdaef65..a1f45f436 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java @@ -23,7 +23,7 @@ import org.springframework.data.domain.Pageable; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.ComboBox; import com.vaadin.ui.HorizontalLayout; @@ -35,7 +35,7 @@ import com.vaadin.ui.VerticalLayout; * Default DistributionSet Panel. */ @SpringComponent -@ViewScope +@UIScope public class DefaultDistributionSetTypeLayout extends BaseConfigurationView implements ConfigurationGroup { private static final long serialVersionUID = 17896542758L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java index 2389a2efa..8874404a0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java @@ -22,7 +22,7 @@ import org.eclipse.hawkbit.ui.utils.I18N; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; @@ -31,7 +31,7 @@ import com.vaadin.ui.VerticalLayout; * View to configure the polling interval and the overdue time. */ @SpringComponent -@ViewScope +@UIScope public class PollingConfigurationView extends BaseConfigurationView implements ConfigurationGroup, ConfigurationItem.ConfigurationItemChangeListener { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java index 696672288..264f3ba2f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java @@ -27,7 +27,7 @@ import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringView; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.CustomComponent; @@ -40,7 +40,7 @@ import com.vaadin.ui.VerticalLayout; * Main UI for the system configuration view. */ @SpringView(name = TenantConfigurationDashboardView.VIEW_NAME, ui = HawkbitUI.class) -@ViewScope +@UIScope public class TenantConfigurationDashboardView extends CustomComponent implements View, ConfigurationItemChangeListener { public static final String VIEW_NAME = "spSystemConfig"; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java index 1180eba64..1faba4cb5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java @@ -15,14 +15,14 @@ import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * This class represents the UI item for the anonymous download by in the * authentication configuration view. */ @SpringComponent -@ViewScope +@UIScope public class AnonymousDownloadAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java index e041f5564..4c07e09ac 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java @@ -17,7 +17,7 @@ import org.eclipse.hawkbit.ui.common.builder.TextFieldBuilder; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.TextField; @@ -28,7 +28,7 @@ import com.vaadin.ui.VerticalLayout; * reverse proxy in the authentication configuration view. */ @SpringComponent -@ViewScope +@UIScope public class CertificateAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java index 300e6186e..33a4c7a17 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java @@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -34,7 +34,7 @@ import com.vaadin.ui.themes.ValoTheme; * the authentication configuration view. */ @SpringComponent -@ViewScope +@UIScope public class GatewaySecurityTokenAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java index 9ca82e7ea..37727a80e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java @@ -15,14 +15,14 @@ import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey; import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * This class represents the UI item for the target security token section in * the authentication configuration view. */ @SpringComponent -@ViewScope +@UIScope public class TargetSecurityTokenAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem { private static final long serialVersionUID = 1L; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java index 8e7c52bc6..51d99a3bd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java @@ -14,12 +14,12 @@ import org.springframework.beans.factory.annotation.Autowired; import com.vaadin.server.FontAwesome; import com.vaadin.spring.annotation.SpringComponent; -import com.vaadin.spring.annotation.ViewScope; +import com.vaadin.spring.annotation.UIScope; /** * Show success and error messages. */ -@ViewScope +@UIScope @SpringComponent public class UINotification implements Serializable {