Author: jdonnerstag
Date: Sat Dec 20 12:59:39 2008
New Revision: 728343
URL: http://svn.apache.org/viewvc?rev=728343&view=rev
Log:
wicket-1863: DateTimeField: small bugs
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?rev=728343&r1=728342&r2=728343&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Sat Dec 20 12:59:39 2008
@@ -230,6 +230,17 @@
{
this.date = (date != null) ? new MutableDateTime(date) : null;
setDefaultModelObject(date);
+
+ Integer hours = getHours();
+ Integer minutes = getMinutes();
+ boolean use12HourFormat = use12HourFormat();
+ if (hours != null)
+ {
+ this.date.set(DateTimeFieldType.hourOfDay(),
hours.intValue() %
+ (use12HourFormat ? 12 : 24));
+ this.date.setMinuteOfHour((minutes != null) ?
minutes.intValue() : 0);
+ }
+ setDefaultModelObject(this.date.toDate());
}
/**
@@ -378,6 +389,8 @@
else
{
date = null;
+ hours = null;
+ minutes = null;
}
if (date != null)
