svn commit: r1073636 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java

[mgrigorov]

Author: mgrigorov
Date: Wed Feb 23 08:30:15 2011
New Revision: 1073636

URL: http://svn.apache.org/viewvc?rev=1073636&view=rev
Log:
WICKET-3468 org/apache/wicket/extensions/markup/html/form/DateTextField 
converter never null

Properly check the type of the type to be converted before using any converter.


Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java?rev=1073636&r1=1073635&r2=1073636&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/DateTextField.java
 Wed Feb 23 08:30:15 2011
@@ -54,7 +54,7 @@ public class DateTextField extends TextF
        /**
         * The converter for the TextField
         */
-       private IConverter<?> converter = null;
+       private final IConverter<Date> converter;
 
        /**
         * Creates a new DateTextField, without a specified pattern. This is 
the same as calling
@@ -150,13 +150,13 @@ public class DateTextField extends TextF
        @Override
        public <C> IConverter<C> getConverter(final Class<C> type)
        {
-               if (converter == null)
+               if (Date.class.isAssignableFrom(type))
                {
-                       return super.getConverter(type);
+                       return (IConverter<C>)converter;
                }
                else
                {
-                       return (IConverter<C>)converter;
+                       return super.getConverter(type);
                }
        }