From 86111ac70c1a72f6d5a271b665ea99b9ecc6a7e2 Mon Sep 17 00:00:00 2001 From: Gaurav Date: Fri, 19 Aug 2016 18:08:34 +0200 Subject: [PATCH] Fixed sonar issues. Signed-off-by: Gaurav --- .../smtable/SoftwareModuleTableHeader.java | 6 ++--- .../ui/common/table/AbstractTableHeader.java | 14 ----------- .../dstable/DistributionSetTableHeader.java | 6 ++--- .../smtable/SwModuleTableHeader.java | 6 ++--- .../ui/layouts/CreateUpdateTypeLayout.java | 23 ------------------- .../dstable/DistributionTableHeader.java | 6 ++--- 6 files changed, 12 insertions(+), 49 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java index d5629775c..93d217e4c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java @@ -53,17 +53,17 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader { @Override protected String getHeaderCaption() { - return softwareHeaderCaption; + return i18n.get("upload.swModuleTable.header"); } @Override protected String getSearchBoxId() { - return softwareSerachBoxId; + return SPUIComponentIdProvider.SW_MODULE_SEARCH_TEXT_FIELD; } @Override protected String getSearchRestIconId() { - return softwareSearchResetIcon; + return SPUIComponentIdProvider.SW_MODULE_SEARCH_RESET_ICON; } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java index 4e48b3eb7..8e7d0b025 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java @@ -19,7 +19,6 @@ import org.eclipse.hawkbit.ui.components.SPUIComponentProvider; import org.eclipse.hawkbit.ui.decorators.SPUIButtonStyleSmallNoBorder; import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil; import org.eclipse.hawkbit.ui.utils.I18N; -import org.eclipse.hawkbit.ui.utils.SPUIComponentIdProvider; import org.eclipse.hawkbit.ui.utils.SPUIDefinitions; import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions; import org.springframework.beans.factory.annotation.Autowired; @@ -69,13 +68,6 @@ public abstract class AbstractTableHeader extends VerticalLayout { private Button bulkUploadIcon; - protected String distributionHeaderCaption; - protected String softwareHeaderCaption; - protected String distributionSearchBoxId; - protected String softwareSerachBoxId; - protected String distributionSearchResetIcon; - protected String softwareSearchResetIcon; - /** * Initialze components. */ @@ -93,12 +85,6 @@ public abstract class AbstractTableHeader extends VerticalLayout { } private void createComponents() { - distributionHeaderCaption = i18n.get("header.dist.table"); - softwareHeaderCaption = i18n.get("upload.swModuleTable.header"); - distributionSearchBoxId = SPUIComponentIdProvider.DIST_SEARCH_TEXTFIELD; - softwareSerachBoxId = SPUIComponentIdProvider.SW_MODULE_SEARCH_TEXT_FIELD; - distributionSearchResetIcon = SPUIComponentIdProvider.DIST_SEARCH_ICON; - softwareSearchResetIcon = SPUIComponentIdProvider.SW_MODULE_SEARCH_RESET_ICON; headerCaption = createHeaderCaption(); searchField = new TextFieldBuilder(getSearchBoxId()).createSearchField(event -> searchBy(event.getText())); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java index e4f62ced0..8f392101f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java @@ -52,17 +52,17 @@ public class DistributionSetTableHeader extends AbstractTableHeader { @Override protected String getHeaderCaption() { - return distributionHeaderCaption; + return i18n.get("header.dist.table"); } @Override protected String getSearchBoxId() { - return distributionSearchBoxId; + return SPUIComponentIdProvider.DIST_SEARCH_TEXTFIELD; } @Override protected String getSearchRestIconId() { - return distributionSearchResetIcon; + return SPUIComponentIdProvider.DIST_SEARCH_ICON; } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java index 4dba93be1..89772bb1b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java @@ -52,17 +52,17 @@ public class SwModuleTableHeader extends AbstractTableHeader { @Override protected String getHeaderCaption() { - return softwareHeaderCaption; + return i18n.get("upload.swModuleTable.header"); } @Override protected String getSearchBoxId() { - return softwareSerachBoxId; + return SPUIComponentIdProvider.SW_MODULE_SEARCH_TEXT_FIELD; } @Override protected String getSearchRestIconId() { - return softwareSearchResetIcon; + return SPUIComponentIdProvider.SW_MODULE_SEARCH_RESET_ICON; } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/CreateUpdateTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/CreateUpdateTypeLayout.java index 9fdafbc01..51003fb58 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/CreateUpdateTypeLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/CreateUpdateTypeLayout.java @@ -21,12 +21,10 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.server.Page; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.ui.Button; -import com.vaadin.ui.OptionGroup; import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; import com.vaadin.ui.components.colorpicker.ColorChangeEvent; import com.vaadin.ui.components.colorpicker.ColorSelector; -import com.vaadin.ui.themes.ValoTheme; /** * Superclass defining common properties and methods for creating/updating @@ -187,27 +185,6 @@ public abstract class CreateUpdateTypeLayout extends Abst typeKey.addStyleName(SPUIDefinitions.TYPE_KEY); } - /** - * create option group with Create tag/Update tag based on permissions. - */ - @Override - protected void createOptionGroup(final boolean hasCreatePermission, final boolean hasUpdatePermission) { - - optiongroup = new OptionGroup("Select Action"); - optiongroup.setId(SPUIComponentIdProvider.OPTION_GROUP); - optiongroup.addStyleName(ValoTheme.OPTIONGROUP_SMALL); - optiongroup.addStyleName("custom-option-group"); - optiongroup.setNullSelectionAllowed(false); - - if (hasCreatePermission) { - optiongroup.addItem(createTagStr); - } - if (hasUpdatePermission) { - optiongroup.addItem(updateTagStr); - } - setOptionGroupDefaultValue(hasCreatePermission, hasUpdatePermission); - } - protected void setColorPickerComponentsColor(final String color) { if (null == color) { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java index e90eeece6..0e63ddb95 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java @@ -54,17 +54,17 @@ public class DistributionTableHeader extends AbstractTableHeader { @Override protected String getHeaderCaption() { - return distributionHeaderCaption; + return i18n.get("header.dist.table"); } @Override protected String getSearchBoxId() { - return distributionSearchBoxId; + return SPUIComponentIdProvider.DIST_SEARCH_TEXTFIELD; } @Override protected String getSearchRestIconId() { - return distributionSearchResetIcon; + return SPUIComponentIdProvider.DIST_SEARCH_ICON; } @Override