svn commit: r734761 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java

[ivaynberg]

Author: ivaynberg
Date: Thu Jan 15 09:24:30 2009
New Revision: 734761

URL: http://svn.apache.org/viewvc?rev=734761&view=rev
Log:
WICKET-1997

Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java?rev=734761&r1=734760&r2=734761&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/TextFilteredPropertyColumn.java
 Thu Jan 15 09:24:30 2009
@@ -29,9 +29,11 @@
  * @author Igor Vaynberg (ivaynberg)
  * @param <T>
  *            The column's model object type
+ * @param <F>
+ *            Filter's model object type
  * 
  */
-public class TextFilteredPropertyColumn<T> extends FilteredPropertyColumn<T>
+public class TextFilteredPropertyColumn<T, F> extends FilteredPropertyColumn<T>
 {
        private static final long serialVersionUID = 1L;
 
@@ -61,7 +63,7 @@
         */
        public Component getFilter(String componentId, FilterForm form)
        {
-               return new TextFilter<T>(componentId, getFilterModel(form), 
form);
+               return new TextFilter<F>(componentId, getFilterModel(form), 
form);
        }
 
        /**
@@ -72,9 +74,9 @@
         *            filter form
         * @return model passed on to the text filter
         */
-       protected IModel<T> getFilterModel(FilterForm form)
+       protected IModel<F> getFilterModel(FilterForm form)
        {
-               return new PropertyModel<T>(form.getDefaultModel(), 
getPropertyExpression());
+               return new PropertyModel<F>(form.getDefaultModel(), 
getPropertyExpression());
        }