Add the "@Override" annotation

Add some description to JUnit Tests
Remove unused override comments
Remove unused javadoc on private methode

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
SirWayne
2016-02-25 11:37:56 +01:00
parent fcd6555e3e
commit dbf03dca12
38 changed files with 284 additions and 1675 deletions

View File

@@ -37,8 +37,8 @@ import com.vaadin.spring.annotation.ViewScope;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
import com.vaadin.ui.Table.TableTransferable;
import com.vaadin.ui.UI;
/**
* Upload view footer layout implementation.
@@ -71,12 +71,7 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
@Autowired
private UploadViewAcceptCriteria uploadViewAcceptCriteria;
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#init()
*/
@Override
@PostConstruct
protected void init() {
super.init();
@@ -134,23 +129,11 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
* hasDeletePermission()
*/
@Override
protected boolean hasDeletePermission() {
return permChecker.hasDeleteDistributionPermission();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
* hasUpdatePermission()
*/
@Override
protected boolean hasUpdatePermission() {
/**
@@ -161,12 +144,6 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
return false;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
* getDeleteAreaLabel()
*/
@Override
protected String getDeleteAreaLabel() {
return i18n.get("label.software.module.drop.area");
@@ -177,29 +154,17 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
return SPUIComponetIdProvider.DELETE_BUTTON_WRAPPER_ID;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
* getDeleteLayoutAcceptCriteria()
*/
@Override
protected AcceptCriterion getDeleteLayoutAcceptCriteria() {
return uploadViewAcceptCriteria;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
* processDroppedComponent(com.vaadin .event.dd.DragAndDropEvent)
*/
@Override
protected void processDroppedComponent(final DragAndDropEvent event) {
final Component sourceComponent = event.getTransferable().getSourceComponent();
if (sourceComponent instanceof Table) {
final Table sourceTable = (Table) event.getTransferable().getSourceComponent();
addToDeleteList(sourceTable,(TableTransferable) event.getTransferable());
addToDeleteList(sourceTable, (TableTransferable) event.getTransferable());
updateSWActionCount();
}
if (sourceComponent.getId().startsWith(SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX)) {
@@ -223,11 +188,11 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
private void deleteSWModuleType(final String swModuleTypeName) {
artifactUploadState.getSelectedDeleteSWModuleTypes().add(swModuleTypeName);
}
private void addToDeleteList(final Table sourceTable, final TableTransferable transferable) {
@SuppressWarnings("unchecked")
final Set<Long> swModuleSelected = (Set<Long>) sourceTable.getValue();
final Set<Long> swModuleIdNameSet = new HashSet<Long>();
final Set<Long> swModuleIdNameSet = new HashSet<>();
if (!swModuleSelected.contains(transferable.getData(SPUIDefinitions.ITEMID))) {
swModuleIdNameSet.add((Long) transferable.getData(SPUIDefinitions.ITEMID));
} else {
@@ -239,33 +204,18 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
artifactUploadState.getDeleteSofwareModules().put(id, swModuleName);
});
}
/**
* Update the software module delete count.
*/
private void updateSWActionCount() {
final int count = artifactUploadState.getDeleteSofwareModules().size()
+ artifactUploadState.getSelectedDeleteSWModuleTypes().size();
updateActionsCount(count);
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
* getNoActionsButtonLabel()
*/
@Override
protected String getNoActionsButtonLabel() {
return i18n.get("button.no.actions");
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.footer.DeleteActionsLayout#
* getActionsButtonLabel()
*/
@Override
protected String getActionsButtonLabel() {
return i18n.get("button.actions");
@@ -276,25 +226,11 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
updateSWActionCount();
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
* getUnsavedActionsWindowCaption ()
*/
@Override
protected String getUnsavedActionsWindowCaption() {
return i18n.get("caption.save.window");
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
* unsavedActionsWindowClosed()
*/
@Override
protected void unsavedActionsWindowClosed() {
final String message = uploadViewConfirmationWindowLayout.getConsolidatedMessage();
@@ -303,26 +239,12 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
}
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
* getUnsavedActionsWindowContent ()
*/
@Override
protected Component getUnsavedActionsWindowContent() {
uploadViewConfirmationWindowLayout.init();
return uploadViewConfirmationWindowLayout;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.footer.AbstractDeleteActionsLayout#
* hasUnsavedActions()
*/
@Override
protected boolean hasUnsavedActions() {
return !artifactUploadState.getDeleteSofwareModules().isEmpty()
@@ -339,23 +261,11 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
return null;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
* isBulkUploadAllowed()
*/
@Override
protected boolean hasBulkUploadPermission() {
return false;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
* showBulkUploadWindow()
*/
@Override
protected void showBulkUploadWindow() {
/**
@@ -363,12 +273,6 @@ public class SMDeleteActionsLayout extends AbstractDeleteActionsLayout {
*/
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.footer.AbstractDeleteActionsLayout#
* restoreBulkUploadStatusCount()
*/
@Override
protected void restoreBulkUploadStatusCount() {
/**

View File

@@ -70,6 +70,7 @@ public class SoftwareModuleDetails extends AbstractTableDetailsLayout {
/**
* Initialize the component.
*/
@Override
@PostConstruct
protected void init() {
super.init();

View File

@@ -62,6 +62,7 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
/**
* Initialize the components.
*/
@Override
@PostConstruct
protected void init() {
super.init();
@@ -84,55 +85,26 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
eventbus.unsubscribe(this);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getHeaderCaption
* ()
*/
@Override
protected String getHeaderCaption() {
return i18n.get("upload.swModuleTable.header");
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getSearchBoxId()
*/
@Override
protected String getSearchBoxId() {
return SPUIComponetIdProvider.SW_MODULE_SEARCH_TEXT_FIELD;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#getSearchRestIconId()
*/
@Override
protected String getSearchRestIconId() {
return SPUIComponetIdProvider.SW_MODULE_SEARCH_RESET_ICON;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getAddIconId()
*/
@Override
protected String getAddIconId() {
return SPUIComponetIdProvider.SW_MODULE_ADD_BUTTON;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#onLoadSearchBoxValue()
*/
@Override
protected String onLoadSearchBoxValue() {
if (artifactUploadState.getSoftwareModuleFilters().getSearchText().isPresent()) {
@@ -141,68 +113,34 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
return null;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getDropFilterId(
* )
*/
@Override
protected String getDropFilterId() {
/* No dropping on software module table header in Upload View */
return null;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#hasCreatePermission()
*/
@Override
protected boolean hasCreatePermission() {
return permChecker.hasCreateDistributionPermission();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#isDropHintRequired()
*/
@Override
protected boolean isDropHintRequired() {
/* No dropping on software module table header in Upload View */
return false;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#isDropFilterRequired()
*/
@Override
protected boolean isDropFilterRequired() {
/* No dropping on software module table header in Upload View */
return false;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#
* getShowFilterButtonLayoutId()
*/
@Override
protected String getShowFilterButtonLayoutId() {
return "show.type.icon";
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#showFilterButtonsLayout
* ()
*/
@Override
protected void showFilterButtonsLayout() {
artifactUploadState.setSwTypeFilterClosed(false);
@@ -210,39 +148,19 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#resetSearchText(
* )
*/
@Override
protected void resetSearchText() {
if(artifactUploadState.getSoftwareModuleFilters().getSearchText().isPresent()){
if (artifactUploadState.getSoftwareModuleFilters().getSearchText().isPresent()) {
artifactUploadState.getSoftwareModuleFilters().setSearchText(null);
eventbus.publish(this, SMFilterEvent.REMOVER_FILTER_BY_TEXT);
}
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getMaxMinIconId(
* )
*/
@Override
protected String getMaxMinIconId() {
return SPUIComponetIdProvider.SW_MAX_MIN_TABLE_ICON;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#maximizeTable()
*/
@Override
public void maximizeTable() {
artifactUploadState.setSwModuleTableMaximized(Boolean.TRUE);
@@ -250,58 +168,28 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#minimizeTable()
*/
@Override
public void minimizeTable() {
artifactUploadState.setSwModuleTableMaximized(Boolean.FALSE);
eventbus.publish(this, new SoftwareModuleEvent(SoftwareModuleEventType.MINIMIZED, null));
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#onLoadIsTableMaximized(
* )
*/
@Override
public Boolean onLoadIsTableMaximized() {
return artifactUploadState.isSwModuleTableMaximized();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#
* onLoadIsShowFilterButtonDisplayed()
*/
@Override
public Boolean onLoadIsShowFilterButtonDisplayed() {
return artifactUploadState.isSwTypeFilterClosed();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#searchBy(java.lang.
* String)
*/
@Override
protected void searchBy(final String newSearchText) {
artifactUploadState.getSoftwareModuleFilters().setSearchText(newSearchText);
eventbus.publish(this, SMFilterEvent.FILTER_BY_TEXT);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#addNewItem(com.vaadin.
* ui.Button.ClickEvent)
*/
@Override
protected void addNewItem(final ClickEvent event) {
final Window addSoftwareModule = softwareModuleAddUpdateWindow.createAddSoftwareModuleWindow();
@@ -310,11 +198,6 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
addSoftwareModule.setVisible(Boolean.TRUE);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#canAddNewItem()
*/
@Override
protected Boolean isAddNewItemAllowed() {
return Boolean.TRUE;
@@ -335,47 +218,21 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
return null;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* getBulkUploadIconId()
*/
@Override
protected String getBulkUploadIconId() {
return null;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#bulkUpload(com.
* vaadin.ui.Button.ClickEvent )
*/
@Override
protected void bulkUpload(final ClickEvent event) {
/**
* No implementation as no bulk upload is supported.
*/
// No implementation as no bulk upload is supported.
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* isBulkUploadAllowed()
*/
@Override
protected Boolean isBulkUploadAllowed() {
return Boolean.FALSE;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.table.AbstractTableHeader#
* isBulkUploadInProgress()
*/
@Override
protected boolean isBulkUploadInProgress() {
return false;

View File

@@ -35,8 +35,6 @@ import com.vaadin.spring.annotation.ViewScope;
/**
* Software module type filter buttons.
*
*
*
*/
@SpringComponent
@ViewScope
@@ -59,6 +57,7 @@ public class SMTypeFilterButtons extends AbstractFilterButtons {
* @param filterButtonClickBehaviour
* the clickable behaviour.
*/
@Override
public void init(final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) {
super.init(filterButtonClickBehaviour);
eventBus.subscribe(this);
@@ -86,58 +85,28 @@ public class SMTypeFilterButtons extends AbstractFilterButtons {
}
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.layouts.SPFilterButtons#getButtonsTableId()
*/
@Override
protected String getButtonsTableId() {
return SPUIComponetIdProvider.SW_MODULE_TYPE_TABLE_ID;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.layouts.SPFilterButtons#
* createButtonsLazyQueryContainer()
*/
@Override
protected LazyQueryContainer createButtonsLazyQueryContainer() {
return HawkbitCommonUtil.createLazyQueryContainer(
new BeanQueryFactory<SoftwareModuleTypeBeanQuery>(SoftwareModuleTypeBeanQuery.class));
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.layouts.SPFilterButtons#isClickedByDefault(java.
* lang.Long)
*/
@Override
protected boolean isClickedByDefault(final Long buttonId) {
return artifactUploadState.getSoftwareModuleFilters().getSoftwareModuleType().isPresent() && artifactUploadState
.getSoftwareModuleFilters().getSoftwareModuleType().get().getId().equals(buttonId);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.layouts.SPFilterButtons#createButtonId(java.lang.
* String)
*/
@Override
protected String createButtonId(final String name) {
return SPUIComponetIdProvider.SM_TYPE_FILTER_BTN_ID + name;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.filterlayout.SPFilterButtons#
* getFilterButtonDropHandler()
*/
@Override
protected DropHandler getFilterButtonDropHandler() {
return new DropHandler() {
@@ -155,13 +124,6 @@ public class SMTypeFilterButtons extends AbstractFilterButtons {
};
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
* getButttonWrapperId()
*/
@Override
protected String getButttonWrapperIdPrefix() {
return SPUIComponetIdProvider.UPLOAD_TYPE_BUTTON_PREFIX;

View File

@@ -28,9 +28,6 @@ import com.vaadin.ui.Window;
/**
* Software module type filter buttons header.
*
*
*
*/
@SpringComponent
@ViewScope
@@ -53,6 +50,7 @@ public class SMTypeFilterHeader extends AbstractFilterHeader {
/**
* Initialize the components.
*/
@Override
@PostConstruct
protected void init() {
super.init();
@@ -61,32 +59,16 @@ public class SMTypeFilterHeader extends AbstractFilterHeader {
}
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.layouts.SPFilterHeader#hasCreateUpdatePermission()
*/
@Override
protected boolean hasCreateUpdatePermission() {
return permChecker.hasCreateDistributionPermission() || permChecker.hasUpdateDistributionPermission();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.layouts.SPFilterHeader#getTitle()
*/
@Override
protected String getTitle() {
return SPUILabelDefinitions.TYPE;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.layouts.SPFilterHeader#settingsIconClicked(com.
* vaadin.ui.Button.ClickEvent )
*/
@Override
protected void settingsIconClicked(final ClickEvent event) {
final Window addUpdateWindow = createUpdateSWTypeLayout.getWindow();
@@ -94,58 +76,27 @@ public class SMTypeFilterHeader extends AbstractFilterHeader {
addUpdateWindow.setVisible(Boolean.TRUE);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.layouts.SPFilterHeader#dropHitsRequired()
*/
@Override
protected boolean dropHitsRequired() {
return false;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.filterlayout.SPFilterHeader#
* hideFilterButtonLayout()
*/
@Override
protected void hideFilterButtonLayout() {
artifactUploadState.setSwTypeFilterClosed(true);
eventbus.publish(this, UploadArtifactUIEvent.HIDE_FILTER_BY_TYPE);
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.filterlayout.SPFilterHeader#
* getConfigureFilterButtonId()
*/
@Override
protected String getConfigureFilterButtonId() {
return SPUIDefinitions.ADD_SOFTWARE_MODULE_TYPE;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* getHideButtonId()
*/
@Override
protected String getHideButtonId() {
return SPUIComponetIdProvider.SM_SHOW_FILTER_BUTTON_ID;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader#
* isAddTagRequired()
*/
@Override
protected boolean isAddTagRequired() {
return true;

View File

@@ -29,9 +29,6 @@ import com.vaadin.ui.themes.ValoTheme;
*
* module.
*
*
*
*
*/
public class ConfirmationDialog implements Button.ClickListener {
/** Serial version UID. */
@@ -127,6 +124,7 @@ public class ConfirmationDialog implements Button.ClickListener {
* @param event
* the click event.
*/
@Override
public void buttonClick(final ClickEvent event) {
if (window.getParent() != null) {
UI.getCurrent().removeWindow(window);
@@ -146,6 +144,7 @@ public class ConfirmationDialog implements Button.ClickListener {
/**
* Interface for confirmation dialog callbacks.
*/
@FunctionalInterface
public interface ConfirmationDialogCallback {
/**
* The user response.

View File

@@ -87,34 +87,16 @@ public class DistributionTagToken extends AbstractTagToken {
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.tagDetails.AbstractTagToken#getTagStyleName
* ()
*/
@Override
protected String getTagStyleName() {
return "distribution-tag-";
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.tagDetails.AbstractTagToken#
* getTokenInputPrompt()
*/
@Override
protected String getTokenInputPrompt() {
return i18n.get("combo.type.tag.name");
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.tagDetails.AbstractTagToken#assignTag(java.
* lang.String)
*/
@Override
protected void assignTag(final String tagNameSelected) {
if (tagNameSelected != null) {

View File

@@ -14,29 +14,11 @@ import com.vaadin.ui.themes.ValoTheme;
/**
* Style for button: Primary.
*
*
*
*
*
*
*/
public class SPUIButtonStylePrimarySmall implements SPUIButtonDecorator {
/**
* Decorate Button and return.
*
* @param button
* as Button
* @param style
* as String
* @param setStyle
* as String
* @param icon
* as resource
* @return Button
*/
public Button decorate(Button button, String style, boolean setStyle, Resource icon) {
@Override
public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
button.addStyleName(ValoTheme.BUTTON_PRIMARY + " " + ValoTheme.BUTTON_SMALL);
// Set Style
if (null != style) {

View File

@@ -14,29 +14,12 @@ import com.vaadin.ui.themes.ValoTheme;
/**
* Style for button: Small.
*
*
*
*
*
*
*/
public class SPUIButtonStyleSmall implements SPUIButtonDecorator {
/**
* Decorate Button and return.
*
* @param button
* as Button
* @param style
* as String
* @param setStyle
* as String
* @param icon
* as resource
* @return Button
*/
public Button decorate(Button button, String style, boolean setStyle, Resource icon) {
@Override
public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
button.addStyleName(ValoTheme.BUTTON_SMALL);
// Set Style
if (null != style) {

View File

@@ -14,29 +14,12 @@ import com.vaadin.ui.themes.ValoTheme;
/**
* Style for button: Small NoBorder Height UnDefined.
*
*
*
*
*
*
*/
public class SPUIButtonStyleSmallNoBorderUH implements SPUIButtonDecorator {
/**
* Decorate Button and return.
*
* @param button
* as Button
* @param style
* as String
* @param setStyle
* as String
* @param icon
* as resource
* @return Button
*/
public Button decorate(Button button, String style, boolean setStyle, Resource icon) {
@Override
public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
button.addStyleName(ValoTheme.BUTTON_SMALL);
button.addStyleName(ValoTheme.BUTTON_BORDERLESS_COLORED);
button.setHeightUndefined();

View File

@@ -14,29 +14,12 @@ import com.vaadin.ui.themes.ValoTheme;
/**
* Style for button: Small NoBorder Height and size UnDefined.
*
*
*
*
*
*
*/
public class SPUIButtonStyleSmallNoBorderUHS implements SPUIButtonDecorator {
/**
* Decorate Button and return.
*
* @param button
* as Button
* @param style
* as String
* @param setStyle
* as String
* @param icon
* as resource
* @return Button
*/
public Button decorate(Button button, String style, boolean setStyle, Resource icon) {
@Override
public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
button.addStyleName(ValoTheme.BUTTON_SMALL);
button.addStyleName(ValoTheme.BUTTON_BORDERLESS);
button.setHeightUndefined();

View File

@@ -14,29 +14,12 @@ import com.vaadin.ui.themes.ValoTheme;
/**
* Style for button: Small.
*
*
*
*
*
*
*/
public class SPUIButtonStyleTiny implements SPUIButtonDecorator {
/**
* Decorate Button and return.
*
* @param button
* as Button
* @param style
* as String
* @param setStyle
* as String
* @param icon
* as resource
* @return Button
*/
public Button decorate(Button button, String style, boolean setStyle, Resource icon) {
@Override
public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
button.addStyleName(ValoTheme.BUTTON_TINY);
// Set Style
if (null != style) {

View File

@@ -16,27 +16,10 @@ import com.vaadin.ui.themes.ValoTheme;
/**
* Style for button: Tag.
*
*
*
*
*
*
*/
public class SPUITagButtonStyle implements SPUIButtonDecorator {
/**
* Decorate Button and return.
*
* @param button
* as Button
* @param style
* as String
* @param setStyle
* as String
* @param icon
* as resource
* @return Button
*/
@Override
public Button decorate(final Button button, final String style, final boolean setStyle, final Resource icon) {
/**

View File

@@ -474,7 +474,7 @@ public class CreateUpdateDistSetTypeLayout extends CustomComponent implements Co
@SuppressWarnings("unchecked")
private void getSelectedTableItemData(final Long id) {
Item saveTblitem = null;
Item saveTblitem;
if (null != selectedTablecontainer) {
saveTblitem = selectedTablecontainer.addItem(id);
saveTblitem.getItemProperty(DIST_TYPE_NAME).setValue(

View File

@@ -60,44 +60,24 @@ public class DSTypeFilterButtons extends AbstractFilterButtons {
* @param filterButtonClickBehaviour
* the clickable behaviour.
*/
@Override
public void init(final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) {
super.init(filterButtonClickBehaviour);
eventBus.subscribe(this);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
* getButtonsTableId()
*/
@Override
protected String getButtonsTableId() {
return SPUIComponetIdProvider.DISTRIBUTION_SET_TYPE_TABLE_ID;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
* createButtonsLazyQueryContainer ()
*/
@Override
protected LazyQueryContainer createButtonsLazyQueryContainer() {
return HawkbitCommonUtil.createLazyQueryContainer(
new BeanQueryFactory<DistributionSetTypeBeanQuery>(DistributionSetTypeBeanQuery.class));
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
* isClickedByDefault(java.lang .Long)
*/
@Override
protected boolean isClickedByDefault(final Long buttonId) {
@@ -105,26 +85,12 @@ public class DSTypeFilterButtons extends AbstractFilterButtons {
&& manageDistUIState.getManageDistFilters().getClickedDistSetType().getId().equals(buttonId);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
* createButtonId(java.lang. String)
*/
@Override
protected String createButtonId(final String name) {
return SPUIComponetIdProvider.DS_TYPE_FILTER_BTN_ID + name;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
* getFilterButtonDropHandler()
*/
@Override
protected DropHandler getFilterButtonDropHandler() {
@@ -148,13 +114,6 @@ public class DSTypeFilterButtons extends AbstractFilterButtons {
return null;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterButtons#
* getButttonWrapperId()
*/
@Override
protected String getButttonWrapperIdPrefix() {

View File

@@ -27,9 +27,6 @@ import com.vaadin.ui.Window;
/**
* Distribution Set Type filter buttons header.
*
*
*
*/
@SpringComponent
@ViewScope
@@ -49,9 +46,7 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
@Autowired
private CreateUpdateDistSetTypeLayout createUpdateDistSetTypeLayout;
/**
* Initialize the components.
*/
@Override
@PostConstruct
public void init() {
super.init();
@@ -60,37 +55,16 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
}
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* hasCreateUpdatePermission()
*/
@Override
protected boolean hasCreateUpdatePermission() {
return permChecker.hasCreateDistributionPermission() || permChecker.hasUpdateDistributionPermission();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#getTitle(
* )
*/
@Override
protected String getTitle() {
return SPUILabelDefinitions.TYPE;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* settingsIconClicked(com.vaadin .ui.Button.ClickEvent)
*/
@Override
protected void settingsIconClicked(final ClickEvent event) {
final Window addUpdateWindow = createUpdateDistSetTypeLayout.getWindow();
@@ -99,25 +73,11 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* dropHitsRequired()
*/
@Override
protected boolean dropHitsRequired() {
return false;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* hideFilterButtonLayout()
*/
@Override
protected void hideFilterButtonLayout() {
manageDistUIState.setDistTypeFilterClosed(true);
@@ -125,38 +85,17 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* getConfigureFilterButtonId()
*/
@Override
protected String getConfigureFilterButtonId() {
return SPUIDefinitions.ADD_DISTRIBUTION_TYPE_TAG;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* getHideButtonId()
*/
@Override
protected String getHideButtonId() {
return SPUIDefinitions.HIDE_FILTER_DIST_TYPE;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader#
* isAddTagRequired()
*/
@Override
protected boolean isAddTagRequired() {
return true;

View File

@@ -36,8 +36,6 @@ import com.vaadin.ui.Window;
/**
* Distribution table header.
*
*
*/
@SpringComponent
@ViewScope
@@ -60,9 +58,7 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
@Autowired
private DistributionAddUpdateWindowLayout addUpdateWindowLayout;
/**
* Initialize the component.
*/
@Override
@PostConstruct
protected void init() {
super.init();
@@ -76,54 +72,26 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
}
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#getHeaderCaption(
* )
*/
@Override
protected String getHeaderCaption() {
return i18n.get("header.dist.table");
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#getSearchBoxId()
*/
@Override
protected String getSearchBoxId() {
return SPUIComponetIdProvider.DIST_SEARCH_TEXTFIELD;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* getSearchRestIconId()
*/
@Override
protected String getSearchRestIconId() {
return SPUIComponetIdProvider.DIST_SEARCH_ICON;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#getAddIconId()
*/
@Override
protected String getAddIconId() {
return SPUIComponetIdProvider.DIST_ADD_ICON;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* onLoadSearchBoxValue()
*/
@Override
protected String onLoadSearchBoxValue() {
if (manageDistUIstate.getManageDistFilters().getSearchText().isPresent()) {
@@ -132,11 +100,6 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
return null;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#getDropFilterId()
*/
@Override
protected String getDropFilterId() {
return null;
@@ -170,7 +133,7 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
@Override
protected void resetSearchText() {
if(manageDistUIstate.getManageDistFilters().getSearchText().isPresent()){
if (manageDistUIstate.getManageDistFilters().getSearchText().isPresent()) {
manageDistUIstate.getManageDistFilters().setSearchText(null);
eventbus.publish(this, DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT);
}
@@ -223,11 +186,6 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
eventbus.unsubscribe(this);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#canAddNewItem()
*/
@Override
protected Boolean isAddNewItemAllowed() {
return Boolean.TRUE;
@@ -248,47 +206,21 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
return null;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* getBulkUploadIconId()
*/
@Override
protected String getBulkUploadIconId() {
return null;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#bulkUpload(com.
* vaadin.ui.Button.ClickEvent )
*/
@Override
protected void bulkUpload(final ClickEvent event) {
/**
* No implementation as no bulk upload is supported.
*/
// No implementation as no bulk upload is supported.
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* isBulkUploadAllowed()
*/
@Override
protected Boolean isBulkUploadAllowed() {
return Boolean.FALSE;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.table.AbstractTableHeader#
* isBulkUploadInProgress()
*/
@Override
protected boolean isBulkUploadInProgress() {
return false;

View File

@@ -39,9 +39,6 @@ import com.vaadin.ui.Window;
/**
* Implementation of software module details block using generic abstract
* details style .
*
*
*
*/
@SpringComponent
@ViewScope
@@ -70,9 +67,7 @@ public class SwModuleDetails extends AbstractTableDetailsLayout {
private SoftwareModule selectedSwModule;
/**
* Initialize the component.
*/
@Override
@PostConstruct
protected void init() {
super.init();
@@ -133,49 +128,21 @@ public class SwModuleDetails extends AbstractTableDetailsLayout {
detailsTab.addTab(createLogLayout(), i18n.get("caption.logs.tab"), null);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.detailslayout.TableDetailsLayout#
* getDefaultCaption()
*/
@Override
protected String getDefaultCaption() {
return i18n.get("upload.swModuleTable.header");
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.detailslayout.TableDetailsLayout#
* onLoadIsSwModuleSelected()
*/
@Override
protected Boolean onLoadIsTableRowSelected() {
return !manageDistUIState.getSelectedSoftwareModules().isEmpty();
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.detailslayout.TableDetailsLayout#
* onLoadIsTableMaximized()
*/
@Override
protected Boolean onLoadIsTableMaximized() {
return manageDistUIState.isSwModuleTableMaximized();
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.detailslayout.TableDetailsLayout#
* populateDetailsWidget()
*/
@Override
protected void populateDetailsWidget() {
populateDetailsWidget(selectedSwModule);
@@ -191,12 +158,6 @@ public class SwModuleDetails extends AbstractTableDetailsLayout {
return permissionChecker.hasUpdateDistributionPermission();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* getTabSheetId()
*/
@Override
protected String getTabSheetId() {
return null;

View File

@@ -36,9 +36,6 @@ import com.vaadin.ui.Window;
/**
* Implementation of software module Header block using generic abstract details
* style .
*
*
*
*/
@SpringComponent
@ViewScope
@@ -61,9 +58,7 @@ public class SwModuleTableHeader extends AbstractTableHeader {
@Autowired
private SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow;
/**
* Initialize the components.
*/
@Override
@PostConstruct
protected void init() {
super.init();
@@ -82,45 +77,21 @@ public class SwModuleTableHeader extends AbstractTableHeader {
}
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getHeaderCaption
* ()
*/
@Override
protected String getHeaderCaption() {
return i18n.get("upload.swModuleTable.header");
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getSearchBoxId()
*/
@Override
protected String getSearchBoxId() {
return SPUIComponetIdProvider.SW_MODULE_SEARCH_TEXT_FIELD;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#getSearchRestIconId()
*/
@Override
protected String getSearchRestIconId() {
return SPUIComponetIdProvider.SW_MODULE_SEARCH_RESET_ICON;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getAddIconId()
*/
@Override
protected String getAddIconId() {
return SPUIComponetIdProvider.SW_MODULE_ADD_BUTTON;
@@ -134,99 +105,47 @@ public class SwModuleTableHeader extends AbstractTableHeader {
return null;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getDropFilterId(
* )
*/
@Override
protected String getDropFilterId() {
/* not required */
return null;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* isDropHintRequired()
*/
@Override
protected boolean isDropHintRequired() {
/* not required */
return false;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#isDropFilterRequired()
*/
@Override
protected boolean isDropFilterRequired() {
/* Not Yet Implemented */
return false;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#
* getShowFilterButtonLayoutId()
*/
@Override
protected String getShowFilterButtonLayoutId() {
return "show.type.icon";
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#showFilterButtonsLayout
* ()
*/
@Override
protected void showFilterButtonsLayout() {
manageDistUIState.setSwTypeFilterClosed(false);
eventbus.publish(this, DistributionsUIEvent.SHOW_SM_FILTER_BY_TYPE);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#resetSearchText(
* )
*/
@Override
protected void resetSearchText() {
if(manageDistUIState.getSoftwareModuleFilters().getSearchText().isPresent()){
if (manageDistUIState.getSoftwareModuleFilters().getSearchText().isPresent()) {
manageDistUIState.getSoftwareModuleFilters().setSearchText(null);
eventbus.publish(this, SMFilterEvent.REMOVER_FILTER_BY_TEXT);
}
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#getMaxMinIconId(
* )
*/
@Override
protected String getMaxMinIconId() {
return SPUIComponetIdProvider.SW_MAX_MIN_TABLE_ICON;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#maximizeTable()
*/
@Override
public void maximizeTable() {
manageDistUIState.setSwModuleTableMaximized(Boolean.TRUE);
@@ -234,58 +153,28 @@ public class SwModuleTableHeader extends AbstractTableHeader {
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#minimizeTable()
*/
@Override
public void minimizeTable() {
manageDistUIState.setSwModuleTableMaximized(Boolean.FALSE);
eventbus.publish(this, new SoftwareModuleEvent(SoftwareModuleEventType.MINIMIZED, null));
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#onLoadIsTableMaximized(
* )
*/
@Override
public Boolean onLoadIsTableMaximized() {
return manageDistUIState.isSwModuleTableMaximized();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.SPTableHeader#
* onLoadIsShowFilterButtonDisplayed()
*/
@Override
public Boolean onLoadIsShowFilterButtonDisplayed() {
return manageDistUIState.isSwTypeFilterClosed();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#searchBy(java.lang.
* String)
*/
@Override
protected void searchBy(final String newSearchText) {
manageDistUIState.getSoftwareModuleFilters().setSearchText(newSearchText);
eventbus.publish(this, SMFilterEvent.FILTER_BY_TEXT);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#addNewItem(com.vaadin.
* ui.Button.ClickEvent)
*/
@Override
protected void addNewItem(final ClickEvent event) {
final Window addSoftwareModule = softwareModuleAddUpdateWindow.createAddSoftwareModuleWindow();
@@ -294,22 +183,11 @@ public class SwModuleTableHeader extends AbstractTableHeader {
addSoftwareModule.setVisible(Boolean.TRUE);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.SPTableHeader#hasCreatePermission()
*/
@Override
protected boolean hasCreatePermission() {
return permChecker.hasCreateDistributionPermission();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* isAddNewItemAllowed()
*/
@Override
protected Boolean isAddNewItemAllowed() {
return true;
@@ -330,47 +208,21 @@ public class SwModuleTableHeader extends AbstractTableHeader {
return null;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* getBulkUploadIconId()
*/
@Override
protected String getBulkUploadIconId() {
return null;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#bulkUpload(com.
* vaadin.ui.Button.ClickEvent )
*/
@Override
protected void bulkUpload(final ClickEvent event) {
/**
* No implementation as no bulk upload is supported.
*/
// No implementation as no bulk upload is supported.
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* isBulkUploadAllowed()
*/
@Override
protected Boolean isBulkUploadAllowed() {
return Boolean.FALSE;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.table.AbstractTableHeader#
* isBulkUploadInProgress()
*/
@Override
protected boolean isBulkUploadInProgress() {
return false;

View File

@@ -56,12 +56,6 @@ public class DistSMTypeFilterButtons extends AbstractFilterButtons {
@Autowired
private DistributionsViewAcceptCriteria distributionsViewAcceptCriteria;
/**
* Initialize component.
*
* @param filterButtonClickBehaviour
* the clickable behaviour.
*/
@Override
public void init(final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) {
super.init(filterButtonClickBehaviour);
@@ -70,7 +64,6 @@ public class DistSMTypeFilterButtons extends AbstractFilterButtons {
@Override
protected String getButtonsTableId() {
return SPUIComponetIdProvider.SW_MODULE_TYPE_TABLE_ID;
}
@@ -120,7 +113,6 @@ public class DistSMTypeFilterButtons extends AbstractFilterButtons {
@Override
protected String getButttonWrapperIdPrefix() {
return SPUIDefinitions.SOFTWARE_MODULE_TAG_ID_PREFIXS;
}

View File

@@ -29,9 +29,6 @@ import com.vaadin.ui.Window;
/**
* Software Module Type filter buttons header.
*
*
*
*/
@SpringComponent
@ViewScope
@@ -51,9 +48,7 @@ public class DistSMTypeFilterHeader extends AbstractFilterHeader {
@Autowired
private CreateUpdateSoftwareTypeLayout createUpdateSWTypeLayout;
/**
* Initialize the components.
*/
@Override
@PostConstruct
public void init() {
super.init();
@@ -62,50 +57,21 @@ public class DistSMTypeFilterHeader extends AbstractFilterHeader {
}
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* getHideButtonId()
*/
@Override
protected String getHideButtonId() {
return SPUIComponetIdProvider.SM_SHOW_FILTER_BUTTON_ID;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* hasCreateUpdatePermission()
*/
@Override
protected boolean hasCreateUpdatePermission() {
return permChecker.hasCreateDistributionPermission() || permChecker.hasUpdateDistributionPermission();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#getTitle(
* )
*/
@Override
protected String getTitle() {
return SPUILabelDefinitions.TYPE;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* settingsIconClicked(com.vaadin .ui.Button.ClickEvent)
*/
@Override
protected void settingsIconClicked(final ClickEvent event) {
final Window addUpdateWindow = createUpdateSWTypeLayout.getWindow();
@@ -114,51 +80,22 @@ public class DistSMTypeFilterHeader extends AbstractFilterHeader {
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* dropHitsRequired()
*/
@Override
protected boolean dropHitsRequired() {
return false;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* hideFilterButtonLayout()
*/
@Override
protected void hideFilterButtonLayout() {
manageDistUIState.setSwTypeFilterClosed(true);
eventBus.publish(this, DistributionsUIEvent.HIDE_SM_FILTER_BY_TYPE);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* getConfigureFilterButtonId()
*/
@Override
protected String getConfigureFilterButtonId() {
return SPUIDefinitions.ADD_SOFTWARE_MODULE_TYPE;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader#
* isAddTagRequired()
*/
@Override
protected boolean isAddTagRequired() {
return true;

View File

@@ -39,9 +39,6 @@ import com.vaadin.ui.Window;
/**
* Distribution set details layout.
*
*
*
*/
@SpringComponent
@ViewScope
@@ -75,9 +72,7 @@ public class DistributionDetails extends AbstractTableDetailsLayout {
private UI ui;
/**
* softwareLayout Initialize the component.
*/
@Override
@PostConstruct
protected void init() {
eventBus.subscribe(this);
@@ -116,23 +111,11 @@ public class DistributionDetails extends AbstractTableDetailsLayout {
}
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* getDefaultCaption()
*/
@Override
protected String getDefaultCaption() {
return i18n.get("distribution.details.header");
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* addTabs(com.vaadin. ui.TabSheet)
*/
@Override
protected void addTabs(final TabSheet detailsTab) {
detailsTab.addTab(createDetailsLayout(), i18n.get("caption.tab.details"), null);
@@ -142,12 +125,6 @@ public class DistributionDetails extends AbstractTableDetailsLayout {
detailsTab.addTab(createLogLayout(), i18n.get("caption.logs.tab"), null);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* onEdit(com.vaadin.ui .Button.ClickEvent)
*/
@Override
protected void onEdit(final ClickEvent event) {
final Window newDistWindow = distributionAddUpdateWindowLayout.getWindow();
@@ -157,79 +134,37 @@ public class DistributionDetails extends AbstractTableDetailsLayout {
newDistWindow.setVisible(Boolean.TRUE);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* getEditButtonId()
*/
@Override
protected String getEditButtonId() {
return SPUIComponetIdProvider.DS_EDIT_BUTTON;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* onLoadIsTableRowSelected ()
*/
@Override
protected Boolean onLoadIsTableRowSelected() {
return !(managementUIState.getSelectedDsIdName().isPresent()
&& managementUIState.getSelectedDsIdName().get().isEmpty());
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* onLoadIsTableMaximized ()
*/
@Override
protected Boolean onLoadIsTableMaximized() {
return managementUIState.isDsTableMaximized();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* populateDetailsWidget()
*/
@Override
protected void populateDetailsWidget() {
populateDetailsWidget(selectedDsModule);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* clearDetails()
*/
@Override
protected void clearDetails() {
populateDetailsWidget(null);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* hasEditPermission()
*/
@Override
protected Boolean hasEditPermission() {
return permissionChecker.hasUpdateDistributionPermission();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.detailslayout.AbstractTableDetailsLayout#
* getTabSheetId()
*/
@Override
protected String getTabSheetId() {
return SPUIComponetIdProvider.DISTRIBUTION_DETAILS_TABSHEET;

View File

@@ -73,7 +73,6 @@ import com.vaadin.ui.UI;
/**
* Distribution set table.
*
*/
@SpringComponent
@ViewScope
@@ -111,9 +110,6 @@ public class DistributionTable extends AbstractTable {
private Button distributinPinnedBtn;
/**
* Initialize the distribution table.
*/
@Override
@PostConstruct
protected void init() {

View File

@@ -58,9 +58,7 @@ public class DistributionTableHeader extends AbstractTableHeader {
@Autowired
private DistributionAddUpdateWindowLayout distributionAddUpdateWindowLayout;
/**
* Initialize the component.
*/
@Override
@PostConstruct
protected void init() {
super.init();
@@ -81,54 +79,26 @@ public class DistributionTableHeader extends AbstractTableHeader {
}
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#getHeaderCaption(
* )
*/
@Override
protected String getHeaderCaption() {
return i18n.get("header.dist.table");
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#getSearchBoxId()
*/
@Override
protected String getSearchBoxId() {
return SPUIComponetIdProvider.DIST_SEARCH_TEXTFIELD;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* getSearchRestIconId()
*/
@Override
protected String getSearchRestIconId() {
return SPUIComponetIdProvider.DIST_SEARCH_ICON;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#getAddIconId()
*/
@Override
protected String getAddIconId() {
return SPUIComponetIdProvider.DIST_ADD_ICON;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* onLoadSearchBoxValue()
*/
@Override
protected String onLoadSearchBoxValue() {
if (managementUIState.getDistributionTableFilters().getSearchText().isPresent()) {
@@ -137,157 +107,78 @@ public class DistributionTableHeader extends AbstractTableHeader {
return null;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#getDropFilterId()
*/
@Override
protected String getDropFilterId() {
return null;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* hasCreatePermission()
*/
@Override
protected boolean hasCreatePermission() {
return permChecker.hasCreateDistributionPermission();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* isDropHintRequired()
*/
@Override
protected boolean isDropHintRequired() {
return true;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* isDropFilterRequired()
*/
@Override
protected boolean isDropFilterRequired() {
return false;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* getShowFilterButtonLayoutId()
*/
@Override
protected String getShowFilterButtonLayoutId() {
return "show.dist.tags.icon";
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* showFilterButtonsLayout()
*/
@Override
protected void showFilterButtonsLayout() {
managementUIState.setDistTagFilterClosed(false);
eventbus.publish(this, ManagementUIEvent.SHOW_DISTRIBUTION_TAG_LAYOUT);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#resetSearchText()
*/
@Override
protected void resetSearchText() {
if( managementUIState.getDistributionTableFilters().getSearchText().isPresent()){
if (managementUIState.getDistributionTableFilters().getSearchText().isPresent()) {
managementUIState.getDistributionTableFilters().setSearchText(null);
eventbus.publish(this, DistributionTableFilterEvent.REMOVE_FILTER_BY_TEXT);
}
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#getMaxMinIconId()
*/
@Override
protected String getMaxMinIconId() {
return SPUIComponetIdProvider.DS_MAX_MIN_TABLE_ICON;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#maximizeTable()
*/
@Override
public void maximizeTable() {
managementUIState.setDsTableMaximized(Boolean.TRUE);
eventbus.publish(this, new DistributionTableEvent(DistributionComponentEvent.MAXIMIZED, null));
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#minimizeTable()
*/
@Override
public void minimizeTable() {
managementUIState.setDsTableMaximized(Boolean.FALSE);
eventbus.publish(this, new DistributionTableEvent(DistributionComponentEvent.MINIMIZED, null));
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* onLoadIsTableMaximized()
*/
@Override
public Boolean onLoadIsTableMaximized() {
return managementUIState.isDsTableMaximized();
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* onLoadIsShowFilterButtonDisplayed()
*/
@Override
public Boolean onLoadIsShowFilterButtonDisplayed() {
return managementUIState.isDistTagFilterClosed();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#searchBy(java.
* lang.String)
*/
@Override
protected void searchBy(final String newSearchText) {
managementUIState.getDistributionTableFilters().setSearchText(newSearchText);
eventbus.publish(this, DistributionTableFilterEvent.FILTER_BY_TEXT);
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#addNewItem(com.
* vaadin.ui.Button.ClickEvent )
*/
@Override
protected void addNewItem(final ClickEvent event) {
final Window newDistWindow = distributionAddUpdateWindowLayout.getWindow();
@@ -297,12 +188,6 @@ public class DistributionTableHeader extends AbstractTableHeader {
eventbus.publish(this, DragEvent.HIDE_DROP_HINT);
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* isAddNewItemAllowed()
*/
@Override
protected Boolean isAddNewItemAllowed() {
return Boolean.FALSE;
@@ -323,47 +208,21 @@ public class DistributionTableHeader extends AbstractTableHeader {
return null;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* getBulkUploadIconId()
*/
@Override
protected String getBulkUploadIconId() {
return null;
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.table.AbstractTableHeader#bulkUpload(com.
* vaadin.ui.Button.ClickEvent )
*/
@Override
protected void bulkUpload(final ClickEvent event) {
/**
* No implementation as no bulk upload is supported.
*/
// No implementation as no bulk upload is supported.
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.server.ui.common.table.AbstractTableHeader#
* isBulkUploadAllowed()
*/
@Override
protected Boolean isBulkUploadAllowed() {
return Boolean.FALSE;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.table.AbstractTableHeader#
* isBulkUploadInProgress()
*/
@Override
protected boolean isBulkUploadInProgress() {
return false;

View File

@@ -64,12 +64,6 @@ public class DistributionTagButtons extends AbstractFilterButtons {
@Autowired
private ManagementUIState managementUIState;
/**
* Initialize component.
*
* @param filterButtonClickBehaviour
* the clickable behaviour.
*/
@Override
public void init(final AbstractFilterButtonClickBehaviour filterButtonClickBehaviour) {
super.init(filterButtonClickBehaviour);
@@ -99,7 +93,6 @@ public class DistributionTagButtons extends AbstractFilterButtons {
@EventBusListenerMethod(scope = EventScope.SESSION)
void onEvent(final DragEvent dragEvent) {
if (dragEvent == DragEvent.DISTRIBUTION_DRAG) {
UI.getCurrent().access(() -> addStyleName(SPUIStyleDefinitions.SHOW_DROP_HINT_FILTER_BUTTON));
} else {

View File

@@ -50,9 +50,7 @@ public class DistributionTagHeader extends AbstractFilterHeader {
@Autowired
private CreateUpdateDistributionTagLayoutWindow createORUpdateDistributionTagLayout;
/**
* Initialize the components.
*/
@Override
@PostConstruct
public void init() {
super.init();
@@ -61,100 +59,45 @@ public class DistributionTagHeader extends AbstractFilterHeader {
}
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* getHideButtonId()
*/
@Override
protected String getHideButtonId() {
return "hide.distribution.tags";
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* hasCreateUpdatePermission()
*/
@Override
protected boolean hasCreateUpdatePermission() {
return permChecker.hasCreateDistributionPermission() || permChecker.hasUpdateDistributionPermission();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#getTitle(
* )
*/
@Override
protected String getTitle() {
return i18n.get("header.filter.tag", new Object[] {});
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* settingsIconClicked(com.vaadin .ui.Button.ClickEvent)
*/
@Override
protected void settingsIconClicked(final ClickEvent event) {
final Window addUpdateWindow = createORUpdateDistributionTagLayout.getWindow();
UI.getCurrent().addWindow(addUpdateWindow);
addUpdateWindow.setModal(true);
addUpdateWindow.setVisible(Boolean.TRUE);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* dropHitsRequired()
*/
@Override
protected boolean dropHitsRequired() {
return true;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* hideFilterButtonLayout()
*/
@Override
protected void hideFilterButtonLayout() {
managementUIState.setDistTagFilterClosed(true);
eventbus.publish(this, ManagementUIEvent.HIDE_DISTRIBUTION_TAG_LAYOUT);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* getConfigureFilterButtonId()
*/
@Override
protected String getConfigureFilterButtonId() {
return SPUIComponetIdProvider.ADD_DISTRIBUTION_TAG;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader#
* isAddTagRequired()
*/
@Override
protected boolean isAddTagRequired() {
return true;

View File

@@ -89,9 +89,6 @@ public class TargetTableHeader extends AbstractTableHeader {
private Boolean isComplexFilterViewDisplayed = Boolean.FALSE;
/**
* Initialization of Target Header Component.
*/
@Override
@PostConstruct
protected void init() {

View File

@@ -25,9 +25,6 @@ import com.vaadin.ui.Button.ClickEvent;
/**
* Target Tag filter by Tag Header.
*
*
*
*/
@SpringComponent
@ViewScope
@@ -50,9 +47,7 @@ public class TargetTagFilterHeader extends AbstractFilterHeader {
@Autowired
private ManagementUIState managementUIState;
/**
* Initialize Tag Header.
*/
@Override
@PostConstruct
public void init() {
super.init();
@@ -61,101 +56,45 @@ public class TargetTagFilterHeader extends AbstractFilterHeader {
}
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* getHideButtonId()
*/
@Override
protected String getHideButtonId() {
return SPUIComponetIdProvider.HIDE_TARGET_TAGS;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* hasCreateUpdatePermission()
*/
@Override
protected boolean hasCreateUpdatePermission() {
return permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission();
}
/*
* (non-Javadoc)
*
* @see hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#getTitle(
* )
*/
@Override
protected String getTitle() {
return i18n.get("header.target.filter.tag", new Object[] {});
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* settingsIconClicked(com.vaadin .ui.Button.ClickEvent)
*/
@Override
protected void settingsIconClicked(final ClickEvent event) {
/**
* Add tag icon not displayed.
*/
// Add tag icon not displayed.
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* dropHitsRequired()
*/
@Override
protected boolean dropHitsRequired() {
return true;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* hideFilterButtonLayout()
*/
@Override
protected void hideFilterButtonLayout() {
managementUIState.setTargetTagFilterClosed(true);
eventbus.publish(this, ManagementUIEvent.HIDE_TARGET_TAG_LAYOUT);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.server.ui.common.filterlayout.AbstractFilterHeader#
* getConfigureFilterButtonId()
*/
@Override
protected String getConfigureFilterButtonId() {
return null;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.common.filterlayout.AbstractFilterHeader#
* isAddTagRequired()
*/
@Override
protected boolean isAddTagRequired() {
return false;

View File

@@ -24,10 +24,6 @@ public class ProxyRollout extends Rollout {
private String modifiedDate;
private String createdBy;
private String lastModifiedBy;
private Long numberOfGroups;
private Long runningTargetsCount;
@@ -106,36 +102,6 @@ public class ProxyRollout extends Rollout {
this.modifiedDate = modifiedDate;
}
/**
* @return the createdBy
*/
public String getCreatedBy() {
return createdBy;
}
/**
* @param createdBy
* the createdBy to set
*/
public void setCreatedBy(final String createdBy) {
this.createdBy = createdBy;
}
/**
* @return the lastModifiedBy
*/
public String getLastModifiedBy() {
return lastModifiedBy;
}
/**
* @param lastModifiedBy
* the lastModifiedBy to set
*/
public void setLastModifiedBy(final String lastModifiedBy) {
this.lastModifiedBy = lastModifiedBy;
}
/**
* @return the runningTargetsCount
*/

View File

@@ -22,10 +22,6 @@ public class ProxyRolloutGroup extends RolloutGroup {
private String modifiedDate;
private String createdBy;
private String lastModifiedBy;
private String finishedPercentage;
private Long runningTargetsCount;
@@ -74,36 +70,6 @@ public class ProxyRolloutGroup extends RolloutGroup {
this.modifiedDate = modifiedDate;
}
/**
* @return the createdBy
*/
public String getCreatedBy() {
return createdBy;
}
/**
* @param createdBy
* the createdBy to set
*/
public void setCreatedBy(final String createdBy) {
this.createdBy = createdBy;
}
/**
* @return the lastModifiedBy
*/
public String getLastModifiedBy() {
return lastModifiedBy;
}
/**
* @param lastModifiedBy
* the lastModifiedBy to set
*/
public void setLastModifiedBy(final String lastModifiedBy) {
this.lastModifiedBy = lastModifiedBy;
}
/**
* @return the finishedPercentage
*/

View File

@@ -53,6 +53,7 @@ public class RolloutGroupTargetsListHeader extends AbstractSimpleTableHeader {
private Button rolloutsGroupViewLink;
private Label headerCaption;
@Override
@PostConstruct
protected void init() {
super.init();
@@ -78,8 +79,8 @@ public class RolloutGroupTargetsListHeader extends AbstractSimpleTableHeader {
headerCaption.setCaption(rolloutGroup.getName());
}
rolloutsGroupViewLink.setCaption(rolloutUiState.getRolloutName().isPresent() ? rolloutUiState.getRolloutName()
.get() : "");
rolloutsGroupViewLink
.setCaption(rolloutUiState.getRolloutName().isPresent() ? rolloutUiState.getRolloutName().get() : "");
}
@Override
@@ -103,9 +104,7 @@ public class RolloutGroupTargetsListHeader extends AbstractSimpleTableHeader {
@Override
protected void searchBy(final String newSearchText) {
/**
* No implementation required.
*/
// No implementation required.
}
@@ -162,12 +161,6 @@ public class RolloutGroupTargetsListHeader extends AbstractSimpleTableHeader {
return false;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#
* getHeaderCaptionLayout()
*/
@Override
protected HorizontalLayout getHeaderCaptionLayout() {
headerCaption = SPUIComponentProvider.getLabel("", SPUILabelDefinitions.SP_WIDGET_CAPTION);
@@ -204,12 +197,6 @@ public class RolloutGroupTargetsListHeader extends AbstractSimpleTableHeader {
eventBus.publish(this, RolloutEvent.SHOW_ROLLOUTS);
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#restoreCaption()
*/
@Override
protected void restoreCaption() {
setCaptionDetails();

View File

@@ -61,6 +61,7 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
@Autowired
private transient RolloutUIState rolloutUIState;
@Override
@PostConstruct
protected void init() {
super.init();
@@ -88,8 +89,8 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
columnList.add(new TableColumn(SPUILabelDefinitions.VAR_CREATED_DATE, i18n.get("header.createdDate"), 0.15f));
columnList
.add(new TableColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY, i18n.get("header.modifiedBy"), 0.15f));
columnList.add(new TableColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_DATE, i18n.get("header.modifiedDate"),
0.15f));
columnList.add(
new TableColumn(SPUILabelDefinitions.VAR_LAST_MODIFIED_DATE, i18n.get("header.modifiedDate"), 0.15f));
columnList.add(new TableColumn(SPUILabelDefinitions.VAR_DESC, i18n.get("header.description"), 0.15f));
columnList.add(new TableColumn(SPUILabelDefinitions.VAR_TARGET_STATUS, i18n.get("header.status"), 0.1f));
@@ -101,15 +102,16 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
protected Container createContainer() {
final BeanQueryFactory<RolloutGroupTargetsBeanQuery> rolloutgrouBeanQueryFactory = new BeanQueryFactory<>(
RolloutGroupTargetsBeanQuery.class);
return new LazyQueryContainer(new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE,
SPUILabelDefinitions.VAR_ID), rolloutgrouBeanQueryFactory);
return new LazyQueryContainer(
new LazyQueryDefinition(true, SPUIDefinitions.PAGE_SIZE, SPUILabelDefinitions.VAR_ID),
rolloutgrouBeanQueryFactory);
}
@Override
protected void addContainerProperties(final Container container) {
final LazyQueryContainer rolloutGroupTargetTableContainer = (LazyQueryContainer) container;
rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_CONT_ID, String.class, "",
false, false);
rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_CONT_ID, String.class, "", false,
false);
rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_NAME, String.class, "", false,
true);
rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_STATUS, Status.class,
@@ -124,10 +126,10 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
false, true);
rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_LAST_MODIFIED_BY, String.class,
null, false, true);
rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_CREATED_DATE, String.class,
rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_CREATED_DATE, String.class, null,
false, true);
rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_LAST_MODIFIED_DATE, String.class,
null, false, true);
rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_LAST_MODIFIED_DATE,
String.class, null, false, true);
rolloutGroupTargetTableContainer.addContainerProperty(SPUILabelDefinitions.VAR_DESC, String.class, "", false,
true);
}
@@ -140,23 +142,20 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
@Override
protected void onValueChange() {
/**
* No implementation required.
*/
// No implementation required.
}
@Override
protected void addCustomGeneratedColumns() {
addGeneratedColumn(SPUILabelDefinitions.VAR_TARGET_STATUS, (source, itemId, columnId) -> getStatusLabel(itemId));
addGeneratedColumn(SPUILabelDefinitions.VAR_TARGET_STATUS,
(source, itemId, columnId) -> getStatusLabel(itemId));
setColumnAlignment(SPUILabelDefinitions.VAR_TARGET_STATUS, Align.CENTER);
}
@Override
protected void setCollapsiblecolumns() {
/**
* No implementation required.
*/
// No implementation required.
}
private Label getStatusLabel(final Object itemId) {
@@ -171,8 +170,8 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
private void setStatusIcon(final Object itemId, final Label statusLabel) {
final Item item = getItem(itemId);
final RolloutGroup rolloutGroup = rolloutUIState.getRolloutGroup().isPresent() ? rolloutUIState
.getRolloutGroup().get() : null;
final RolloutGroup rolloutGroup = rolloutUIState.getRolloutGroup().isPresent()
? rolloutUIState.getRolloutGroup().get() : null;
if (item != null) {
final Status status = (Status) item.getItemProperty(SPUILabelDefinitions.VAR_STATUS).getValue();
if (status == null) {
@@ -184,10 +183,10 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
statusLabel.setValue(FontAwesome.MINUS_CIRCLE.getHtml());
statusLabel.addStyleName("statusIconBlue");
final String dsNameVersion = (String) item.getItemProperty(
SPUILabelDefinitions.ASSIGNED_DISTRIBUTION_NAME_VER).getValue();
statusLabel.setDescription(i18n
.get("message.dist.already.assigned", new Object[] { dsNameVersion }));
final String dsNameVersion = (String) item
.getItemProperty(SPUILabelDefinitions.ASSIGNED_DISTRIBUTION_NAME_VER).getValue();
statusLabel
.setDescription(i18n.get("message.dist.already.assigned", new Object[] { dsNameVersion }));
}
} else {
setRolloutStatusIcon(status, statusLabel);
@@ -197,36 +196,36 @@ public class RolloutGroupTargetsListTable extends AbstractSimpleTable {
}
private void setRolloutStatusIcon(final Status targetUpdateStatus, final Label statusLabel) {
switch (targetUpdateStatus) {
case ERROR:
statusLabel.setValue(FontAwesome.EXCLAMATION_CIRCLE.getHtml());
statusLabel.addStyleName("statusIconRed");
break;
case SCHEDULED:
statusLabel.setValue(FontAwesome.BULLSEYE.getHtml());
statusLabel.addStyleName("statusIconBlue");
break;
case FINISHED:
statusLabel.setValue(FontAwesome.CHECK_CIRCLE.getHtml());
statusLabel.addStyleName("statusIconGreen");
break;
case RUNNING:
case RETRIEVED:
case WARNING:
case DOWNLOAD:
statusLabel.setValue(FontAwesome.ADJUST.getHtml());
statusLabel.addStyleName("statusIconYellow");
break;
case CANCELED:
statusLabel.setValue(FontAwesome.TIMES_CIRCLE.getHtml());
statusLabel.addStyleName("statusIconGreen");
break;
case CANCELING:
statusLabel.setValue(FontAwesome.TIMES_CIRCLE.getHtml());
statusLabel.addStyleName("statusIconPending");
break;
default:
break;
}
switch (targetUpdateStatus) {
case ERROR:
statusLabel.setValue(FontAwesome.EXCLAMATION_CIRCLE.getHtml());
statusLabel.addStyleName("statusIconRed");
break;
case SCHEDULED:
statusLabel.setValue(FontAwesome.BULLSEYE.getHtml());
statusLabel.addStyleName("statusIconBlue");
break;
case FINISHED:
statusLabel.setValue(FontAwesome.CHECK_CIRCLE.getHtml());
statusLabel.addStyleName("statusIconGreen");
break;
case RUNNING:
case RETRIEVED:
case WARNING:
case DOWNLOAD:
statusLabel.setValue(FontAwesome.ADJUST.getHtml());
statusLabel.addStyleName("statusIconYellow");
break;
case CANCELED:
statusLabel.setValue(FontAwesome.TIMES_CIRCLE.getHtml());
statusLabel.addStyleName("statusIconGreen");
break;
case CANCELING:
statusLabel.setValue(FontAwesome.TIMES_CIRCLE.getHtml());
statusLabel.addStyleName("statusIconPending");
break;
default:
break;
}
}
}

View File

@@ -52,6 +52,7 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
private Label headerCaption;
@Override
@PostConstruct
protected void init() {
super.init();
@@ -71,54 +72,42 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
}
private void setCaptionDetails() {
headerCaption.setCaption(rolloutUiState.getRolloutName().isPresent() ? rolloutUiState.getRolloutName().get()
: "");
headerCaption
.setCaption(rolloutUiState.getRolloutName().isPresent() ? rolloutUiState.getRolloutName().get() : "");
}
@Override
protected void resetSearchText() {
/**
* No implementation required.
*/
// No implementation required.
}
@Override
protected String getSearchBoxId() {
/**
* No implementation required.
*/
// No implementation required.
return null;
}
@Override
protected String getSearchRestIconId() {
/**
* No implementation required.
*/
// No implementation required.
return null;
}
@Override
protected void searchBy(final String newSearchText) {
/**
* No implementation required.
*/
// No implementation required.
}
@Override
protected String getAddIconId() {
/**
* No implementation required.
*/
// No implementation required.
return null;
}
@Override
protected void addNewItem(final ClickEvent event) {
/**
* No implementation required.
*/
// No implementation required.
}
@Override
@@ -129,7 +118,6 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
@Override
protected boolean hasCreatePermission() {
return true;
}
@@ -140,7 +128,6 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
@Override
protected boolean showCloseButton() {
return true;
}
@@ -159,12 +146,6 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
return false;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#
* getHeaderCaptionLayout()
*/
@Override
protected HorizontalLayout getHeaderCaptionLayout() {
headerCaption = SPUIComponentProvider.getLabel("", SPUILabelDefinitions.SP_WIDGET_CAPTION);
@@ -184,12 +165,6 @@ public class RolloutGroupsListHeader extends AbstractSimpleTableHeader {
return headerCaptionLayout;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#restoreCaption()
*/
@Override
protected void restoreCaption() {
setCaptionDetails();

View File

@@ -50,9 +50,7 @@ public class RolloutListHeader extends AbstractSimpleTableHeader {
@Autowired
private AddUpdateRolloutWindowLayout addUpdateRolloutWindow;
/**
* Initialization of Target Header Component.
*/
@Override
@PostConstruct
protected void init() {
super.init();
@@ -101,9 +99,7 @@ public class RolloutListHeader extends AbstractSimpleTableHeader {
@Override
protected void onClose(final ClickEvent event) {
/**
* No implementation required.
*/
// No implementation required.
}
@Override
@@ -133,16 +129,9 @@ public class RolloutListHeader extends AbstractSimpleTableHeader {
@Override
protected boolean isRollout() {
return true;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#
* getHeaderCaptionLayout()
*/
@Override
protected HorizontalLayout getHeaderCaptionLayout() {
final Label headerCaption = SPUIComponentProvider.getLabel(getHeaderCaption(),
@@ -153,17 +142,9 @@ public class RolloutListHeader extends AbstractSimpleTableHeader {
return headerCaptionLayout;
}
/*
* (non-Javadoc)
*
* @see
* org.eclipse.hawkbit.ui.rollout.AbstractSimpleTableHeader#restoreCaption()
*/
@Override
protected void restoreCaption() {
/**
* No implementation required.
*/
// No implementation required.
}
}