From c78e03fa5907845f745203da925f0264b1b3befc Mon Sep 17 00:00:00 2001 From: Pekka Hyvönen Date: Tue, 27 Nov 2012 11:39:32 +0200 Subject: Properly support setWidgetEnabled for OptionGroupBased Selects #8985, #8986, #8987 and #8989. Also fixes #7617 for OptionGroup, #9010 for TwinColSelect. Change-Id: Ia4c2a5e6ee93847970092fcb1cd685a0173897d7 --- .../components/select/OptionGroupBaseSelects.java | 104 +++++++++++++++++++++ ...GroupBasedSelectsParentDisabledScreenshots.html | 49 ++++++++++ 2 files changed, 153 insertions(+) create mode 100644 uitest/src/com/vaadin/tests/components/select/OptionGroupBaseSelects.java create mode 100644 uitest/src/com/vaadin/tests/components/select/OptionGroupBasedSelectsParentDisabledScreenshots.html (limited to 'uitest/src/com/vaadin/tests/components/select') diff --git a/uitest/src/com/vaadin/tests/components/select/OptionGroupBaseSelects.java b/uitest/src/com/vaadin/tests/components/select/OptionGroupBaseSelects.java new file mode 100644 index 0000000000..f2dee69cbf --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/select/OptionGroupBaseSelects.java @@ -0,0 +1,104 @@ +package com.vaadin.tests.components.select; + +import java.util.Iterator; + +import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.tests.components.ComponentTestCase; +import com.vaadin.ui.AbstractSelect; +import com.vaadin.ui.CheckBox; +import com.vaadin.ui.Component; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.ListSelect; +import com.vaadin.ui.NativeSelect; +import com.vaadin.ui.OptionGroup; +import com.vaadin.ui.TwinColSelect; + +public class OptionGroupBaseSelects extends ComponentTestCase { + + private HorizontalLayout layout; + + @Override + protected Class getTestClass() { + return HorizontalLayout.class; + } + + @Override + protected void initializeComponents() { + + CheckBox cb = new CheckBox("Switch Selects ReadOnly", false); + cb.addListener(new ValueChangeListener() { + + public void valueChange(ValueChangeEvent event) { + for (Iterator it = layout.getComponentIterator(); it + .hasNext();) { + Component c = it.next(); + if (c instanceof AbstractSelect) { + c.setReadOnly(!c.isReadOnly()); + } + } + } + }); + CheckBox cb2 = new CheckBox("Switch Selects Enabled", true); + cb2.addListener(new ValueChangeListener() { + + public void valueChange(ValueChangeEvent event) { + for (Iterator it = layout.getComponentIterator(); it + .hasNext();) { + Component c = it.next(); + if (c instanceof AbstractSelect) { + boolean enabled = !c.isEnabled(); + c.setEnabled(enabled); + c.setCaption(c.getCaption().replace( + (enabled ? "disabled" : "enabled"), + (enabled ? "enabled" : "disabled"))); + } + } + } + }); + HorizontalLayout cbs = new HorizontalLayout(); + cbs.setSpacing(true); + cbs.addComponent(cb); + cbs.addComponent(cb2); + addComponent(cbs); + + layout = new HorizontalLayout(); + layout.setSpacing(true); + layout.addComponent(createSelect( + new ListSelect("List Select, enabled"), true)); + layout.addComponent(createSelect( + new ListSelect("List Select, disabled"), false)); + + layout.addComponent(createSelect(new NativeSelect( + "Native Select, enabled"), true)); + layout.addComponent(createSelect(new NativeSelect( + "Native Select, disabled"), false)); + + layout.addComponent(createSelect(new OptionGroup( + "Option Group, enabled"), true)); + layout.addComponent(createSelect(new OptionGroup( + "Option Group, disabled"), false)); + + layout.addComponent(createSelect(new TwinColSelect( + "Twin Column Select, enabled"), true)); + layout.addComponent(createSelect(new TwinColSelect( + "Twin Column Select, disabled"), false)); + + addTestComponent(layout); + + } + + private AbstractSelect createSelect(AbstractSelect select, boolean enabled) { + select.addContainerProperty(CAPTION, String.class, null); + for (int i = 0; i < 10; i++) { + select.addItem("" + i).getItemProperty(CAPTION) + .setValue("Item " + i); + if (select instanceof OptionGroup && i % 2 == 1) { + ((OptionGroup) select).setItemEnabled("" + i, false); + } + } + select.setEnabled(enabled); + select.setImmediate(true); + return select; + } +} \ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/select/OptionGroupBasedSelectsParentDisabledScreenshots.html b/uitest/src/com/vaadin/tests/components/select/OptionGroupBasedSelectsParentDisabledScreenshots.html new file mode 100644 index 0000000000..4259da836d --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/select/OptionGroupBasedSelectsParentDisabledScreenshots.html @@ -0,0 +1,49 @@ + + + + + + +TwinColSelectParentDisabled + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TwinColSelectParentDisabled
open/run/com.vaadin.tests.components.select.OptionGroupBaseSelects?restartApplication
screenCaptureinitial_state_parent_enabled
mouseClickvaadin=runcomvaadintestscomponentsselectOptionGroupBaseSelects::/VVerticalLayout[0]/VVerticalLayout[0]/VHorizontalLayout[0]/VCheckBox[0]/domChild[0]7,6
screenCaptureparent_disabled
mouseClickvaadin=runcomvaadintestscomponentsselectOptionGroupBaseSelects::/VVerticalLayout[0]/VVerticalLayout[0]/VHorizontalLayout[0]/VCheckBox[0]/domChild[0]7,6
screenCaptureparent_enabled
+ + \ No newline at end of file -- cgit v1.2.3