diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-11-04 12:13:33 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-11-04 12:13:33 +0000 |
| commit | 821a8cbc916b9110fbbc96f2b78fbedc4f6a484b (patch) | |
| tree | f1e0d1e4738e076e60c54cae02ce5f7889588bd5 /src | |
| parent | 0745d1e6426f904299ab3e536508bfffc0135692 (diff) | |
| download | vaadin-framework-821a8cbc916b9110fbbc96f2b78fbedc4f6a484b.tar.gz vaadin-framework-821a8cbc916b9110fbbc96f2b78fbedc4f6a484b.zip | |
merged [9621] from 6.1
svn changeset:9622/svn branch:6.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/ui/DateField.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/vaadin/ui/DateField.java b/src/com/vaadin/ui/DateField.java index 69d6108152..789ae06b48 100644 --- a/src/com/vaadin/ui/DateField.java +++ b/src/com/vaadin/ui/DateField.java @@ -332,13 +332,13 @@ public class DateField extends AbstractField { newDate = cal.getTime(); } - if (newDate != oldDate + if (newDate == null && dateString != null && !"".equals(dateString) + && !dateString.equals(oldDateString)) { + setValue(handleUnparsableDateString(dateString)); + } else if (newDate != oldDate && (newDate == null || !newDate.equals(oldDate))) { setValue(newDate, true); // Don't require a repaint, client // updates itself - } else if (dateString != null && !"".equals(dateString) - && !dateString.equals(oldDateString)) { - setValue(handleUnparsableDateString(dateString)); } } } |