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

Fixed sonar issues.

Browse Source 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
This commit is contained in:
Gaurav
2016-08-19 18:08:34 +02:00
parent fe113a4bc6
commit 86111ac70c
6 changed files with 12 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java
View File

@@ -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

14
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
View File

@@ -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()));

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java
View File

@@ -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

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java
View File

@@ -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

23
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/CreateUpdateTypeLayout.java
View File

@@ -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<E extends NamedEntity> 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) {

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java
View File

@@ -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