svn commit: r1080385 - in /wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime: DateConverter.java PatternDateConverter.java StyleDateConverter.java

[pe...@apache.org]

Author: pete
Date: Thu Mar 10 22:53:40 2011
New Revision: 1080385

URL: http://svn.apache.org/viewvc?rev=1080385&view=rev
Log:
honor converter locale when converting dates

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

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=1080385&r1=1080384&r2=1080385&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:53:40 2011
@@ -16,7 +16,6 @@
  */
 package org.apache.wicket.datetime;
 
-import java.text.ParseException;
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
@@ -28,10 +27,8 @@ import org.apache.wicket.request.ClientI
 import org.apache.wicket.util.convert.ConversionException;
 import org.apache.wicket.util.convert.IConverter;
 import org.apache.wicket.util.string.Strings;
-import org.joda.time.DateMidnight;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
-import org.joda.time.MutableDateTime;
 import org.joda.time.format.DateTimeFormatter;
 
 
@@ -85,7 +82,7 @@ public abstract class DateConverter impl
 			return null;
 		}
 
-		DateTimeFormatter format = getFormat();
+		DateTimeFormatter format = getFormat(locale);
 		if (format == null)
 		{
 			throw new IllegalStateException("format must be not null");
@@ -137,7 +134,7 @@ public abstract class DateConverter impl
 	public String convertToString(Date value, Locale locale)
 	{
 		DateTime dt = new DateTime((value).getTime(), getTimeZone());
-		DateTimeFormatter format = getFormat();
+		DateTimeFormatter format = getFormat(locale);
 
 		if (applyTimeZoneDifference)
 		{
@@ -208,9 +205,11 @@ public abstract class DateConverter impl
 	}
 
 	/**
+	 * @param locale
+	 *
 	 * @return formatter The formatter for the current conversion
 	 */
-	protected abstract DateTimeFormatter getFormat();
+	protected abstract DateTimeFormatter getFormat(Locale locale);
 
 	/**
 	 * Gets the locale to use.

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=1080385&r1=1080384&r2=1080385&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:53:40 2011
@@ -17,6 +17,7 @@
 package org.apache.wicket.datetime;
 
 import java.text.SimpleDateFormat;
+import java.util.Locale;
 
 import org.apache.wicket.datetime.markup.html.form.DateTextField;
 import org.joda.time.DateTime;
@@ -96,8 +97,8 @@ public class PatternDateConverter extend
 	 * @return formatter The formatter for the current conversion
 	 */
 	@Override
-	protected DateTimeFormatter getFormat()
+	protected DateTimeFormatter getFormat(Locale locale)
 	{
-		return DateTimeFormat.forPattern(datePattern).withLocale(getLocale()).withPivotYear(2000);
+		return DateTimeFormat.forPattern(datePattern).withLocale(locale).withPivotYear(2000);
 	}
 }
\ No newline at end of file

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=1080385&r1=1080384&r2=1080385&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:53:40 2011
@@ -16,6 +16,8 @@
  */
 package org.apache.wicket.datetime;
 
+import java.util.Locale;
+
 import org.apache.wicket.datetime.markup.html.form.DateTextField;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
@@ -115,8 +117,8 @@ public class StyleDateConverter extends 
 	 * @return formatter The formatter for the current conversion
 	 */
 	@Override
-	protected DateTimeFormatter getFormat()
+	protected DateTimeFormatter getFormat(Locale locale)
 	{
-		return DateTimeFormat.forPattern(getDatePattern()).withLocale(getLocale()).withPivotYear(2000);
+		return DateTimeFormat.forPattern(getDatePattern()).withLocale(locale).withPivotYear(2000);
 	}
 }
\ No newline at end of file