You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/06/22 00:59:49 UTC
svn commit: r549639 -
/incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Author: ehillenius
Date: Thu Jun 21 15:59:49 2007
New Revision: 549639
URL: http://svn.apache.org/viewvc?view=rev&rev=549639
Log:
only create date when input was not null
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=549639&r1=549638&r2=549639
==============================================================================
--- 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 Thu Jun 21 15:59:49 2007
@@ -141,13 +141,14 @@
*/
public Object getConvertedInput()
{
- MutableDateTime date = new MutableDateTime(dateField.getConvertedInput());
- Integer hours = (Integer)hoursField.getConvertedInput();
- Integer minutes = (Integer)minutesField.getConvertedInput();
- AM_PM amOrPm = (AM_PM)amOrPmChoice.getConvertedInput();
-
- if (date != null)
+ Object dateFieldInput = dateField.getConvertedInput();
+ if (dateFieldInput != null)
{
+ MutableDateTime date = new MutableDateTime(dateFieldInput);
+ Integer hours = (Integer)hoursField.getConvertedInput();
+ Integer minutes = (Integer)minutesField.getConvertedInput();
+ AM_PM amOrPm = (AM_PM)amOrPmChoice.getConvertedInput();
+
try
{
TimeZone zone = getClientTimeZone();
@@ -178,7 +179,6 @@
DateTimeField.this.error(e.getMessage());
invalid();
}
-
}
return null;