From d05b5ebc1f22cbd80e82426ed7ec34517aa26cc0 Mon Sep 17 00:00:00 2001 From: SirWayne Date: Thu, 18 Aug 2016 11:15:00 +0200 Subject: [PATCH] Rename builder methode for TextComponent. Fix to set textfield ids. Signed-off-by: SirWayne --- .../smtable/SoftwareModuleAddUpdateWindow.java | 4 ++-- .../smtype/CreateUpdateSoftwareTypeLayout.java | 10 +++++----- .../ui/artifacts/upload/UploadConfirmationWindow.java | 2 +- .../hawkbit/ui/common/AbstractMetadataPopupLayout.java | 4 ++-- .../ui/common/builder/AbstractTextFieldBuilder.java | 2 +- .../hawkbit/ui/common/builder/TextFieldBuilder.java | 2 +- .../disttype/CreateUpdateDistSetTypeLayout.java | 6 +++--- .../filtermanagement/CreateOrUpdateFilterHeader.java | 4 ++-- .../ui/layouts/AbstractCreateUpdateTagLayout.java | 4 ++-- .../dstable/DistributionAddUpdateWindowLayout.java | 4 ++-- .../targettable/TargetAddUpdateWindowLayout.java | 4 ++-- .../targettable/TargetBulkUpdateWindowLayout.java | 2 +- .../rollout/rollout/AddUpdateRolloutWindowLayout.java | 6 +++--- .../CertificateAuthenticationConfigurationItem.java | 2 +- ...aySecurityTokenAuthenticationConfigurationItem.java | 2 +- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java index 25d579717..a437c0039 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java @@ -130,7 +130,7 @@ public class SoftwareModuleAddUpdateWindow extends CustomComponent implements Se descTextArea = new TextAreaBuilder().caption(i18n.get("textfield.description")).style("text-area-style") .prompt(i18n.get("textfield.description")).id(SPUIComponentIdProvider.ADD_SW_MODULE_DESCRIPTION) - .buildTextField(); + .buildTextComponent(); typeComboBox = SPUIComponentProvider.getComboBox(i18n.get("upload.swmodule.type"), "", "", null, null, true, 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) { 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() { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java index e1c665751..d3dfd8f5b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java @@ -81,22 +81,22 @@ public class CreateUpdateSoftwareTypeLayout extends CreateUpdateTypeLayout { 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")) .styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.TYPE_DESC) .prompt(i18n.get("textfield.description")).immediate(true).id(SPUIDefinitions.NEW_SOFTWARE_TYPE_DESC) - .buildTextField(); + .buildTextComponent(); tagDesc.setNullRepresentation(""); 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) - .required(true).prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextField(); + .required(true).prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextComponent(); } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationWindow.java index c89ad723b..d7270342d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationWindow.java @@ -262,7 +262,7 @@ public class UploadConfirmationWindow implements Button.ClickListener { } 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, diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java index c89dff4b6..9283af715 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractMetadataPopupLayout.java @@ -209,7 +209,7 @@ public abstract class AbstractMetadataPopupLayout onKeyChange(event)); keyField.setTextChangeEventMode(TextChangeEventMode.EAGER); keyField.setWidth("100%"); @@ -219,7 +219,7 @@ public abstract class AbstractMetadataPopupLayout { * * @return textfield */ - public E buildTextField() { + public E buildTextComponent() { final E textComponent = createTextComponent(); textComponent.setRequired(required); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextFieldBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextFieldBuilder.java index 3df7404d6..f4bb5f8e6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextFieldBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextFieldBuilder.java @@ -49,7 +49,7 @@ public class TextFieldBuilder extends AbstractTextFieldBuilder { * @return the textfield */ 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.addTextChangeListener(textChangeListener); textField.setTextChangeEventMode(TextChangeEventMode.LAZY); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java index 53d3b77c6..0363aaa6c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java @@ -96,13 +96,13 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout { tagDesc = new TextAreaBuilder().caption(i18n.get("textfield.description")) .styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.DIST_SET_TYPE_DESC) .prompt(i18n.get("textfield.description")).immediate(true) - .id(SPUIDefinitions.NEW_DISTRIBUTION_TYPE_DESC).buildTextField(); + .id(SPUIDefinitions.NEW_DISTRIBUTION_TYPE_DESC).buildTextComponent(); 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) - .required(true).prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextField(); + .required(true).prompt(i18n.get(in18Key)).immediate(true).id(id).buildTextComponent(); } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java index 7a5f6065e..b6f186188 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java @@ -252,7 +252,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button private TextField createNameTextField() { final TextField nameField = new TextFieldBuilder().caption(i18n.get("textfield.customfiltername")) .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.addTextChangeListener(this::onFilterNameChange); return nameField; @@ -452,7 +452,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button private static TextField createSearchField() { 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.setWidth(900.0F, Unit.PIXELS); textField.setTextChangeEventMode(TextChangeEventMode.LAZY); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java index 302a0b4a7..32b4eee0b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java @@ -156,12 +156,12 @@ public abstract class AbstractCreateUpdateTagLayout extends CustomComponent tagName = new TextFieldBuilder().caption(i18n.get("textfield.name")) .styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.TAG_NAME).required(true) .prompt(i18n.get("textfield.name")).immediate(true).id(SPUIDefinitions.NEW_TARGET_TAG_NAME) - .buildTextField(); + .buildTextComponent(); tagDesc = new TextAreaBuilder().caption(i18n.get("textfield.description")) .styleName(ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.TAG_DESC) .prompt(i18n.get("textfield.description")).immediate(true).id(SPUIDefinitions.NEW_TARGET_TAG_DESC) - .buildTextField(); + .buildTextComponent(); tagDesc.setNullRepresentation(""); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java index ff559e4ff..f41132f7e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java @@ -138,7 +138,7 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent { descTextArea = new TextAreaBuilder().caption(i18n.get("textfield.description")).style("text-area-style") .prompt(i18n.get("textfield.description")).immediate(true).id(SPUIComponentIdProvider.DIST_ADD_DESC) - .buildTextField(); + .buildTextComponent(); descTextArea.setNullRepresentation(""); 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) { 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(""); return buildTextField; } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java index 16fb745f7..753b9aea2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java @@ -87,13 +87,13 @@ public class TargetAddUpdateWindowLayout extends CustomComponent { descTextArea = new TextAreaBuilder().caption(i18n.get("textfield.description")).style("text-area-style") .prompt(i18n.get("textfield.description")).immediate(true).id(SPUIComponentIdProvider.TARGET_ADD_DESC) - .buildTextField(); + .buildTextComponent(); descTextArea.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY); } private TextField createTextField(final String in18Key, final String id) { 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() { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java index 52764c1bf..4c225492f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java @@ -196,7 +196,7 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent { private TextArea getDescriptionTextArea() { final TextArea description = new TextAreaBuilder().caption(i18n.get("textfield.description")) .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.setWidth("100%"); return description; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java index 193771ff6..b685f770b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java @@ -265,7 +265,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout { } 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) { @@ -316,7 +316,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout { private static TextArea createTargetFilterQuery() { final TextArea filterField = new TextAreaBuilder().style("text-area-style") .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.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY); @@ -517,7 +517,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout { private TextArea createDescription() { final TextArea descriptionField = new TextAreaBuilder().style("text-area-style") .prompt(i18n.get("textfield.description")).id(SPUIComponentIdProvider.ROLLOUT_DESCRIPTION_ID) - .buildTextField(); + .buildTextComponent(); descriptionField.setNullRepresentation(HawkbitCommonUtil.SP_STRING_EMPTY); descriptionField.setSizeUndefined(); return descriptionField; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java index 50b3a33a5..c50b9f8fb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java @@ -64,7 +64,7 @@ public class CertificateAuthenticationConfigurationItem extends AbstractAuthenti caRootAuthorityLabel.setDescription( "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.addTextChangeListener(event -> caRootAuthorityChanged()); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java index 28cf7e242..300e6186e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java @@ -75,7 +75,7 @@ public class GatewaySecurityTokenAuthenticationConfigurationItem extends Abstrac detailLayout = new VerticalLayout(); 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 gatewayTokenNameTextField.setVisible(false); gatewayTokenNameTextField.addTextChangeListener(event -> doKeyNameChanged());