Fix transient references

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
kaizimmerm
2016-11-29 10:56:33 +01:00
parent 032230bdcf
commit 5f34cbcd92
31 changed files with 52 additions and 57 deletions

View File

@@ -50,7 +50,7 @@ public class UploadViewConfirmationWindowLayout extends AbstractConfirmationWind
private static final String DISCARD = "Discard";
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
private final ArtifactUploadState artifactUploadState;

View File

@@ -52,9 +52,9 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent {
private final transient EventBus.UIEventBus eventBus;
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
private final EntityFactory entityFactory;
private final transient EntityFactory entityFactory;
private TextField nameTextField;

View File

@@ -45,7 +45,7 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
private final ArtifactUploadState artifactUploadState;
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
private final SwMetadataPopupLayout swMetadataPopupLayout;

View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.ui.artifacts.smtable;
import java.util.List;
import java.util.Map;
import org.eclipse.hawkbit.repository.EntityFactory;
import org.eclipse.hawkbit.repository.SoftwareManagement;
import org.eclipse.hawkbit.repository.SpPermissionChecker;
import org.eclipse.hawkbit.repository.model.SoftwareModule;
@@ -59,7 +58,7 @@ public class SoftwareModuleTable extends AbstractNamedVersionTable<SoftwareModul
private final ArtifactUploadState artifactUploadState;
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
private final UploadViewAcceptCriteria uploadViewAcceptCriteria;
@@ -67,8 +66,8 @@ public class SoftwareModuleTable extends AbstractNamedVersionTable<SoftwareModul
SoftwareModuleTable(final UIEventBus eventBus, final I18N i18n, final UINotification uiNotification,
final ArtifactUploadState artifactUploadState, final SoftwareManagement softwareManagement,
final UploadViewAcceptCriteria uploadViewAcceptCriteria, final EntityFactory entityFactory,
final SpPermissionChecker permChecker, final SwMetadataPopupLayout swMetadataPopupLayout) {
final UploadViewAcceptCriteria uploadViewAcceptCriteria, final SpPermissionChecker permChecker,
final SwMetadataPopupLayout swMetadataPopupLayout) {
super(eventBus, i18n, uiNotification);
this.artifactUploadState = artifactUploadState;
this.softwareManagement = softwareManagement;

View File

@@ -19,7 +19,6 @@ import org.eclipse.hawkbit.ui.common.table.AbstractTableHeader;
import org.eclipse.hawkbit.ui.common.table.BaseEntityEventType;
import org.eclipse.hawkbit.ui.utils.I18N;
import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider;
import org.eclipse.hawkbit.ui.utils.UINotification;
import org.vaadin.spring.events.EventBus.UIEventBus;
import org.vaadin.spring.events.EventScope;
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
@@ -39,8 +38,8 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
private final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow;
SoftwareModuleTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
final ArtifactUploadState artifactUploadState, final UINotification uiNotifcation,
final UIEventBus eventBus, final SoftwareManagement softwareManagement, final EntityFactory entityFactory,
final ArtifactUploadState artifactUploadState, final UIEventBus eventBus,
final SoftwareManagement softwareManagement, final EntityFactory entityFactory,
final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow) {
super(i18n, permChecker, eventbus, null, null, artifactUploadState);
this.softwareModuleAddUpdateWindow = softwareModuleAddUpdateWindow;

View File

@@ -38,10 +38,10 @@ public class SoftwareModuleTableLayout extends AbstractTableLayout {
softwareManagement, entityFactory, permChecker);
super.init(
new SoftwareModuleTableHeader(i18n, permChecker, eventBus, artifactUploadState, uiNotification,
eventBus, softwareManagement, entityFactory, softwareModuleAddUpdateWindow),
new SoftwareModuleTableHeader(i18n, permChecker, eventBus, artifactUploadState, eventBus,
softwareManagement, entityFactory, softwareModuleAddUpdateWindow),
new SoftwareModuleTable(eventBus, i18n, uiNotification, artifactUploadState, softwareManagement,
uploadViewAcceptCriteria, entityFactory, permChecker, swMetadataPopupLayout),
uploadViewAcceptCriteria, permChecker, swMetadataPopupLayout),
new SoftwareModuleDetails(i18n, eventBus, permChecker, softwareModuleAddUpdateWindow,
artifactUploadState, softwareManagement, swMetadataPopupLayout, entityFactory));
}

