You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/03/29 18:37:01 UTC
svn commit: r759719 - in /wicket/trunk:
wicket-examples/src/main/java/org/apache/wicket/examples/repeater/
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/
Author: ivaynberg
Date: Sun Mar 29 16:37:00 2009
New Revision: 759719
URL: http://svn.apache.org/viewvc?rev=759719&view=rev
Log:
WICKET-2189 generics cleanup for ajaxfallbackdefaultdatatable
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java?rev=759719&r1=759718&r2=759719&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java Sun Mar 29 16:37:00 2009
@@ -39,7 +39,7 @@
*/
public AjaxDataTablePage()
{
- List<IColumn<?>> columns = new ArrayList<IColumn<?>>();
+ List<IColumn<Contact>> columns = new ArrayList<IColumn<Contact>>();
columns.add(new AbstractColumn<Contact>(new Model<String>("Actions"))
{
@@ -50,14 +50,15 @@
}
});
- columns.add(new PropertyColumn<Long>(new Model<String>("ID"), "id"));
- columns.add(new PropertyColumn<String>(new Model<String>("First Name"), "firstName",
+ columns.add(new PropertyColumn<Contact>(new Model<String>("ID"), "id"));
+ columns.add(new PropertyColumn<Contact>(new Model<String>("First Name"), "firstName",
"firstName"));
- columns.add(new PropertyColumn<String>(new Model<String>("Last Name"), "lastName",
+ columns.add(new PropertyColumn<Contact>(new Model<String>("Last Name"), "lastName",
"lastName"));
- columns.add(new PropertyColumn<String>(new Model<String>("Home Phone"), "homePhone"));
- columns.add(new PropertyColumn<String>(new Model<String>("Cell Phone"), "cellPhone"));
+ columns.add(new PropertyColumn<Contact>(new Model<String>("Home Phone"), "homePhone"));
+ columns.add(new PropertyColumn<Contact>(new Model<String>("Cell Phone"), "cellPhone"));
- add(new AjaxFallbackDefaultDataTable<Contact>("table", columns, new SortableContactDataProvider(), 8));
+ add(new AjaxFallbackDefaultDataTable<Contact>("table", columns,
+ new SortableContactDataProvider(), 8));
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java?rev=759719&r1=759718&r2=759719&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/table/AjaxFallbackDefaultDataTable.java Sun Mar 29 16:37:00 2009
@@ -64,10 +64,11 @@
* number of rows per page
*/
@SuppressWarnings("unchecked")
- public AjaxFallbackDefaultDataTable(String id, final List<IColumn<?>> columns,
+ public AjaxFallbackDefaultDataTable(String id, final List<IColumn<T>> columns,
ISortableDataProvider<T> dataProvider, int rowsPerPage)
{
- this(id, columns.toArray(new IColumn[columns.size()]), dataProvider, rowsPerPage);
+ this(id, columns.toArray((IColumn<T>[])new IColumn[columns.size()]), dataProvider,
+ rowsPerPage);
}
/**