Author: ehillenius
Date: Fri Aug 3 18:24:50 2007
New Revision: 562641
URL: http://svn.apache.org/viewvc?view=rev&rev=562641
Log:
WICKET-817
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/PatternDateConverter.java
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java?view=diff&rev=562641&r1=562640&r2=562641
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
Fri Aug 3 18:24:50 2007
@@ -21,6 +21,7 @@
import java.util.Locale;
import java.util.TimeZone;
+import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.protocol.http.request.WebClientInfo;
import org.apache.wicket.request.ClientInfo;
@@ -52,6 +53,11 @@
private final boolean applyTimeZoneDifference;
/**
+ * Optional component to use for determining the locale.
+ */
+ private Component component = null;
+
+ /**
* Construct.
* </p>
* When applyTimeZoneDifference is true, the current time is applied on
the
@@ -73,6 +79,18 @@
}
/**
+ * Gets the locale to use.
+ *
+ * @return the locale from either the component if that is set, or from
the
+ * session
+ */
+ protected Locale getLocale()
+ {
+ Component c = getComponent();
+ return (c != null) ? c.getLocale() : Session.get().getLocale();
+ }
+
+ /**
* @see
org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,
* java.util.Locale)
*/
@@ -208,5 +226,24 @@
protected DateTimeZone getTimeZone()
{
return DateTimeZone.getDefault();
+ }
+
+ /**
+ * @return optional component to use for determining the locale.
+ */
+ public final Component getComponent()
+ {
+ return component;
+ }
+
+ /**
+ * Sets component for getting the locale
+ *
+ * @param component
+ * optional component to use for determining the locale.
+ */
+ public final void setComponent(Component component)
+ {
+ this.component = component;
}
}
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/PatternDateConverter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/PatternDateConverter.java?view=diff&rev=562641&r1=562640&r2=562641
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/PatternDateConverter.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/PatternDateConverter.java
Fri Aug 3 18:24:50 2007
@@ -18,7 +18,6 @@
import java.text.SimpleDateFormat;
-import org.apache.wicket.Session;
import org.apache.wicket.datetime.markup.html.form.DateTextField;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
@@ -99,7 +98,6 @@
*/
protected DateTimeFormatter getFormat()
{
- return
DateTimeFormat.forPattern(datePattern).withLocale(Session.get().getLocale())
- .withPivotYear(2000);
+ return
DateTimeFormat.forPattern(datePattern).withLocale(getLocale()).withPivotYear(2000);
}
}
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java?view=diff&rev=562641&r1=562640&r2=562641
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
Fri Aug 3 18:24:50 2007
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.datetime;
-import org.apache.wicket.Session;
import org.apache.wicket.datetime.markup.html.form.DateTextField;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
@@ -116,7 +115,7 @@
*/
public final String getDatePattern()
{
- return DateTimeFormat.patternForStyle(dateStyle,
Session.get().getLocale());
+ return DateTimeFormat.patternForStyle(dateStyle, getLocale());
}
/**
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java?view=diff&rev=562641&r1=562640&r2=562641
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java
Fri Aug 3 18:24:50 2007
@@ -212,6 +212,7 @@
{
throw new IllegalStateException("converter may not be
null");
}
+ converter.setComponent(this);
this.converter = converter;
}
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java?view=diff&rev=562641&r1=562640&r2=562641
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
Fri Aug 3 18:24:50 2007
@@ -30,7 +30,6 @@
import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat;
-
/**
* A TextField that is mapped to a <code>java.util.Date</code> object and that
* uses Joda time to parse and format values.
@@ -213,6 +212,7 @@
{
throw new IllegalStateException("converter may not be
null");
}
+ converter.setComponent(this);
this.converter = converter;
}