View File

@@ -52,7 +52,7 @@ public class CreateUpdateSoftwareTypeLayout extends CreateUpdateTypeLayout<Softw
private static final long serialVersionUID = 1L;
private static final Logger LOG = LoggerFactory.getLogger(CreateUpdateSoftwareTypeLayout.class);
private final SoftwareManagement swTypeManagementService;
private final transient SoftwareManagement swTypeManagementService;
private String singleAssignStr;
private String multiAssignStr;

View File

@@ -42,13 +42,13 @@ public class DistributionSetMetadatadetailslayout extends Table {
private static final String VIEW = "view";
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
private final DsMetadataPopupLayout dsMetadataPopupLayout;
private final SpPermissionChecker permissionChecker;
private transient EntityFactory entityFactory;
private final transient EntityFactory entityFactory;
private final I18N i18n;

View File

@@ -43,7 +43,7 @@ public class DistributionTagToken extends AbstractTagToken<DistributionSet> {
private final TagManagement tagManagement;
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
// To Be Done : have to set this value based on view???
private static final Boolean NOTAGS_SELECTED = Boolean.FALSE;

View File

@@ -39,7 +39,7 @@ public class TargetTagToken extends AbstractTargetTagToken<Target> {
// To Be Done : have to set this value based on view???
private static final Boolean NOTAGS_SELECTED = Boolean.FALSE;
private final TargetManagement targetManagement;
private final transient TargetManagement targetManagement;
public TargetTagToken(final SpPermissionChecker checker, final I18N i18n, final UINotification uinotification,
final UIEventBus eventBus, final ManagementUIState managementUIState, final TagManagement tagManagement,

View File

@@ -68,9 +68,9 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout<Distri
private static final String DIST_TYPE_MANDATORY = "mandatory";
private static final String STAR = " * ";
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
private HorizontalLayout distTypeSelectLayout;
private Table sourceTable;

View File

@@ -31,7 +31,7 @@ public class DSTypeFilterButtonClick extends AbstractFilterSingleButtonClick imp
private final ManageDistUIState manageDistUIState;
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
DSTypeFilterButtonClick(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
final DistributionSetManagement distributionSetManagement) {

View File

@@ -88,13 +88,13 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
private final ManageDistUIState manageDistUIState;
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
private final DistributionsViewAcceptCriteria distributionsViewAcceptCriteria;
private final TargetManagement targetManagement;
private final transient TargetManagement targetManagement;
private final DsMetadataPopupLayout dsMetadataPopupLayout;

View File

@@ -31,9 +31,9 @@ public class DsMetadataPopupLayout extends AbstractMetadataPopupLayout<Distribut
private static final long serialVersionUID = -7778944849012048106L;
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
private final EntityFactory entityFactory;
private final transient EntityFactory entityFactory;
public DsMetadataPopupLayout(final I18N i18n, final UINotification uiNotification, final UIEventBus eventBus,
final DistributionSetManagement distributionSetManagement, final EntityFactory entityFactory,

View File

@@ -73,9 +73,9 @@ public class DistributionsConfirmationWindowLayout extends AbstractConfirmationW
private ConfirmationTab assignmnetTab;
private final DistributionSetManagement dsManagement;
private final transient DistributionSetManagement dsManagement;
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
private final ManageDistUIState manageDistUIState;

View File

@@ -31,9 +31,9 @@ public class SwMetadataPopupLayout extends AbstractMetadataPopupLayout<SoftwareM
private static final long serialVersionUID = -1252090014161012563L;
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
private final EntityFactory entityFactory;
private final transient EntityFactory entityFactory;
public SwMetadataPopupLayout(final I18N i18n, final UINotification uiNotification, final UIEventBus eventBus,
final SoftwareManagement softwareManagement, final EntityFactory entityFactory,

View File

@@ -46,7 +46,7 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
private final ManageDistUIState manageDistUIState;
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
private final SwMetadataPopupLayout swMetadataPopupLayout;

View File

@@ -67,7 +67,7 @@ public class SwModuleTable extends AbstractNamedVersionTable<SoftwareModule, Lon
private final ManageDistUIState manageDistUIState;
private final SoftwareManagement softwareManagement;
private final transient SoftwareManagement softwareManagement;
private final DistributionsViewAcceptCriteria distributionsViewAcceptCriteria;

View File

@@ -71,7 +71,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
private final UiProperties uiProperties;
private final EntityFactory entityFactory;
private final transient EntityFactory entityFactory;
private final AutoCompleteTextFieldComponent queryTextField;

View File

@@ -118,9 +118,9 @@ public class DeploymentView extends VerticalLayout implements View, BrowserWindo
final TargetTable targetTable = new TargetTable(eventBus, i18n, uiNotification, targetManagement,
managementUIState, permChecker, managementViewAcceptCriteria);
this.targetTableLayout = new TargetTableLayout(eventbus, targetTable, targetManagement, uiNotification,
entityFactory, i18n, eventBus, uiNotification, managementUIState, managementViewAcceptCriteria,
deploymentManagement, uiproperties, permChecker, uiNotification, tagManagement);
this.targetTableLayout = new TargetTableLayout(eventbus, targetTable, targetManagement, entityFactory, i18n,
eventBus, uiNotification, managementUIState, managementViewAcceptCriteria, deploymentManagement,
uiproperties, permChecker, uiNotification, tagManagement);
this.distributionTagLayout = new DistributionTagLayout(eventbus, managementUIState, i18n, permChecker, eventBus,
tagManagement, entityFactory, uiNotification, distFilterParameters, distributionSetManagement,

View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.ui.management.dstable;
import org.eclipse.hawkbit.repository.DistributionSetManagement;
import org.eclipse.hawkbit.repository.EntityFactory;
import org.eclipse.hawkbit.repository.SpPermissionChecker;
import org.eclipse.hawkbit.repository.SystemManagement;
import org.eclipse.hawkbit.repository.TagManagement;
import org.eclipse.hawkbit.repository.model.DistributionSet;
import org.eclipse.hawkbit.ui.common.DistributionSetIdName;
@@ -46,7 +45,7 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
private final DistributionAddUpdateWindowLayout distributionAddUpdateWindowLayout;
private final DistributionTagToken distributionTagToken;
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
private final DsMetadataPopupLayout dsMetadataPopupLayout;
private final SoftwareModuleDetailsTable softwareModuleTable;
@@ -56,8 +55,7 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
DistributionDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
final ManagementUIState managementUIState, final DistributionSetManagement distributionSetManagement,
final DsMetadataPopupLayout dsMetadataPopupLayout, final EntityFactory entityFactory,
final UINotification notificationMessage, final SystemManagement systemManagement,
final TagManagement tagManagement,
final UINotification notificationMessage, final TagManagement tagManagement,
final DistributionAddUpdateWindowLayout distributionAddUpdateWindowLayout) {
super(i18n, eventBus, permissionChecker, managementUIState);

View File

@@ -82,9 +82,9 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
private final SpPermissionChecker permissionChecker;
private final ManagementUIState managementUIState;
private final ManagementViewAcceptCriteria managementViewAcceptCriteria;
private final TargetManagement targetService;
private final transient TargetManagement targetService;
private final DsMetadataPopupLayout dsMetadataPopupLayout;
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
private final String notAllowedMsg;
private boolean isDistPinned;

View File

@@ -48,7 +48,7 @@ public class DistributionTableLayout extends AbstractTableLayout {
new DistributionTable(eventBus, i18n, permissionChecker, notification, managementUIState,
managementViewAcceptCriteria, targetService, dsMetadataPopupLayout, distributionSetManagement),
new DistributionDetails(i18n, eventBus, permissionChecker, managementUIState, distributionSetManagement,
dsMetadataPopupLayout, entityFactory, notification, systemManagement, tagManagement,
dsMetadataPopupLayout, entityFactory, notification, tagManagement,
distributionAddUpdateWindowLayout));
}

View File

@@ -52,7 +52,7 @@ public class DistributionTagButtons extends AbstractFilterButtons {
private final DistributionTagDropEvent spDistTagDropEvent;
private final ManagementUIState managementUIState;
private final EntityFactory entityFactory;
private final transient EntityFactory entityFactory;
DistributionTagButtons(final UIEventBus eventBus, final ManagementUIState managementUIState,
final EntityFactory entityFactory, final I18N i18n, final UINotification notification,

View File

@@ -40,7 +40,7 @@ import com.vaadin.ui.Label;
public class CountMessageLabel extends Label {
private static final long serialVersionUID = -1533826352473259653L;
private final TargetManagement targetManagement;
private final transient TargetManagement targetManagement;
private final I18N i18n;

View File

@@ -68,11 +68,11 @@ public class ManangementConfirmationWindowLayout extends AbstractConfirmationWin
private final ManagementUIState managementUIState;
private final TargetManagement targetManagement;
private final transient TargetManagement targetManagement;
private final DeploymentManagement deploymentManagement;
private final transient DeploymentManagement deploymentManagement;
private final DistributionSetManagement distributionSetManagement;
private final transient DistributionSetManagement distributionSetManagement;
private final ActionTypeOptionGroupLayout actionTypeOptionGroupLayout;

View File

@@ -172,7 +172,7 @@ public class BulkUploadHandler extends CustomComponent
*
* @param event
*/
private UploadAsync(final SucceededEvent event) {
public UploadAsync(final SucceededEvent event) {
this.event = event;
}

View File

@@ -54,7 +54,7 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
private final UINotification uINotification;
private final EntityFactory entityFactory;
private final transient EntityFactory entityFactory;
private TextField controllerIDTextField;
private TextField nameTextField;

View File

@@ -103,7 +103,7 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> {
private static final long serialVersionUID = -2300392868806614568L;
private static final int PROPERTY_DEPT = 3;
private final TargetManagement targetManagement;
private final transient TargetManagement targetManagement;
private final SpPermissionChecker permChecker;

View File

@@ -38,9 +38,8 @@ public class TargetTableLayout extends AbstractTableLayout {
private final TargetTableHeader targetTableHeader;
public TargetTableLayout(final UIEventBus eventBus, final TargetTable targetTable,
final TargetManagement targetManagement, final UINotification uINotification,
final EntityFactory entityFactory, final I18N i18n, final UIEventBus eventbus,
final UINotification notification, final ManagementUIState managementUIState,
final TargetManagement targetManagement, final EntityFactory entityFactory, final I18N i18n,
final UIEventBus eventbus, final UINotification notification, final ManagementUIState managementUIState,
final ManagementViewAcceptCriteria managementViewAcceptCriteria,
final DeploymentManagement deploymentManagement, final UiProperties uiproperties,
final SpPermissionChecker permissionChecker, final UINotification uinotification,

View File

@@ -69,9 +69,9 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
private final SpPermissionChecker permChecker;
private final EntityFactory entityFactory;
private final transient EntityFactory entityFactory;
private final TargetManagement targetManagement;
private final transient TargetManagement targetManagement;
TargetTagFilterButtons(final UIEventBus eventBus, final ManagementUIState managementUIState,
final ManagementViewAcceptCriteria managementViewAcceptCriteria, final I18N i18n,