From 8436e5abb1af771eb91bc6d51ef7ae2626c70b5d Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Tue, 1 Mar 2011 07:22:04 +0000 Subject: Merged change from 6.5 branch svn changeset:17513/svn branch:6.6 --- .../com/vaadin/tests/components/datefield/DateFieldEmptyValid.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java index 7bcfeab324..53b1d253ab 100644 --- a/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java +++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.datefield; -import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; @@ -23,8 +23,8 @@ public class DateFieldEmptyValid extends TestBase { private MyDateField df; - private DateFormat formatter = DateFormat.getDateTimeInstance( - DateFormat.LONG, DateFormat.MEDIUM, new Locale("en", "US")); + private SimpleDateFormat formatter = new SimpleDateFormat( + "MMMM d, yyyy hh:mm:ss aaa", Locale.US); public class MyDateField extends PopupDateField { @Override -- cgit v1.2.3