svn commit: r1080388 - in /wicket/trunk/wicket-datetime/src: main/java/org/apache/wicket/datetime/ main/java/org/apache/wicket/datetime/markup/html/form/ test/java/org/apache/wicket/extensions/yui/calendar/

[pe...@apache.org]

Author: pete
Date: Thu Mar 10 22:57:33 2011
New Revision: 1080388

URL: http://svn.apache.org/viewvc?rev=1080388&view=rev
Log:
even more fun with locales

Modified:
    wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
    wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/PatternDateConverter.java
    wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
    wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
    wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java

Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java?rev=1080388&r1=1080387&r2=1080388&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java Thu Mar 10 22:57:33 2011
@@ -176,7 +176,7 @@ public abstract class DateConverter impl
 	/**
 	 * @return Gets the pattern that is used for printing and parsing
 	 */
-	public abstract String getDatePattern();
+	public abstract String getDatePattern(Locale locale);
 
 	/**
 	 * Sets component for getting the locale

Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/PatternDateConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/PatternDateConverter.java?rev=1080388&r1=1080387&r2=1080388&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/PatternDateConverter.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/PatternDateConverter.java Thu Mar 10 22:57:33 2011
@@ -88,7 +88,7 @@ public class PatternDateConverter extend
 	 * @return datePattern
 	 */
 	@Override
-	public final String getDatePattern()
+	public final String getDatePattern(Locale locale)
 	{
 		return datePattern;
 	}

Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java?rev=1080388&r1=1080387&r2=1080388&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java Thu Mar 10 22:57:33 2011
@@ -108,9 +108,9 @@ public class StyleDateConverter extends 
 	 * @return datePattern
 	 */
 	@Override
-	public final String getDatePattern()
+	public final String getDatePattern(Locale locale)
 	{
-		return DateTimeFormat.patternForStyle(dateStyle, getLocale());
+		return DateTimeFormat.patternForStyle(dateStyle, locale);
 	}
 
 	/**
@@ -119,6 +119,6 @@ public class StyleDateConverter extends 
 	@Override
 	protected DateTimeFormatter getFormat(Locale locale)
 	{
-		return DateTimeFormat.forPattern(getDatePattern()).withLocale(locale).withPivotYear(2000);
+		return DateTimeFormat.forPattern(getDatePattern(locale)).withPivotYear(2000);
 	}
 }
\ No newline at end of file

Modified: wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java?rev=1080388&r1=1080387&r2=1080388&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java (original)
+++ wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java Thu Mar 10 22:57:33 2011
@@ -227,6 +227,6 @@ public class DateTextField extends TextF
 	 */
 	public final String getTextFormat()
 	{
-		return converter.getDatePattern();
+		return converter.getDatePattern(getLocale());
 	}
 }

Modified: wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java?rev=1080388&r1=1080387&r2=1080388&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java (original)
+++ wicket/trunk/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatePickerTest.java Thu Mar 10 22:57:33 2011
@@ -242,6 +242,8 @@ public class DatePickerTest extends Wick
 		cal.set(2011, 10, 5, 0, 0, 0);
 		cal.set(Calendar.MILLISECOND, 0);
 
+		Locale.setDefault(Locale.US);
+
 		Date dateRef = cal.getTime();
 		Date date = converter.convertToObject("05.11.2011", Locale.GERMANY);
 		log.debug("ref: " + dateRef.getTime() + "; converted: " + date.getTime());