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

Rename builder methode for TextComponent. Fix to set textfield ids.

Browse Source 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
SirWayne
2016-08-18 11:15:00 +02:00
parent b409e831f1
commit d05b5ebc1f
15 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent implements Se
descTextArea = new TextAreaBuilder().caption(i18n.get("textfield.description")).style("text-area-style") descTextArea = new TextAreaBuilder().caption(i18n.get("textfield.description")).style("text-area-style")
.prompt(i18n.get("textfield.description")).id(SPUIComponentIdProvider.ADD_SW_MODULE_DESCRIPTION) .prompt(i18n.get("textfield.description")).id(SPUIComponentIdProvider.ADD_SW_MODULE_DESCRIPTION)
.buildTextField(); .buildTextComponent();
typeComboBox = SPUIComponentProvider.getComboBox(i18n.get("upload.swmodule.type"), "", "", null, null, true, typeComboBox = SPUIComponentProvider.getComboBox(i18n.get("upload.swmodule.type"), "", "", null, null, true,
null, i18n.get("upload.swmodule.type")); null, i18n.get("upload.swmodule.type"));
@@ -143,7 +143,7 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent implements Se
private TextField createTextField(final String in18Key, final String id) { private TextField createTextField(final String in18Key, final String id) {
return new TextFieldBuilder().caption(i18n.get(in18Key)).required(true).prompt(i18n.get(in18Key)) return new TextFieldBuilder().caption(i18n.get(in18Key)).required(true).prompt(i18n.get(in18Key))
.immediate(true).id(id).buildTextField(); .immediate(true).id(id).buildTextComponent();
} }
private void populateTypeNameCombo() { private void populateTypeNameCombo() {

10
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
View File

@@ -81,22 +81,22 @@ public class CreateUpdateSoftwareTypeLayout extends CreateUpdateTypeLayout {
multiAssign = new LabelBuilder().name(multiAssignStr).buildLabel(); multiAssign = new LabelBuilder().name(multiAssignStr).buildLabel();
tagName = createTextField("textfield.name", SPUIDefinitions.NEW_SOFTWARE_TYPE_NAME, SPUIDefinitions.TYPE_NAME); tagName = createTextField("textfield.name", SPUIDefinitions.TYPE_NAME, SPUIDefinitions.NEW_SOFTWARE_TYPE_NAME);
typeKey = createTextField("textfield.key", SPUIDefinitions.NEW_SOFTWARE_TYPE_KEY, SPUIDefinitions.TYPE_KEY); typeKey = createTextField("textfield.key", SPUIDefinitions.TYPE_KEY, SPUIDefinitions.NEW_SOFTWARE_TYPE_KEY);
tagDesc = new TextAreaBuilder().caption(i18n.get("textfield.description")) tagDesc = new TextAreaBuilder().caption(i18n.get("textfield.description"))
.styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.TYPE_DESC) .styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.TYPE_DESC)
.prompt(i18n.get("textfield.description")).immediate(true).id(SPUIDefinitions.NEW_SOFTWARE_TYPE_DESC) .prompt(i18n.get("textfield.description")).immediate(true).id(SPUIDefinitions.NEW_SOFTWARE_TYPE_DESC)
.buildTextField(); .buildTextComponent();
tagDesc.setNullRepresentation(""); tagDesc.setNullRepresentation("");
singleMultiOptionGroup(); singleMultiOptionGroup();
} }
private TextField createTextField(final String in18Key, final String id, final String styleName) { private TextField createTextField(final String in18Key, final String styleName, final String id) {
return new TextFieldBuilder().caption(i18n.get(in18Key)).styleName(ValoTheme.TEXTFIELD_TINY + " " + styleName) return new TextFieldBuilder().caption(i18n.get(in18Key)).styleName(ValoTheme.TEXTFIELD_TINY + " " + styleName)
.required(true).prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextField(); .required(true).prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextComponent();
} }
@Override @Override

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationWindow.java
View File

