Author: ehillenius
Date: Wed Jan 30 17:55:16 2008
New Revision: 616983
URL: http://svn.apache.org/viewvc?rev=616983&view=rev
Log:
WICKET-1314
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?rev=616983&r1=616982&r2=616983&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Wed Jan 30 17:55:16 2008
@@ -23,6 +23,7 @@
import java.util.TimeZone;
import org.apache.wicket.Session;
+import org.apache.wicket.datetime.StyleDateConverter;
import org.apache.wicket.datetime.markup.html.form.DateTextField;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.FormComponentPanel;
@@ -287,12 +288,6 @@
try
{
- TimeZone zone = getClientTimeZone();
- if (zone != null)
- {
-
date.setZone(DateTimeZone.forTimeZone(zone));
- }
-
boolean use12HourFormat = use12HourFormat();
if (hours != null)
{
@@ -305,6 +300,13 @@
date.set(DateTimeFieldType.halfdayOfDay(), amOrPm == AM_PM.PM ? 1 : 0);
}
+ TimeZone zone = getClientTimeZone();
+ if (zone != null)
+ {
+
date.setMillis(DateTimeZone.getDefault().getMillisKeepLocal(
+
DateTimeZone.forTimeZone(zone), date.getMillis()));
+ }
+
// the date will be in the server's timezone
setConvertedInput(date.toDate());
}
@@ -338,7 +340,7 @@
*/
protected DateTextField newDateTextField(String id, PropertyModel
dateFieldModel)
{
- return DateTextField.forShortStyle(id, dateFieldModel);
+ return new DateTextField(id, dateFieldModel, new
StyleDateConverter(false));
}
/**
