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

Changed caption from checkbox to tooltip

Browse Source 
Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
This commit is contained in:
Nonnenmacher Fabian (INST-ICM/BSV-AS)
2016-02-26 15:07:10 +01:00
committed by Nonnenmacher Fabian
parent 4ca1bdf9ef
commit d183322522
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java
View File

@@ -91,13 +91,13 @@ public class PollingConfigurationView extends BaseConfigurationView
vLayout.addComponent(headerDisSetType); vLayout.addComponent(headerDisSetType);
fieldPollTime = DurationConfigField.builder().caption(i18n.get("configuration.polling.time")) fieldPollTime = DurationConfigField.builder().caption(i18n.get("configuration.polling.time"))
.checkBoxLabel(i18n.get("configuration.polling.custom.value")).range(minDuration, maxDuration) .checkBoxTooltip(i18n.get("configuration.polling.custom.value")).range(minDuration, maxDuration)
.globalDuration(globalPollTime).tenantDuration(tenantPollTime).build(); .globalDuration(globalPollTime).tenantDuration(tenantPollTime).build();
fieldPollTime.addChangeListener(this); fieldPollTime.addChangeListener(this);
vLayout.addComponent(fieldPollTime); vLayout.addComponent(fieldPollTime);
fieldPollingOverdueTime = DurationConfigField.builder().caption(i18n.get("configuration.polling.overduetime")) fieldPollingOverdueTime = DurationConfigField.builder().caption(i18n.get("configuration.polling.overduetime"))
.checkBoxLabel(i18n.get("configuration.polling.custom.value")).range(minDuration, maxDuration) .checkBoxTooltip(i18n.get("configuration.polling.custom.value")).range(minDuration, maxDuration)
.globalDuration(globalOverdueTime).tenantDuration(tenantOverdueTime).build(); .globalDuration(globalOverdueTime).tenantDuration(tenantOverdueTime).build();
fieldPollingOverdueTime.addChangeListener(this); fieldPollingOverdueTime.addChangeListener(this);
vLayout.addComponent(fieldPollingOverdueTime); vLayout.addComponent(fieldPollingOverdueTime);

20
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java
View File

@@ -4,16 +4,13 @@ import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
import org.eclipse.hawkbit.ui.tenantconfiguration.ConfigurationItem; import org.eclipse.hawkbit.ui.tenantconfiguration.ConfigurationItem;
import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.ui.Alignment; import com.vaadin.ui.Alignment;
import com.vaadin.ui.CheckBox; import com.vaadin.ui.CheckBox;
import com.vaadin.ui.GridLayout; import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
/** /**
* The DurationConfigField consists of three vaadin fields. A {@link #Label} * The DurationConfigField consists of three vaadin fields. A {@link #Label}
@@ -30,10 +27,9 @@ public class DurationConfigField extends GridLayout implements ValueChangeListen
private final CheckBox checkBox = new CheckBox(); private final CheckBox checkBox = new CheckBox();
private final DurationField durationField = new DurationField(); private final DurationField durationField = new DurationField();
private Duration globalDuration; private Duration globalDuration;
private final Label labelCustomValue;
private DurationConfigField() { private DurationConfigField() {
super(3, 2); super(2, 2);
this.addStyleName("duration-config-field"); this.addStyleName("duration-config-field");
this.setSpacing(true); this.setSpacing(true);
@@ -43,11 +39,7 @@ public class DurationConfigField extends GridLayout implements ValueChangeListen
this.addComponent(checkBox, 0, 0); this.addComponent(checkBox, 0, 0);
this.setComponentAlignment(checkBox, Alignment.MIDDLE_LEFT); this.setComponentAlignment(checkBox, Alignment.MIDDLE_LEFT);
labelCustomValue = SPUIComponentProvider.getLabel("", SPUILabelDefinitions.SP_LABEL_SIMPLE); this.addComponent(durationField, 1, 0);
this.addComponent(labelCustomValue, 1, 0);
this.setComponentAlignment(labelCustomValue, Alignment.MIDDLE_LEFT);
this.addComponent(durationField, 2, 0);
this.setComponentAlignment(durationField, Alignment.MIDDLE_LEFT); this.setComponentAlignment(durationField, Alignment.MIDDLE_LEFT);
checkBox.addValueChangeListener(this); checkBox.addValueChangeListener(this);
@@ -80,8 +72,8 @@ public class DurationConfigField extends GridLayout implements ValueChangeListen
this.setValue(tenantDuration); this.setValue(tenantDuration);
} }
private void setCheckboxLabel(final String label) { private void setCheckBoxTooltip(final String label) {
labelCustomValue.setValue(label); checkBox.setDescription(label);
} }
private void setAllowedRange(final Duration minimumDuration, final Duration maximumDuration) { private void setAllowedRange(final Duration minimumDuration, final Duration maximumDuration) {
@@ -148,8 +140,8 @@ public class DurationConfigField extends GridLayout implements ValueChangeListen
field = new DurationConfigField(); field = new DurationConfigField();
}; };
public DurationConfigFieldBuilder checkBoxLabel(final String label) { public DurationConfigFieldBuilder checkBoxTooltip(final String label) {
field.setCheckboxLabel(label); field.setCheckBoxTooltip(label);
return this; return this;
} }