Author: frankbille
Date: Tue Apr 22 23:09:31 2008
New Revision: 650756
URL: http://svn.apache.org/viewvc?rev=650756&view=rev
Log:
Generics on PageableListView and StringResourceModel
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java?rev=650756&r1=650755&r2=650756&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/list/PageableListView.java
Tue Apr 22 23:09:31 2008
@@ -29,8 +29,10 @@
* either one at a time or many at a time.
*
* @author Jonathan Locke
+ * @param <T>
+ * Model object type
*/
-public abstract class PageableListView extends ListView implements IPageable
+public abstract class PageableListView<T> extends ListView<T> implements
IPageable
{
/**
*
@@ -53,7 +55,7 @@
* @param rowsPerPage
* Number of rows to show on a page
*/
- public PageableListView(final String id, final IModel model, int
rowsPerPage)
+ public PageableListView(final String id, final IModel<List<T>> model,
int rowsPerPage)
{
super(id, model);
this.rowsPerPage = rowsPerPage;
@@ -71,7 +73,7 @@
* Number of rows to show on a page
* @see ListView#ListView(String, List)
*/
- public PageableListView(final String id, final List list, final int
rowsPerPage)
+ public PageableListView(final String id, final List<T> list, final int
rowsPerPage)
{
super(id, list);
this.rowsPerPage = rowsPerPage;
@@ -133,6 +135,7 @@
/**
* @see org.apache.wicket.markup.html.list.ListView#getViewSize()
*/
+ @Override
public int getViewSize()
{
if (getModelObject() != null)
@@ -175,10 +178,11 @@
* @throws UnsupportedOperationException
* always
*/
- public ListView setStartIndex(int startIndex) throws
UnsupportedOperationException
+ @Override
+ public ListView<T> setStartIndex(int startIndex) throws
UnsupportedOperationException
{
throw new UnsupportedOperationException(
- "You must not use setStartIndex() with
PageableListView");
+ "You must not use setStartIndex() with
PageableListView");
}
/**
@@ -191,10 +195,11 @@
* always
* @see org.apache.wicket.markup.html.list.ListView#setStartIndex(int)
*/
- public ListView setViewSize(int size) throws
UnsupportedOperationException
+ @Override
+ public ListView<T> setViewSize(int size) throws
UnsupportedOperationException
{
throw new UnsupportedOperationException(
- "You must not use setViewSize() with
PageableListView");
+ "You must not use setViewSize() with PageableListView");
}
/**
@@ -221,6 +226,7 @@
/**
* @see org.apache.wicket.version.undo.Change#undo()
*/
+ @Override
public void undo()
{
setCurrentPage(currentPage);
@@ -229,6 +235,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "CurrentPageChange[currentPage: " + currentPage
+ "]";
@@ -259,6 +266,7 @@
/**
* @see org.apache.wicket.version.undo.Change#undo()
*/
+ @Override
public void undo()
{
setRowsPerPage(rowsPerPage);
@@ -267,6 +275,7 @@
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "RowsPerPageChange[component: " + getPath() + ",
prefix: " + rowsPerPage + "]";
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java?rev=650756&r1=650755&r2=650756&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
Tue Apr 22 23:09:31 2008
@@ -175,7 +175,9 @@
*
* @author Chris Turner
*/
-public class StringResourceModel extends LoadableDetachableModel implements
IComponentAssignedModel
+public class StringResourceModel extends LoadableDetachableModel<String>
+ implements
+ IComponentAssignedModel<String>
{
private static final long serialVersionUID = 1L;
@@ -208,7 +210,7 @@
return new AssignmentWrapper(component);
}
- private class AssignmentWrapper implements IWrapModel
+ private class AssignmentWrapper implements IWrapModel<String>
{
private static final long serialVersionUID = 1L;
@@ -224,25 +226,28 @@
StringResourceModel.this.detach();
}
- public Object getObject()
+ public String getObject()
{
- if (StringResourceModel.this.component != null) {
+ if (StringResourceModel.this.component != null)
+ {
return StringResourceModel.this.getObject();
- } else {
+ }
+ else
+ {
// TODO: Remove this as soon as we can break
binary compatibility
- StringResourceModel.this.component =
this.component;
- Object res =
StringResourceModel.this.getObject();
+ StringResourceModel.this.component = component;
+ String res =
StringResourceModel.this.getObject();
StringResourceModel.this.component = null;
return res;
}
}
- public void setObject(Object object)
+ public void setObject(String object)
{
StringResourceModel.this.setObject(object);
}
- public IModel getWrappedModel()
+ public IModel<String> getWrappedModel()
{
return StringResourceModel.this;
}
@@ -546,6 +551,7 @@
*
* @return The string for this model object
*/
+ @Override
public String toString()
{
StringBuffer sb = new StringBuffer("StringResourceModel[");
@@ -596,7 +602,8 @@
* as an object to allow it to be used generically within components.
*
*/
- protected Object load()
+ @Override
+ protected String load()
{
// Initialize information that we need to work successfully
final Session session = Session.get();
@@ -616,6 +623,7 @@
/**
* Detaches from the given session
*/
+ @Override
protected final void onDetach()
{
// Detach any model
