diff options
| author | Jens Jansson <peppe@vaadin.com> | 2011-12-01 15:01:58 +0200 |
|---|---|---|
| committer | Jens Jansson <peppe@vaadin.com> | 2011-12-01 15:01:58 +0200 |
| commit | 3e7d5dd41743bb643262b5c8a47f97731c984165 (patch) | |
| tree | be9c4fa21ea75a912915a1263584d864362068fc /tests | |
| parent | bc93f0e2418a2f67db12212c8f13c00c4aef00a1 (diff) | |
| download | vaadin-framework-3e7d5dd41743bb643262b5c8a47f97731c984165.tar.gz vaadin-framework-3e7d5dd41743bb643262b5c8a47f97731c984165.zip | |
Changed CompositeValidator's combination mode from int constants to an enum.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testbench/com/vaadin/tests/tickets/Ticket20.java | 4 | ||||
| -rw-r--r-- | tests/testbench/com/vaadin/tests/validation/TestValidators.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java index 55fee95de3..aa7dcc7c73 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java @@ -4,6 +4,7 @@ import com.vaadin.Application; import com.vaadin.data.Validator; import com.vaadin.data.util.MethodProperty; import com.vaadin.data.validator.CompositeValidator; +import com.vaadin.data.validator.CompositeValidator.CombinationMode; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.TextField; @@ -59,8 +60,7 @@ public class Ticket20 extends Application { } } }); - CompositeValidator v2 = new CompositeValidator( - CompositeValidator.MODE_OR, null); + CompositeValidator v2 = new CompositeValidator(CombinationMode.OR, null); v2.addValidator(v); v2.addValidator(new Validator() { diff --git a/tests/testbench/com/vaadin/tests/validation/TestValidators.java b/tests/testbench/com/vaadin/tests/validation/TestValidators.java index 5264d47c9d..1b0e967878 100644 --- a/tests/testbench/com/vaadin/tests/validation/TestValidators.java +++ b/tests/testbench/com/vaadin/tests/validation/TestValidators.java @@ -8,6 +8,7 @@ import com.vaadin.data.validator.EmailValidator; import com.vaadin.data.validator.IntegerValidator; import com.vaadin.data.validator.RegexpValidator; import com.vaadin.data.validator.StringLengthValidator; +import com.vaadin.data.validator.CompositeValidator.CombinationMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -97,7 +98,7 @@ public class TestValidators extends TestBase { tf = new TextField( "A field, must be a floating point number with 4-5 chars"); CompositeValidator cv = new CompositeValidator( - CompositeValidator.MODE_AND, + CombinationMode.AND, "The field must contain a floating point number with 4-5 characters"); cv.addValidator(new StringLengthValidator( "String length of '{0}' should be 4-5 characters", 4, 5, false)); @@ -109,7 +110,7 @@ public class TestValidators extends TestBase { tf = new TextField( "A field, must be a floating point number or 4-5 chars"); - cv = new CompositeValidator(CompositeValidator.MODE_OR, + cv = new CompositeValidator(CombinationMode.OR, "The field must contain a floating point or with 4-5 characters"); cv.addValidator(new StringLengthValidator( "String length of '{0}' should be 4-5 characters", 4, 5, false)); |