Add missing field and checkbox id (#401)

* Add missing field and checkbox id Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
eclipse · Dec 22, 2016 · 4d35413 · 4d35413
1 parent 6aaade8
commit 4d35413
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/...ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java b/...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/...src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java b/...src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java
@@ -34,14 +34,16 @@ 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");
         this.setSpacing(true);
         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
@@ -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.
      */