From 4d35413f71e8fdfabd0f9c7236b126a62c21ba9d Mon Sep 17 00:00:00 2001 From: Dennis Melzer Date: Thu, 22 Dec 2016 12:53:13 +0100 Subject: [PATCH] Add missing field and checkbox id (#401) * Add missing field and checkbox id Signed-off-by: SirWayne --- .../PollingConfigurationView.java | 7 +++++-- .../polling/DurationConfigField.java | 12 +++++++----- .../hawkbit/ui/utils/UIComponentIdProvider.java | 10 ++++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java index 0c791e87ff..bd70e78c9f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java @@ -17,6 +17,7 @@ import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey; import org.eclipse.hawkbit.ui.tenantconfiguration.polling.DurationConfigField; import org.eclipse.hawkbit.ui.utils.I18N; +import org.eclipse.hawkbit.ui.utils.UIComponentIdProvider; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; @@ -74,13 +75,15 @@ public class PollingConfigurationView extends BaseConfigurationView headerDisSetType.addStyleName("config-panel-header"); vLayout.addComponent(headerDisSetType); - fieldPollTime = DurationConfigField.builder().caption(i18n.get("configuration.polling.time")) + fieldPollTime = DurationConfigField.builder(UIComponentIdProvider.SYSTEM_CONFIGURATION_POLLING) + .caption(i18n.get("configuration.polling.time")) .checkBoxTooltip(i18n.get("configuration.polling.custom.value")).range(minDuration, maxDuration) .globalDuration(globalPollTime).tenantDuration(tenantPollTime).build(); fieldPollTime.addChangeListener(this); vLayout.addComponent(fieldPollTime); - fieldPollingOverdueTime = DurationConfigField.builder().caption(i18n.get("configuration.polling.overduetime")) + fieldPollingOverdueTime = DurationConfigField.builder(UIComponentIdProvider.SYSTEM_CONFIGURATION_OVERDUE) + .caption(i18n.get("configuration.polling.overduetime")) .checkBoxTooltip(i18n.get("configuration.polling.custom.value")).range(minDuration, maxDuration) .globalDuration(globalOverdueTime).tenantDuration(tenantOverdueTime).build(); fieldPollingOverdueTime.addChangeListener(this); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java index 9a3a54a5e4..497ebd3541 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java @@ -34,7 +34,7 @@ public final class DurationConfigField extends GridLayout implements Configurati private final DurationField durationField = new DurationField(); private Duration globalDuration; - private DurationConfigField() { + private DurationConfigField(final String id) { super(2, 2); this.addStyleName("duration-config-field"); @@ -42,6 +42,8 @@ private DurationConfigField() { this.setImmediate(true); this.setColumnExpandRatio(1, 1.0F); + durationField.setId(id + ".field"); + checkBox.setId(id + ".checkbox"); this.addComponent(checkBox, 0, 0); this.setComponentAlignment(checkBox, Alignment.MIDDLE_LEFT); @@ -135,8 +137,8 @@ public void addChangeListener(final ConfigurationItemChangeListener listener) { * * @return the builder */ - public static DurationConfigFieldBuilder builder() { - return new DurationConfigFieldBuilder(); + public static DurationConfigFieldBuilder builder(final String id) { + return new DurationConfigFieldBuilder(id); } /** @@ -149,8 +151,8 @@ public static final class DurationConfigFieldBuilder { private Duration globalDuration; private Duration tenantDuration; - private DurationConfigFieldBuilder() { - field = new DurationConfigField(); + private DurationConfigFieldBuilder(final String id) { + field = new DurationConfigField(id); } /** diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java index 003cbd24a0..b22a869c4f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java @@ -409,6 +409,16 @@ public final class UIComponentIdProvider { */ public static final String SYSTEM_CONFIGURATION_DEFAULTDIS_COMBOBOX = "default.disset.combobox"; + /** + * Polling system configuration. + */ + public static final String SYSTEM_CONFIGURATION_POLLING = "system.configuration.polling"; + + /** + * Overdue system configuration. + */ + public static final String SYSTEM_CONFIGURATION_OVERDUE = "system.configuration.ovderdue"; + /** * Button save id. */