@@ -262,7 +262,7 @@ public class UploadConfirmationWindow implements Button.ClickListener {
} }
private static TextField createTextField(final String id) { private static TextField createTextField(final String id) {
return new TextFieldBuilder().immediate(true).id(id).buildTextField(); return new TextFieldBuilder().immediate(true).id(id).buildTextComponent();
} }
private void addFileNameLayout(final Item newItem, final String baseSoftwareModuleNameVersion, private void addFileNameLayout(final Item newItem, final String baseSoftwareModuleNameVersion,

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java
View File

@@ -209,7 +209,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
private TextField createKeyTextField() { private TextField createKeyTextField() {
final TextField keyField = new TextFieldBuilder().caption(i18n.get("textfield.key")).required(true) final TextField keyField = new TextFieldBuilder().caption(i18n.get("textfield.key")).required(true)
.prompt(i18n.get("textfield.key")).immediate(true).id(SPUIComponentIdProvider.METADATA_KEY_FIELD_ID) .prompt(i18n.get("textfield.key")).immediate(true).id(SPUIComponentIdProvider.METADATA_KEY_FIELD_ID)
.maxLengthAllowed(128).buildTextField(); .maxLengthAllowed(128).buildTextComponent();
keyField.addTextChangeListener(event -> onKeyChange(event)); keyField.addTextChangeListener(event -> onKeyChange(event));
keyField.setTextChangeEventMode(TextChangeEventMode.EAGER); keyField.setTextChangeEventMode(TextChangeEventMode.EAGER);
keyField.setWidth("100%"); keyField.setWidth("100%");
@@ -219,7 +219,7 @@ public abstract class AbstractMetadataPopupLayout<E extends NamedVersionedEntity
private TextArea createValueTextField() { private TextArea createValueTextField() {
valueTextArea = new TextAreaBuilder().caption(i18n.get("textfield.value")).required(true) valueTextArea = new TextAreaBuilder().caption(i18n.get("textfield.value")).required(true)
.prompt(i18n.get("textfield.value")).immediate(true).id(SPUIComponentIdProvider.METADATA_VALUE_ID) .prompt(i18n.get("textfield.value")).immediate(true).id(SPUIComponentIdProvider.METADATA_VALUE_ID)
.maxLengthAllowed(4000).buildTextField(); .maxLengthAllowed(4000).buildTextComponent();
valueTextArea.setNullRepresentation(""); valueTextArea.setNullRepresentation("");
valueTextArea.setSizeFull(); valueTextArea.setSizeFull();
valueTextArea.setHeight(100, Unit.PERCENTAGE); valueTextArea.setHeight(100, Unit.PERCENTAGE);

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/AbstractTextFieldBuilder.java
View File

@@ -114,7 +114,7 @@ public abstract class AbstractTextFieldBuilder<E extends AbstractTextField> {
* *
* @return textfield * @return textfield
*/ */
public E buildTextField() { public E buildTextComponent() {
final E textComponent = createTextComponent(); final E textComponent = createTextComponent();
textComponent.setRequired(required); textComponent.setRequired(required);

2
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextFieldBuilder.java
View File

@@ -49,7 +49,7 @@ public class TextFieldBuilder extends AbstractTextFieldBuilder<TextField> {
* @return the textfield * @return the textfield
*/ */
public TextField createSearchField(final TextChangeListener textChangeListener) { public TextField createSearchField(final TextChangeListener textChangeListener) {
final TextField textField = style("filter-box").styleName("text-style filter-box-hide").buildTextField(); final TextField textField = style("filter-box").styleName("text-style filter-box-hide").buildTextComponent();
textField.setWidth(100.0F, Unit.PERCENTAGE); textField.setWidth(100.0F, Unit.PERCENTAGE);
textField.addTextChangeListener(textChangeListener); textField.addTextChangeListener(textChangeListener);
textField.setTextChangeEventMode(TextChangeEventMode.LAZY); textField.setTextChangeEventMode(TextChangeEventMode.LAZY);

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
View File

@@ -96,13 +96,13 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout {
tagDesc = new TextAreaBuilder().caption(i18n.get("textfield.description")) tagDesc = new TextAreaBuilder().caption(i18n.get("textfield.description"))
.styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.DIST_SET_TYPE_DESC) .styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.DIST_SET_TYPE_DESC)
.prompt(i18n.get("textfield.description")).immediate(true) .prompt(i18n.get("textfield.description")).immediate(true)
.id(SPUIDefinitions.NEW_DISTRIBUTION_TYPE_DESC).buildTextField(); .id(SPUIDefinitions.NEW_DISTRIBUTION_TYPE_DESC).buildTextComponent();
tagDesc.setNullRepresentation(""); tagDesc.setNullRepresentation("");
} }
private TextField createTextField(final String in18Key, final String id, final String styleName) { private TextField createTextField(final String in18Key, final String styleName, final String id) {
return new TextFieldBuilder().caption(i18n.get(in18Key)).styleName(ValoTheme.TEXTFIELD_TINY + " " + styleName) return new TextFieldBuilder().caption(i18n.get(in18Key)).styleName(ValoTheme.TEXTFIELD_TINY + " " + styleName)
.required(true).prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextField(); .required(true).prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextComponent();
} }
@Override @Override

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
View File

@@ -252,7 +252,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
private TextField createNameTextField() { private TextField createNameTextField() {
final TextField nameField = new TextFieldBuilder().caption(i18n.get("textfield.customfiltername")) final TextField nameField = new TextFieldBuilder().caption(i18n.get("textfield.customfiltername"))
.prompt(i18n.get("textfield.customfiltername")).immediate(true) .prompt(i18n.get("textfield.customfiltername")).immediate(true)
.id(SPUIComponentIdProvider.CUSTOM_FILTER_ADD_NAME).buildTextField(); .id(SPUIComponentIdProvider.CUSTOM_FILTER_ADD_NAME).buildTextComponent();
nameField.setPropertyDataSource(nameLabel); nameField.setPropertyDataSource(nameLabel);
nameField.addTextChangeListener(this::onFilterNameChange); nameField.addTextChangeListener(this::onFilterNameChange);
return nameField; return nameField;
@@ -452,7 +452,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
private static TextField createSearchField() { private static TextField createSearchField() {
final TextField textField = new TextFieldBuilder().immediate(true).id("custom.query.text.Id") final TextField textField = new TextFieldBuilder().immediate(true).id("custom.query.text.Id")
.maxLengthAllowed(SPUILabelDefinitions.TARGET_FILTER_QUERY_TEXT_FIELD_LENGTH).buildTextField(); .maxLengthAllowed(SPUILabelDefinitions.TARGET_FILTER_QUERY_TEXT_FIELD_LENGTH).buildTextComponent();
textField.addStyleName("target-filter-textfield"); textField.addStyleName("target-filter-textfield");
textField.setWidth(900.0F, Unit.PIXELS); textField.setWidth(900.0F, Unit.PIXELS);
textField.setTextChangeEventMode(TextChangeEventMode.LAZY); textField.setTextChangeEventMode(TextChangeEventMode.LAZY);

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
View File

@@ -156,12 +156,12 @@ public abstract class AbstractCreateUpdateTagLayout extends CustomComponent
tagName = new TextFieldBuilder().caption(i18n.get("textfield.name")) tagName = new TextFieldBuilder().caption(i18n.get("textfield.name"))
.styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.TAG_NAME).required(true) .styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.TAG_NAME).required(true)
.prompt(i18n.get("textfield.name")).immediate(true).id(SPUIDefinitions.NEW_TARGET_TAG_NAME) .prompt(i18n.get("textfield.name")).immediate(true).id(SPUIDefinitions.NEW_TARGET_TAG_NAME)
.buildTextField(); .buildTextComponent();
tagDesc = new TextAreaBuilder().caption(i18n.get("textfield.description")) tagDesc = new TextAreaBuilder().caption(i18n.get("textfield.description"))
.styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.TAG_DESC) .styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.TAG_DESC)
.prompt(i18n.get("textfield.description")).immediate(true).id(SPUIDefinitions.NEW_TARGET_TAG_DESC) .prompt(i18n.get("textfield.description")).immediate(true).id(SPUIDefinitions.NEW_TARGET_TAG_DESC)
.buildTextField(); .buildTextComponent();
tagDesc.setNullRepresentation(""); tagDesc.setNullRepresentation("");

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
View File

@@ -138,7 +138,7 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
descTextArea = new TextAreaBuilder().caption(i18n.get("textfield.description")).style("text-area-style") descTextArea = new TextAreaBuilder().caption(i18n.get("textfield.description")).style("text-area-style")
.prompt(i18n.get("textfield.description")).immediate(true).id(SPUIComponentIdProvider.DIST_ADD_DESC) .prompt(i18n.get("textfield.description")).immediate(true).id(SPUIComponentIdProvider.DIST_ADD_DESC)
.buildTextField(); .buildTextComponent();
descTextArea.setNullRepresentation(""); descTextArea.setNullRepresentation("");
reqMigStepCheckbox = SPUIComponentProvider.getCheckBox(i18n.get("checkbox.dist.required.migration.step"), reqMigStepCheckbox = SPUIComponentProvider.getCheckBox(i18n.get("checkbox.dist.required.migration.step"),
@@ -149,7 +149,7 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
private TextField createTextField(final String in18Key, final String id) { private TextField createTextField(final String in18Key, final String id) {
final TextField buildTextField = new TextFieldBuilder().caption(i18n.get(in18Key)).required(true) final TextField buildTextField = new TextFieldBuilder().caption(i18n.get(in18Key)).required(true)
.prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextField(); .prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextComponent();
buildTextField.setNullRepresentation(""); buildTextField.setNullRepresentation("");
return buildTextField; return buildTextField;
} }

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
View File

@@ -87,13 +87,13 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
descTextArea = new TextAreaBuilder().caption(i18n.get("textfield.description")).style("text-area-style") descTextArea = new TextAreaBuilder().caption(i18n.get("textfield.description")).style("text-area-style")
.prompt(i18n.get("textfield.description")).immediate(true).id(SPUIComponentIdProvider.TARGET_ADD_DESC) .prompt(i18n.get("textfield.description")).immediate(true).id(SPUIComponentIdProvider.TARGET_ADD_DESC)
.buildTextField(); .buildTextComponent();
descTextArea.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY); descTextArea.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
} }
private TextField createTextField(final String in18Key, final String id) { private TextField createTextField(final String in18Key, final String id) {
return new TextFieldBuilder().caption(i18n.get(in18Key)).required(true).prompt(i18n.get(in18Key)) return new TextFieldBuilder().caption(i18n.get(in18Key)).required(true).prompt(i18n.get(in18Key))
.immediate(true).id(id).buildTextField(); .immediate(true).id(id).buildTextComponent();
} }
private void buildLayout() { private void buildLayout() {

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

@@ -196,7 +196,7 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent {
private TextArea getDescriptionTextArea() { private TextArea getDescriptionTextArea() {
final TextArea description = new TextAreaBuilder().caption(i18n.get("textfield.description")) final TextArea description = new TextAreaBuilder().caption(i18n.get("textfield.description"))
.style("text-area-style").prompt(i18n.get("textfield.description")).immediate(true) .style("text-area-style").prompt(i18n.get("textfield.description")).immediate(true)
.id(SPUIComponentIdProvider.BULK_UPLOAD_DESC).buildTextField(); .id(SPUIComponentIdProvider.BULK_UPLOAD_DESC).buildTextComponent();
description.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY); description.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
description.setWidth("100%"); description.setWidth("100%");
return description; return description;

6
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
View File

@@ -265,7 +265,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
} }
private TextField createTextField(final String in18Key, final String id) { private TextField createTextField(final String in18Key, final String id) {
return new TextFieldBuilder().prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextField(); return new TextFieldBuilder().prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextComponent();
} }
private TextField createIntegerTextField(final String in18Key, final String id) { private TextField createIntegerTextField(final String in18Key, final String id) {
@@ -316,7 +316,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
private static TextArea createTargetFilterQuery() { private static TextArea createTargetFilterQuery() {
final TextArea filterField = new TextAreaBuilder().style("text-area-style") final TextArea filterField = new TextAreaBuilder().style("text-area-style")
.id(SPUIComponentIdProvider.ROLLOUT_TARGET_FILTER_QUERY_FIELD) .id(SPUIComponentIdProvider.ROLLOUT_TARGET_FILTER_QUERY_FIELD)
.maxLengthAllowed(SPUILabelDefinitions.TARGET_FILTER_QUERY_TEXT_FIELD_LENGTH).buildTextField(); .maxLengthAllowed(SPUILabelDefinitions.TARGET_FILTER_QUERY_TEXT_FIELD_LENGTH).buildTextComponent();
filterField.setId(SPUIComponentIdProvider.ROLLOUT_TARGET_FILTER_QUERY_FIELD); filterField.setId(SPUIComponentIdProvider.ROLLOUT_TARGET_FILTER_QUERY_FIELD);
filterField.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY); filterField.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
@@ -517,7 +517,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
private TextArea createDescription() { private TextArea createDescription() {
final TextArea descriptionField = new TextAreaBuilder().style("text-area-style") final TextArea descriptionField = new TextAreaBuilder().style("text-area-style")
.prompt(i18n.get("textfield.description")).id(SPUIComponentIdProvider.ROLLOUT_DESCRIPTION_ID) .prompt(i18n.get("textfield.description")).id(SPUIComponentIdProvider.ROLLOUT_DESCRIPTION_ID)
.buildTextField(); .buildTextComponent();
descriptionField.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY); descriptionField.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY);
descriptionField.setSizeUndefined(); descriptionField.setSizeUndefined();
return descriptionField; return descriptionField;

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

@@ -64,7 +64,7 @@ public class CertificateAuthenticationConfigurationItem extends AbstractAuthenti
caRootAuthorityLabel.setDescription( caRootAuthorityLabel.setDescription(
"The SSL Issuer iRules.X509 hash, to validate against the controller request certifcate."); "The SSL Issuer iRules.X509 hash, to validate against the controller request certifcate.");
caRootAuthorityTextField = new TextFieldBuilder().immediate(true).maxLengthAllowed(128).buildTextField(); caRootAuthorityTextField = new TextFieldBuilder().immediate(true).maxLengthAllowed(128).buildTextComponent();
caRootAuthorityTextField.setWidth("500px"); caRootAuthorityTextField.setWidth("500px");
caRootAuthorityTextField.addTextChangeListener(event -> caRootAuthorityChanged()); caRootAuthorityTextField.addTextChangeListener(event -> caRootAuthorityChanged());

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

@@ -75,7 +75,7 @@ public class GatewaySecurityTokenAuthenticationConfigurationItem extends Abstrac
detailLayout = new VerticalLayout(); detailLayout = new VerticalLayout();
detailLayout.setImmediate(true); detailLayout.setImmediate(true);
gatewayTokenNameTextField = new TextFieldBuilder().immediate(true).buildTextField(); gatewayTokenNameTextField = new TextFieldBuilder().immediate(true).buildTextComponent();
// hide text field until we support multiple gateway tokens for a tenan // hide text field until we support multiple gateway tokens for a tenan
gatewayTokenNameTextField.setVisible(false); gatewayTokenNameTextField.setVisible(false);
gatewayTokenNameTextField.addTextChangeListener(event -> doKeyNameChanged()); gatewayTokenNameTextField.addTextChangeListener(event -> doKeyNameChanged());