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 20:36:04 UTC

svn commit: r549926 - /incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java

Author: ehillenius
Date: Fri Jun 22 11:36:03 2007
New Revision: 549926

URL: http://svn.apache.org/viewvc?view=rev&rev=549926
Log:
discard time info by default

Modified:
    incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java

Modified: incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java?view=diff&rev=549926&r1=549925&r2=549926
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java Fri Jun 22 11:36:03 2007
@@ -22,6 +22,7 @@
 import org.apache.wicket.markup.html.form.FormComponentPanel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
+import org.joda.time.DateTime;
 import org.joda.time.MutableDateTime;
 
 /**
@@ -80,7 +81,13 @@
 	 */
 	public Object getConvertedInput()
 	{
-		return dateField.getConvertedInput();
+		Object input = dateField.getConvertedInput();
+		if (input != null && getDiscardTime())
+		{
+			// reset time fields
+			input = new DateTime(input).toDateMidnight().toDate();
+		}
+		return input;
 	}
 
 	/**
@@ -113,6 +120,18 @@
 		setType(Date.class);
 		add(dateField = DateTextField.forShortStyle("date", new PropertyModel(this, "date")));
 		dateField.add(new DatePicker());
+	}
+
+	/**
+	 * Gets whether any time info should be discarded. By default this is true,
+	 * as this field/ date picker combination will typically be used to select
+	 * 'whole' dates rather an exact times.
+	 * 
+	 * @return Whether any time info should be discarded
+	 */
+	protected boolean getDiscardTime()
+	{
+		return true;
 	}
 
 	/**