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

[ehillenius]

Author: ehillenius
Date: Fri Jun 22 11:56:19 2007
New Revision: 549931

URL: http://svn.apache.org/viewvc?view=rev&rev=549931
Log:
better default to midnight in the converter

Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
    
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/datetime/DateConverter.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java?view=diff&rev=549931&r1=549930&r2=549931
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/datetime/DateConverter.java
 Fri Jun 22 11:56:19 2007
@@ -27,6 +27,7 @@
 import org.apache.wicket.util.convert.ConversionException;
 import org.apache.wicket.util.convert.IConverter;
 import org.apache.wicket.util.string.Strings;
+import org.joda.time.DateMidnight;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.MutableDateTime;
@@ -92,7 +93,7 @@
                {
                        TimeZone zone = getClientTimeZone();
                        // instantiate now/ current time
-                       MutableDateTime dt = new MutableDateTime();
+                       MutableDateTime dt = new MutableDateTime(new 
DateMidnight());
                        if (zone != null)
                        {
                                // set time zone for client

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=549931&r1=549930&r2=549931
==============================================================================
--- 
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:56:19 2007
@@ -22,7 +22,6 @@
 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;
 
 /**
@@ -81,13 +80,7 @@
         */
        public Object getConvertedInput()
        {
-               Object input = dateField.getConvertedInput();
-               if (input != null && getDiscardTime())
-               {
-                       // reset time fields
-                       input = new DateTime(input).toDateMidnight().toDate();
-               }
-               return input;
+               return dateField.getConvertedInput();
        }
 
        /**
@@ -120,18 +113,6 @@
                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;
        }
 
        /**