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

[iv...@apache.org]

Author: ivaynberg
Date: Wed Nov 19 13:05:00 2008
New Revision: 719069

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

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

Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java?rev=719069&r1=719068&r2=719069&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/ChoiceFilteredPropertyColumn.java Wed Nov 19 13:05:00 2008
@@ -32,12 +32,14 @@
  * @author Igor Vaynberg (ivaynberg)
  * @param <T>
  *            The model object type
+ * @param <Y>
+ *            The column model object type
  * 
  */
-public class ChoiceFilteredPropertyColumn<T> extends FilteredPropertyColumn<T>
+public class ChoiceFilteredPropertyColumn<T, Y> extends FilteredPropertyColumn<T>
 {
 	private static final long serialVersionUID = 1L;
-	private final IModel<List<? extends T>> filterChoices;
+	private final IModel<List<? extends Y>> filterChoices;
 
 	/**
 	 * @param displayModel
@@ -47,7 +49,7 @@
 	 *            collection choices used in the choice filter
 	 */
 	public ChoiceFilteredPropertyColumn(IModel<String> displayModel, String sortProperty,
-		String propertyExpression, IModel<List<? extends T>> filterChoices)
+		String propertyExpression, IModel<List<? extends Y>> filterChoices)
 	{
 		super(displayModel, sortProperty, propertyExpression);
 		this.filterChoices = filterChoices;
@@ -60,7 +62,7 @@
 	 *            collection of choices used in the choice filter
 	 */
 	public ChoiceFilteredPropertyColumn(IModel<String> displayModel, String propertyExpression,
-		IModel<List<? extends T>> filterChoices)
+		IModel<List<? extends Y>> filterChoices)
 	{
 		super(displayModel, propertyExpression);
 		this.filterChoices = filterChoices;
@@ -85,10 +87,10 @@
 	 */
 	public Component getFilter(String componentId, FilterForm form)
 	{
-		ChoiceFilter<T> filter = new ChoiceFilter<T>(componentId, getFilterModel(form), form,
+		ChoiceFilter<Y> filter = new ChoiceFilter<Y>(componentId, getFilterModel(form), form,
 			filterChoices, enableAutoSubmit());
 
-		IChoiceRenderer<T> renderer = getChoiceRenderer();
+		IChoiceRenderer<Y> renderer = getChoiceRenderer();
 		if (renderer != null)
 		{
 			filter.getChoice().setChoiceRenderer(renderer);
@@ -104,9 +106,9 @@
 	 *            filter form
 	 * @return model passed on to the text filter
 	 */
-	protected IModel<T> getFilterModel(FilterForm form)
+	protected IModel<Y> getFilterModel(FilterForm form)
 	{
-		return new PropertyModel<T>(form.getDefaultModel(), getPropertyExpression());
+		return new PropertyModel<Y>(form.getDefaultModel(), getPropertyExpression());
 	}
 
 	/**
@@ -125,7 +127,7 @@
 	 * 
 	 * @return choice renderer that will be used to create the choice filter
 	 */
-	protected IChoiceRenderer<T> getChoiceRenderer()
+	protected IChoiceRenderer<Y> getChoiceRenderer()
 	{
 		return null;
 	}
@@ -133,7 +135,7 @@
 	/**
 	 * @return filter choices model
 	 */
-	protected final IModel<List<? extends T>> getFilterChoices()
+	protected final IModel<List<? extends Y>> getFilterChoices()
 	{
 		return filterChoices;
 	}