svn commit: r1039845 - /wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java

[mgrigorov]

Author: mgrigorov
Date: Sun Nov 28 08:49:17 2010
New Revision: 1039845

URL: http://svn.apache.org/viewvc?rev=1039845&view=rev
Log:
WICKET-1568 contribution for wicket 1.5 generics (IConverter)
WICKET-3158 DateField, DateTimeField classes available, but no TimeField

Generics getConverter() for the new TimeField

Modified:
    
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java

Modified: 
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java?rev=1039845&r1=1039844&r2=1039845&view=diff
==============================================================================
--- 
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java
 (original)
+++ 
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java
 Sun Nov 28 08:49:17 2010
@@ -74,7 +74,7 @@ public class TimeField extends FormCompo
                }
        }
 
-       private static final IConverter MINUTES_CONVERTER = new 
ZeroPaddingIntegerConverter(2);
+       private static final IConverter<Integer> MINUTES_CONVERTER = new 
ZeroPaddingIntegerConverter(2);
 
        private static final long serialVersionUID = 1L;
 
@@ -123,9 +123,16 @@ public class TimeField extends FormCompo
 
                        @SuppressWarnings("unchecked")
                        @Override
-                       public IConverter getConverter(Class type)
+                       public <C> IConverter<C> getConverter(Class<C> type)
                        {
-                               return MINUTES_CONVERTER;
+                               if (Integer.class.isAssignableFrom(type))
+                               {
+                                       return (IConverter<C>)MINUTES_CONVERTER;
+                               }
+                               else
+                               {
+                                       return super.getConverter(type);
+                               }
                        }
                });
                minutesField.add(new RangeValidator<Integer>(0, 59));