Author: ehillenius
Date: Tue May 29 17:34:36 2007
New Revision: 542703
URL: http://svn.apache.org/viewvc?view=rev&rev=542703
Log:
do the mod in updateModel instead
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?view=diff&rev=542703&r1=542702&r2=542703
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Tue May 29 17:34:36 2007
@@ -204,10 +204,8 @@
*/
public void updateModel()
{
-
if (date != null)
{
-
try
{
TimeZone zone = getClientTimeZone();
@@ -218,7 +216,7 @@
if (hours != null)
{
-
date.set(DateTimeFieldType.hourOfHalfday(), hours.intValue());
+
date.set(DateTimeFieldType.hourOfHalfday(), hours.intValue() % 12);
date.setMinuteOfHour((minutes != null)
? minutes.intValue() : 0);
}
if (amOrPm == AM_PM.PM)
@@ -269,17 +267,7 @@
setType(Date.class);
add(dateField = DateTextField.forShortStyle("date", new
PropertyModel(this, "date")));
dateField.add(new DatePicker());
- // add(new CalendarPopup("picker", dateField));
- add(hoursField = new TextField("hours", new PropertyModel(this,
"hours")
- {
- private static final long serialVersionUID = 1L;
-
- public void setObject(Object object)
- {
- int hours = ((Integer)object).intValue() % 12;
- super.setObject(new Integer(hours));
- }
- }, Integer.class));
+ add(hoursField = new TextField("hours", new PropertyModel(this,
"hours"), Integer.class));
hoursField.add(NumberValidator.range(0, 12));
hoursField.setLabel(new Model("hours"));
add(minutesField = new TextField("minutes", new
PropertyModel(this, "minutes"),
