EventBus transient

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
kaizimmerm
2016-11-29 09:04:06 +01:00
parent 370abc13c7
commit 8fbacd44a2
51 changed files with 77 additions and 87 deletions

View File

@@ -62,7 +62,7 @@ public class UploadArtifactView extends VerticalLayout implements View, BrowserW
public static final String VIEW_NAME = "spUpload";
private static final long serialVersionUID = 8754632011301553682L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final SpPermissionChecker permChecker;

View File

@@ -83,7 +83,7 @@ public class ArtifactDetailsLayout extends VerticalLayout {
private final I18N i18n;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ArtifactUploadState artifactUploadState;

View File

@@ -50,7 +50,7 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent {
private final UINotification uiNotifcation;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final SoftwareManagement softwareManagement;

View File

@@ -27,11 +27,11 @@ public class SMTypeFilterButtonClick extends AbstractFilterSingleButtonClick imp
private static final long serialVersionUID = 3707945900524967887L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ArtifactUploadState artifactUploadState;
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
public SMTypeFilterButtonClick(final UIEventBus eventBus, final ArtifactUploadState artifactUploadState,
final SoftwareManagement softwareManagement) {

View File

@@ -58,11 +58,11 @@ public class UploadHandler implements StreamVariable, Receiver, SucceededListene
private final long maxSize;
private final Upload upload;
private volatile String fileName = null;
private volatile String mimeType = null;
private volatile boolean streamingInterrupted = false;
private volatile boolean uploadInterrupted = false;
private volatile boolean aborted = false;
private volatile String fileName;
private volatile String mimeType;
private volatile boolean streamingInterrupted;
private volatile boolean uploadInterrupted;
private volatile boolean aborted;
private String failureReason;
private final I18N i18n;

View File

@@ -82,7 +82,7 @@ public class UploadLayout extends VerticalLayout {
private final UINotification uiNotification;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ArtifactUploadState artifactUploadState;

View File

@@ -37,11 +37,6 @@ import com.vaadin.ui.themes.ValoTheme;
/**
* Upload status popup.
*
*
*
*
*
*/
public class UploadResultWindow implements Button.ClickListener {
@@ -66,9 +61,8 @@ public class UploadResultWindow implements Button.ClickListener {
private static final String UPLOAD_RESULT = "uploadResult";
private static final String REASON = "reason";
private transient EventBus.UIEventBus eventBus;
private transient EventBus.UIEventBus eventBus;
/**
* Initialize upload status popup.
@@ -81,7 +75,7 @@ public class UploadResultWindow implements Button.ClickListener {
public UploadResultWindow(final List<UploadStatus> uploadResultList, final I18N i18n) {
this.uploadResultList = uploadResultList;
this.i18n = i18n;
eventBus = SpringContextHelper.getBean( EventBus.UIEventBus.class);
eventBus = SpringContextHelper.getBean(EventBus.UIEventBus.class);
createComponents();
createLayout();
}
@@ -190,7 +184,7 @@ public class UploadResultWindow implements Button.ClickListener {
if (event.getComponent().getId().equals(UIComponentIdProvider.UPLOAD_ARTIFACT_RESULT_CLOSE)
|| event.getComponent().getId().equals(UIComponentIdProvider.UPLOAD_ARTIFACT_RESULT_POPUP_CLOSE)) {
uploadResultsWindow.close();
//close upload status popup if open
// close upload status popup if open
eventBus.publish(this, UploadArtifactUIEvent.ARTIFACT_RESULT_POPUP_CLOSED);
}

View File

@@ -55,7 +55,7 @@ import elemental.json.JsonValue;
*/
public class UploadStatusInfoWindow extends Window {
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ArtifactUploadState artifactUploadState;
@@ -75,9 +75,9 @@ public class UploadStatusInfoWindow extends Window {
private final IndexedContainer uploads;
private volatile boolean errorOccured = false;
private volatile boolean errorOccured;
private volatile boolean uploadAborted = false;
private volatile boolean uploadAborted;
private Button minimizeButton;

View File

@@ -41,7 +41,7 @@ public abstract class AbstractAcceptCriteria extends ServerSideCriterion {
protected UINotification uiNotification;
protected EventBus.UIEventBus eventBus;
protected transient EventBus.UIEventBus eventBus;
protected AbstractAcceptCriteria(final UINotification uiNotification, final UIEventBus eventBus) {
this.uiNotification = uiNotification;

View File

@@ -76,7 +76,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
private final UINotification uiNotification;
protected EventBus.UIEventBus eventBus;
protected transient EventBus.UIEventBus eventBus;
private TextField keyTextField;

View File

@@ -46,7 +46,7 @@ public abstract class AbstractConfirmationWindowLayout extends VerticalLayout {
protected I18N i18n;
protected EventBus.UIEventBus eventBus;
protected transient EventBus.UIEventBus eventBus;
protected AbstractConfirmationWindowLayout(final I18N i18n, final UIEventBus eventBus) {
this.i18n = i18n;

View File

@@ -48,7 +48,7 @@ public abstract class AbstractTableDetailsLayout<T extends NamedEntity> extends
private final I18N i18n;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final SpPermissionChecker permissionChecker;

View File

@@ -64,11 +64,11 @@ public class SoftwareModuleDetailsTable extends Table {
private final boolean isUnassignSoftModAllowed;
private final SpPermissionChecker permissionChecker;
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
private final I18N i18n;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ManageDistUIState manageDistUIState;

View File

@@ -43,7 +43,7 @@ public abstract class AbstractFilterButtons extends Table {
protected static final String FILTER_BUTTON_COLUMN = "filterButton";
protected EventBus.UIEventBus eventBus;
protected transient EventBus.UIEventBus eventBus;
protected final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour;

View File

@@ -33,7 +33,7 @@ public abstract class AbstractFilterHeader extends VerticalLayout {
protected SpPermissionChecker permChecker;
protected EventBus.UIEventBus eventBus;
protected transient EventBus.UIEventBus eventBus;
private Label title;

View File

@@ -49,7 +49,7 @@ public abstract class AbstractDeleteActionsLayout extends VerticalLayout impleme
protected SpPermissionChecker permChecker;
protected EventBus.UIEventBus eventBus;
protected transient EventBus.UIEventBus eventBus;
protected UINotification notification;

View File

@@ -28,7 +28,7 @@ public abstract class AbstractGrid extends Grid {
protected final I18N i18n;
protected final EventBus.UIEventBus eventBus;
protected final transient EventBus.UIEventBus eventBus;
protected final SpPermissionChecker permissionChecker;

View File

@@ -58,7 +58,7 @@ public abstract class AbstractTable<E extends NamedEntity, I> extends Table {
protected static final String ACTION_NOT_ALLOWED_MSG = "message.action.not.allowed";
protected EventBus.UIEventBus eventBus;
protected transient EventBus.UIEventBus eventBus;
protected I18N i18n;

View File

@@ -68,7 +68,7 @@ public abstract class AbstractTagToken<T extends BaseEntity> implements Serializ
protected UINotification uinotification;
protected EventBus.UIEventBus eventBus;
protected transient EventBus.UIEventBus eventBus;
protected ManagementUIState managementUIState;

View File

@@ -65,7 +65,7 @@ public class DistributionsView extends VerticalLayout implements View, BrowserWi
private final SpPermissionChecker permChecker;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final I18N i18n;

View File

@@ -27,7 +27,7 @@ public class DSTypeFilterButtonClick extends AbstractFilterSingleButtonClick imp
private static final long serialVersionUID = -584783755917528648L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ManageDistUIState manageDistUIState;

View File

@@ -27,11 +27,11 @@ public class DistSMTypeFilterButtonClick extends AbstractFilterSingleButtonClick
private static final long serialVersionUID = -4166632002904286983L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ManageDistUIState manageDistUIState;
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
public DistSMTypeFilterButtonClick(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
final SoftwareManagement softwareManagement) {

View File

@@ -52,7 +52,7 @@ public class AutoCompleteTextFieldComponent extends HorizontalLayout {
private final FilterManagementUIState filterManagementUIState;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final RsqlValidationOracle rsqlValidationOracle;

View File

@@ -59,11 +59,11 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
private final I18N i18n;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final FilterManagementUIState filterManagementUIState;
private final TargetFilterQueryManagement targetFilterQueryManagement;
private final transient TargetFilterQueryManagement targetFilterQueryManagement;
private final SpPermissionChecker permissionChecker;

View File

@@ -58,7 +58,7 @@ public class CreateOrUpdateFilterTable extends Table {
private LazyQueryContainer container;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private static final int PROPERTY_DEPT = 3;

View File

@@ -52,11 +52,11 @@ public class DistributionSetSelectWindow
private final DistributionSetSelectTable dsTable;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final TargetManagement targetManagement;
private final transient TargetManagement targetManagement;
private final TargetFilterQueryManagement targetFilterQueryManagement;
private final transient TargetFilterQueryManagement targetFilterQueryManagement;
private CommonDialogWindow window;
private CheckBox checkBox;

View File

@@ -62,7 +62,7 @@ public class FilterManagementView extends VerticalLayout implements View {
private final TargetFilterCountMessageLabel targetFilterCountMessageLabel;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
@Autowired
FilterManagementView(final I18N i18n, final UIEventBus eventBus,

View File

@@ -38,7 +38,7 @@ public class TargetFilterHeader extends VerticalLayout {
private static final long serialVersionUID = -7022704971955491673L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final FilterManagementUIState filterManagementUIState;

View File

@@ -60,11 +60,11 @@ public class TargetFilterTable extends Table {
private final UINotification notification;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final FilterManagementUIState filterManagementUIState;
private final TargetFilterQueryManagement targetFilterQueryManagement;
private final transient TargetFilterQueryManagement targetFilterQueryManagement;
private final DistributionSetSelectWindow dsSelectWindow;

View File

@@ -57,7 +57,6 @@ import com.vaadin.ui.components.colorpicker.ColorSelector;
import com.vaadin.ui.themes.ValoTheme;
/**
*
* Abstract class for create/update target tag layout.
*
* @param <E>
@@ -77,7 +76,7 @@ public abstract class AbstractCreateUpdateTagLayout<E extends NamedEntity> exten
protected EntityFactory entityFactory;
protected EventBus.UIEventBus eventBus;
protected transient EventBus.UIEventBus eventBus;
protected SpPermissionChecker permChecker;

View File

@@ -70,7 +70,7 @@ public class DeploymentView extends VerticalLayout implements View, BrowserWindo
public static final String VIEW_NAME = "deployment";
private static final long serialVersionUID = 1847434723456644998L;
private final EventBus.UIEventBus eventbus;
private final transient EventBus.UIEventBus eventbus;
private final SpPermissionChecker permChecker;

View File

@@ -16,7 +16,6 @@ import org.eclipse.hawkbit.ui.management.state.ManagementUIState;
import org.eclipse.hawkbit.ui.utils.I18N;
import org.eclipse.hawkbit.ui.utils.SPUIDefinitions;
import org.eclipse.hawkbit.ui.utils.UINotification;
import org.vaadin.spring.events.EventBus;
import org.vaadin.spring.events.EventBus.UIEventBus;
import org.vaadin.spring.events.EventScope;
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
@@ -34,14 +33,12 @@ public class ActionHistoryComponent extends VerticalLayout {
private final ActionHistoryHeader actionHistoryHeader;
private final ActionHistoryTable actionHistoryTable;
private final EventBus.UIEventBus eventBus;
public ActionHistoryComponent(final I18N i18n, final DeploymentManagement deploymentManagement,
final UIEventBus eventBus, final UINotification notification, final ManagementUIState managementUIState) {
this.actionHistoryHeader = new ActionHistoryHeader(eventBus, managementUIState);
this.actionHistoryTable = new ActionHistoryTable(i18n, deploymentManagement, eventBus, notification,
managementUIState);
this.eventBus = eventBus;
buildLayout();
setSizeFull();
setImmediate(true);

View File

@@ -34,7 +34,7 @@ import com.vaadin.ui.VerticalLayout;
public class ActionHistoryHeader extends VerticalLayout {
private static final long serialVersionUID = -6276188234115774351L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ManagementUIState managementUIState;
private Label titleOfActionHistory;

View File

@@ -75,8 +75,8 @@ public class ActionHistoryTable extends TreeTable {
private static final String STATUS_ICON_GREEN = "statusIconGreen";
private final I18N i18n;
private final DeploymentManagement deploymentManagement;
private final EventBus.UIEventBus eventBus;
private final transient DeploymentManagement deploymentManagement;
private final transient EventBus.UIEventBus eventBus;
private final UINotification notification;
private final ManagementUIState managementUIState;

View File

@@ -60,10 +60,10 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
private final I18N i18n;
private final UINotification notificationMessage;
private final EventBus.UIEventBus eventBus;
private final DistributionSetManagement distributionSetManagement;
private final SystemManagement systemManagement;
private final EntityFactory entityFactory;
private final transient EventBus.UIEventBus eventBus;
private final transient DistributionSetManagement distributionSetManagement;
private final transient SystemManagement systemManagement;
private final transient EntityFactory entityFactory;
private TextField distNameTextField;
private TextField distVersionTextField;

View File

@@ -24,7 +24,7 @@ import com.vaadin.ui.Button;
public class DistributionTagButtonClick extends AbstractFilterMultiButtonClick {
private static final long serialVersionUID = 4120296456125178019L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ManagementUIState managementUIState;
public DistributionTagButtonClick(final UIEventBus eventBus, final ManagementUIState managementUIState) {

View File

@@ -51,9 +51,9 @@ public class DistributionTagDropEvent implements DropHandler {
private final DistributionTableFilters distFilterParameters;
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ManagementViewAcceptCriteria managementViewAcceptCriteria;

View File

@@ -95,7 +95,7 @@ public class BulkUploadHandler extends CustomComponent
private long successfullTargetCount;
private final transient Executor executor;
private transient EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private transient EntityFactory entityFactory;
private final UI uiInstance;

View File

@@ -48,9 +48,9 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
private final I18N i18n;
private final TargetManagement targetManagement;
private final transient TargetManagement targetManagement;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final UINotification uINotification;

View File

@@ -64,15 +64,15 @@ import com.vaadin.ui.themes.ValoTheme;
public class TargetBulkUpdateWindowLayout extends CustomComponent {
private final I18N i18n;
private final TargetManagement targetManagement;
private final transient TargetManagement targetManagement;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final TargetBulkTokenTags targetBulkTokenTags;
private final ManagementUIState managementUIState;
private final DeploymentManagement deploymentManagement;
private final transient DeploymentManagement deploymentManagement;
private final UiProperties uiproperties;

View File

@@ -31,7 +31,7 @@ public class TargetTableLayout extends AbstractTableLayout {
private static final long serialVersionUID = 2248703121998709112L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final TargetDetails targetDetails;

View File

@@ -30,11 +30,11 @@ public class CustomTargetTagFilterButtonClick extends AbstractFilterSingleButton
private static final long serialVersionUID = -6173433602055291533L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ManagementUIState managementUIState;
private final TargetFilterQueryManagement targetFilterQueryManagement;
private final transient TargetFilterQueryManagement targetFilterQueryManagement;
public CustomTargetTagFilterButtonClick(final UIEventBus eventBus, final ManagementUIState managementUIState,
final TargetFilterQueryManagement targetFilterQueryManagement) {

View File

@@ -40,7 +40,7 @@ public class FilterByStatusLayout extends VerticalLayout implements Button.Click
private final I18N i18n;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ManagementUIState managementUIState;

View File

@@ -50,7 +50,7 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange
private final SpPermissionChecker permChecker;
private final ManagementUIState managementUIState;
private final I18N i18n;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private VerticalLayout simpleFilterTab;

View File

@@ -27,7 +27,7 @@ public class TargetTagFilterButtonClick extends AbstractFilterMultiButtonClick i
private static final long serialVersionUID = -6173433602055291533L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final ManagementUIState managementUIState;

View File

@@ -73,7 +73,7 @@ public class DelayedEventBusPushStrategy implements EventPushStrategy, Applicati
private final ScheduledExecutorService executorService;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final UIEventProvider eventProvider;
private ScheduledFuture<?> jobHandle;

View File

@@ -58,7 +58,7 @@ public class RolloutView extends VerticalLayout implements View {
private final RolloutUIState rolloutUIState;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
@Autowired
RolloutView(final SpPermissionChecker permissionChecker, final RolloutUIState rolloutUIState,

View File

@@ -82,19 +82,19 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
private final ActionTypeOptionGroupLayout actionTypeOptionGroupLayout;
private final RolloutManagement rolloutManagement;
private final transient RolloutManagement rolloutManagement;
private final TargetManagement targetManagement;
private final transient TargetManagement targetManagement;
private final UINotification uiNotification;
private final UiProperties uiProperties;
private final EntityFactory entityFactory;
private final transient EntityFactory entityFactory;
private final I18N i18n;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private TextField rolloutName;

View File

@@ -36,7 +36,7 @@ import com.vaadin.ui.Window;
public class RolloutListHeader extends AbstractGridHeader {
private static final long serialVersionUID = 2365400733081333174L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private final AddUpdateRolloutWindowLayout addUpdateRolloutWindow;

View File

@@ -34,7 +34,7 @@ public class RolloutGroupsListHeader extends AbstractGridHeader {
private static final long serialVersionUID = 5077741997839715209L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private Label headerCaption;

View File

@@ -35,7 +35,7 @@ public class RolloutGroupTargetsListHeader extends AbstractGridHeader {
private static final long serialVersionUID = 5613986489156507581L;
private final EventBus.UIEventBus eventBus;
private final transient EventBus.UIEventBus eventBus;
private Button rolloutsGroupViewLink;
private Label headerCaption;