lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Removed unnecessary scopes

Browse Source 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
kaizimmerm
2016-11-28 17:32:34 +01:00
parent 7a469d8da0
commit 0292addaaa
14 changed files with 37 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java
View File

@@ -44,7 +44,6 @@ 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.UIScope;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.DragAndDropWrapper;
import com.vaadin.ui.GridLayout;
@@ -54,11 +53,8 @@ import com.vaadin.ui.VerticalLayout;
/**
* Display artifacts upload view.
*
*
*/
@SpringView(name = UploadArtifactView.VIEW_NAME, ui = HawkbitUI.class)
@UIScope
public class UploadArtifactView extends VerticalLayout implements View, BrowserWindowResizeListener {
public static final String VIEW_NAME = "spUpload";

24
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java
View File

@@ -24,8 +24,6 @@ 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.UIScope;
import com.vaadin.ui.Button;
import com.vaadin.ui.Label;
import com.vaadin.ui.Table;
@@ -33,13 +31,9 @@ import com.vaadin.ui.UI;
import com.vaadin.ui.themes.ValoTheme;
/**
*
* DistributionSet Metadata details layout.
*
*/
@SpringComponent
@UIScope
public class DistributionSetMetadatadetailslayout extends Table {
private static final long serialVersionUID = 2913758299611837718L;
@@ -48,27 +42,19 @@ public class DistributionSetMetadatadetailslayout extends Table {
private static final String VIEW = "view";
private transient DistributionSetManagement distributionSetManagement;
private final DistributionSetManagement distributionSetManagement;
private DsMetadataPopupLayout dsMetadataPopupLayout;
private final DsMetadataPopupLayout dsMetadataPopupLayout;
private SpPermissionChecker permissionChecker;
private final SpPermissionChecker permissionChecker;
private transient EntityFactory entityFactory;
private I18N i18n;
private final I18N i18n;
private Long selectedDistSetId;
/**
*
* @param i18n
* @param permissionChecker
* @param distributionSetManagement
* @param dsMetadataPopupLayout
* @param entityFactory
*/
public void init(final I18N i18n, final SpPermissionChecker permissionChecker,
public DistributionSetMetadatadetailslayout(final I18N i18n, final SpPermissionChecker permissionChecker,
final DistributionSetManagement distributionSetManagement,
final DsMetadataPopupLayout dsMetadataPopupLayout, final EntityFactory entityFactory) {
this.i18n = i18n;

16
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsTable.java
View File

@@ -61,18 +61,18 @@ public class SoftwareModuleDetailsTable extends Table {
private boolean isTargetAssigned;
private boolean isUnassignSoftModAllowed;
private SpPermissionChecker permissionChecker;
private final boolean isUnassignSoftModAllowed;
private final SpPermissionChecker permissionChecker;
private DistributionSetManagement distributionSetManagement;
private final DistributionSetManagement distributionSetManagement;
private I18N i18n;
private final I18N i18n;
private EventBus.UIEventBus eventBus;
private final EventBus.UIEventBus eventBus;
private ManageDistUIState manageDistUIState;
private final ManageDistUIState manageDistUIState;
private UINotification uiNotification;
private final UINotification uiNotification;
/**
* Initialize software module table- to be displayed in details layout.
@@ -91,7 +91,7 @@ public class SoftwareModuleDetailsTable extends Table {
* @param manageDistUIState
* ManageDistUIState
*/
public void init(final I18N i18n, final boolean isUnassignSoftModAllowed,
public SoftwareModuleDetailsTable(final I18N i18n, final boolean isUnassignSoftModAllowed,
final SpPermissionChecker permissionChecker, final DistributionSetManagement distributionSetManagement,
final EventBus.UIEventBus eventBus, final ManageDistUIState manageDistUIState) {
this.i18n = i18n;

26
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetFilterQueryDetailsTable.java
View File

@@ -18,19 +18,13 @@ import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
import com.vaadin.data.Container;
import com.vaadin.data.Item;
import com.vaadin.data.util.IndexedContainer;
import com.vaadin.spring.annotation.SpringComponent;
import com.vaadin.spring.annotation.VaadinSessionScope;
import com.vaadin.ui.Table;
import com.vaadin.ui.themes.ValoTheme;
/**
*
* DistributionSet TargetFilterQuery table
*
*/
@SpringComponent
@VaadinSessionScope
public class TargetFilterQueryDetailsTable extends Table {
private static final long serialVersionUID = 2913758299611837718L;
@@ -38,13 +32,9 @@ public class TargetFilterQueryDetailsTable extends Table {
private static final String TFQ_NAME = "name";
private static final String TFQ_QUERY = "query";
private I18N i18n;
private final I18N i18n;
/**
*
* @param i18n
*/
public void init(final I18N i18n) {
public TargetFilterQueryDetailsTable(final I18N i18n) {
this.i18n = i18n;
createTable();
}
@@ -52,7 +42,8 @@ public class TargetFilterQueryDetailsTable extends Table {
/**
* Populate software module metadata.
*
* @param distributionSet the selected distribution set
* @param distributionSet
* the selected distribution set
*/
public void populateTableByDistributionSet(final DistributionSet distributionSet) {
removeAllItems();
@@ -60,11 +51,11 @@ public class TargetFilterQueryDetailsTable extends Table {
return;
}
Container dataSource = getContainerDataSource();
List<TargetFilterQuery> filters = distributionSet.getAutoAssignFilters();
final Container dataSource = getContainerDataSource();
final List<TargetFilterQuery> filters = distributionSet.getAutoAssignFilters();
filters.forEach(query -> {
Object itemId = dataSource.addItem();
Item item = dataSource.getItem(itemId);
final Object itemId = dataSource.addItem();
final Item item = dataSource.getItem(itemId);
item.getItemProperty(TFQ_NAME).setValue(query.getName());
item.getItemProperty(TFQ_QUERY).setValue(query.getQuery());
});
@@ -103,5 +94,4 @@ public class TargetFilterQueryDetailsTable extends Table {
setColumnHeader(TFQ_QUERY, i18n.get("header.target.filter.query"));
}
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java
View File

@@ -47,7 +47,6 @@ 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.UIScope;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI;
@@ -57,7 +56,6 @@ import com.vaadin.ui.VerticalLayout;
* Manage distributions and distributions type view.
*/
@SpringView(name = DistributionsView.VIEW_NAME, ui = HawkbitUI.class)
@UIScope
public class DistributionsView extends VerticalLayout implements View, BrowserWindowResizeListener {
public static final String VIEW_NAME = "distributions";

23
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
View File

@@ -81,11 +81,11 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
private final EntityFactory entityFactory;
private SoftwareModuleDetailsTable softwareModuleTable;
private final SoftwareModuleDetailsTable softwareModuleTable;
private DistributionSetMetadatadetailslayout dsMetadataTable;
private final DistributionSetMetadatadetailslayout dsMetadataTable;
private TargetFilterQueryDetailsTable tfqDetailsTable;
private final TargetFilterQueryDetailsTable tfqDetailsTable;
private VerticalLayout tagsLayout;
@@ -110,20 +110,13 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
this.dsMetadataPopupLayout = popupLayout;
this.entityFactory = entityFactory;
init();
}
softwareModuleTable = new SoftwareModuleDetailsTable(i18n, true, permissionChecker, distributionSetManagement,
eventBus, manageDistUIState);
private void init() {
softwareModuleTable = new SoftwareModuleDetailsTable();
softwareModuleTable.init(getI18n(), true, getPermissionChecker(), distributionSetManagement, getEventBus(),
manageDistUIState);
dsMetadataTable = new DistributionSetMetadatadetailslayout(i18n, permissionChecker, distributionSetManagement,
dsMetadataPopupLayout, entityFactory);
dsMetadataTable = new DistributionSetMetadatadetailslayout();
dsMetadataTable.init(getI18n(), getPermissionChecker(), distributionSetManagement, dsMetadataPopupLayout,
entityFactory);
tfqDetailsTable = new TargetFilterQueryDetailsTable();
tfqDetailsTable.init(getI18n());
tfqDetailsTable = new TargetFilterQueryDetailsTable(i18n);
addTabs(detailsTab);
restoreState();
}

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
View File

@@ -27,8 +27,6 @@ import org.vaadin.spring.events.EventBus.UIEventBus;
import org.vaadin.spring.events.EventScope;
import org.vaadin.spring.events.annotation.EventBusListenerMethod;
import com.vaadin.spring.annotation.SpringComponent;
import com.vaadin.spring.annotation.UIScope;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.TabSheet;
@@ -40,8 +38,6 @@ import com.vaadin.ui.Window;
* Implementation of software module details block using generic abstract
* details style .
*/
@SpringComponent
@UIScope
public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLayout<SoftwareModule> {
private static final long serialVersionUID = -1052279281066089812L;

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java
View File

@@ -33,7 +33,6 @@ 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.UIScope;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.UI;
@@ -43,7 +42,6 @@ import com.vaadin.ui.VerticalLayout;
* View for custom target filter management.
*/
@SpringView(name = FilterManagementView.VIEW_NAME, ui = HawkbitUI.class)
@UIScope
public class FilterManagementView extends VerticalLayout implements View {
private static final long serialVersionUID = 8751545414237389386L;

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/login/LoginView.java
View File

@@ -39,7 +39,6 @@ import com.vaadin.server.VaadinService;
import com.vaadin.server.WebBrowser;
import com.vaadin.shared.Position;
import com.vaadin.spring.annotation.SpringView;
import com.vaadin.spring.annotation.UIScope;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
@@ -56,7 +55,6 @@ import com.vaadin.ui.themes.ValoTheme;
* Login view for login credentials.
*/
@SpringView(name = "")
@UIScope
public class LoginView extends VerticalLayout implements View {
private static final String TENANT_PATTERN_PLACEHOLDER = "tenant";
private static final String USER_PATTERN_PLACEHOLDER = "user";

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java
View File

@@ -53,7 +53,6 @@ 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.UIScope;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI;
@@ -64,7 +63,6 @@ import com.vaadin.ui.VerticalLayout;
*
*/
@SpringView(name = DeploymentView.VIEW_NAME, ui = HawkbitUI.class)
@UIScope
public class DeploymentView extends VerticalLayout implements View, BrowserWindowResizeListener {
public static final String VIEW_NAME = "deployment";

17
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
View File

@@ -50,9 +50,9 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
private final DsMetadataPopupLayout dsMetadataPopupLayout;
private final EntityFactory entityFactory;
private SoftwareModuleDetailsTable softwareModuleTable;
private final SoftwareModuleDetailsTable softwareModuleTable;
private DistributionSetMetadatadetailslayout dsMetadataTable;
private final DistributionSetMetadatadetailslayout dsMetadataTable;
public DistributionDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
final ManagementUIState managementUIState, final DistributionSetManagement distributionSetManagement,
@@ -69,22 +69,17 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
distributionSetManagement, entityFactory, permissionChecker);
this.entityFactory = entityFactory;
this.distributionAddUpdateWindowLayout = distributionAddUpdateWindowLayout;
buildComponents();
}
private void buildComponents() {
softwareModuleTable = new SoftwareModuleDetailsTable();
softwareModuleTable.init(getI18n(), false, getPermissionChecker(), null, null, null);
softwareModuleTable = new SoftwareModuleDetailsTable(i18n, false, permissionChecker, null, null, null);
dsMetadataTable = new DistributionSetMetadatadetailslayout();
dsMetadataTable.init(getI18n(), getPermissionChecker(), distributionSetManagement, dsMetadataPopupLayout,
entityFactory);
dsMetadataTable = new DistributionSetMetadatadetailslayout(i18n, permissionChecker, distributionSetManagement,
dsMetadataPopupLayout, entityFactory);
addTabs(detailsTab);
restoreState();
}
@EventBusListenerMethod(scope = EventScope.UI)
void onEvent(final DistributionTableEvent distributionTableEvent) {
private void onEvent(final DistributionTableEvent distributionTableEvent) {
onBaseEntityEvent(distributionTableEvent);
}

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java
View File

@@ -34,14 +34,12 @@ 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.UIScope;
import com.vaadin.ui.VerticalLayout;
/**
* Rollout management view.
*/
@SpringView(name = RolloutView.VIEW_NAME, ui = HawkbitUI.class)
@UIScope
public class RolloutView extends VerticalLayout implements View {
private static final long serialVersionUID = -6199789714170913988L;

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/state/RolloutUIState.java
View File

@@ -14,13 +14,13 @@ import java.util.Optional;
import org.eclipse.hawkbit.repository.model.RolloutGroup;
import com.vaadin.spring.annotation.SpringComponent;
import com.vaadin.spring.annotation.UIScope;
import com.vaadin.spring.annotation.VaadinSessionScope;
/**
* Stores user actions in rollout management view.
*
*/
@UIScope
@VaadinSessionScope
@SpringComponent
public class RolloutUIState implements Serializable {

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java
View File

@@ -32,7 +32,6 @@ 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.UIScope;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.CustomComponent;
@@ -45,7 +44,6 @@ import com.vaadin.ui.VerticalLayout;
* Main UI for the system configuration view.
*/
@SpringView(name = TenantConfigurationDashboardView.VIEW_NAME, ui = HawkbitUI.class)
@UIScope
public class TenantConfigurationDashboardView extends CustomComponent implements View, ConfigurationItemChangeListener {
public static final String VIEW_NAME = "spSystemConfig";