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 2008/04/12 22:58:25 UTC
svn commit: r647495 - in /wicket/trunk:
wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/
wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/
wicket/src/main/java/org/apach...
Author: ivaynberg
Date: Sat Apr 12 13:58:20 2008
New Revision: 647495
URL: http://svn.apache.org/viewvc?rev=647495&view=rev
Log:
generification
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/ISortableDataProvider.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IStyledColumn.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java?rev=647495&r1=647494&r2=647495&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java Sat Apr 12 13:58:20 2008
@@ -24,14 +24,15 @@
* A helper implementation for the IColumn interface
*
* @author Igor Vaynberg ( ivaynberg )
+ * @param <T>
*/
-public abstract class AbstractColumn implements IStyledColumn
+public abstract class AbstractColumn<T> implements IStyledColumn<T>
{
/**
*
*/
private static final long serialVersionUID = 1L;
- private IModel displayModel;
+ private IModel<String> displayModel;
private String sortProperty;
/**
@@ -40,7 +41,7 @@
* @param sortProperty
* sort property this column represents
*/
- public AbstractColumn(IModel displayModel, String sortProperty)
+ public AbstractColumn(IModel<String> displayModel, String sortProperty)
{
this.displayModel = displayModel;
this.sortProperty = sortProperty;
@@ -50,7 +51,7 @@
* @param displayModel
* model used to generate header text
*/
- public AbstractColumn(IModel displayModel)
+ public AbstractColumn(IModel<String> displayModel)
{
this(displayModel, null);
}
@@ -58,7 +59,7 @@
/**
* @return returns display model to be used for the header component
*/
- public IModel getDisplayModel()
+ public IModel<String> getDisplayModel()
{
return displayModel;
}
@@ -82,9 +83,9 @@
/**
* @see org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn#getHeader(java.lang.String)
*/
- public Component getHeader(String componentId)
+ public Component< ? > getHeader(String componentId)
{
- return new Label(componentId, getDisplayModel());
+ return new Label<String>(componentId, getDisplayModel());
}
/**
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java?rev=647495&r1=647494&r2=647495&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/HeaderlessColumn.java Sat Apr 12 13:58:20 2008
@@ -23,8 +23,9 @@
* A column that does not have a header
*
* @author Igor Vaynberg
+ * @param <T>
*/
-public abstract class HeaderlessColumn extends AbstractColumn
+public abstract class HeaderlessColumn<T> extends AbstractColumn<T>
{
/**
*
@@ -36,15 +37,16 @@
*/
public HeaderlessColumn()
{
- super(new Model(" "));
+ super(new Model<String>(" "));
}
/**
* @see org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn#getHeader(java.lang.String)
*/
- public Component getHeader(String componentId)
+ @Override
+ public Component< ? > getHeader(String componentId)
{
- Component header = super.getHeader(componentId);
+ Component< ? > header = super.getHeader(componentId);
return header.setEscapeModelStrings(false);
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java?rev=647495&r1=647494&r2=647495&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java Sat Apr 12 13:58:20 2008
@@ -24,6 +24,7 @@
* An interface that represents a column in the {@link DefaultDataTable}
*
* @author Igor Vaynberg ( ivaynberg )
+ * @param <T>
*/
public interface IColumn<T> extends ICellPopulator<T>
{
@@ -37,7 +38,7 @@
*
* @return component that will be used as the header for the column
*/
- Component getHeader(String componentId);
+ Component< ? > getHeader(String componentId);
/**
* Returns the name of the property that this header sorts. If null is returned the header will
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/ISortableDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/ISortableDataProvider.java?rev=647495&r1=647494&r2=647495&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/ISortableDataProvider.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/ISortableDataProvider.java Sat Apr 12 13:58:20 2008
@@ -24,9 +24,10 @@
* Data provider that can hold sort state
*
* @author Igor Vaynberg (ivaynberg at apache dot org)
+ * @param <T>
*
*/
-public interface ISortableDataProvider extends IDataProvider, ISortStateLocator
+public interface ISortableDataProvider<T> extends IDataProvider<T>, ISortStateLocator
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IStyledColumn.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IStyledColumn.java?rev=647495&r1=647494&r2=647495&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IStyledColumn.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IStyledColumn.java Sat Apr 12 13:58:20 2008
@@ -21,8 +21,9 @@
* Interface that allows styling individuals DataTable columns
*
* @author Matej Knopp
+ * @param <T>
*/
-public interface IStyledColumn extends IColumn
+public interface IStyledColumn<T> extends IColumn<T>
{
/**
* Returns the css class for this column.
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java?rev=647495&r1=647494&r2=647495&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java Sat Apr 12 13:58:20 2008
@@ -28,8 +28,9 @@
* implementation because it makes that information easy to access within the data provider.
*
* @author Igor Vaynberg (ivaynberg at apache dot org)
+ * @param <T>
*/
-public abstract class SortableDataProvider implements ISortableDataProvider
+public abstract class SortableDataProvider<T> implements ISortableDataProvider<T>
{
/**
*
@@ -53,8 +54,8 @@
if (!(state instanceof SingleSortState))
{
throw new IllegalArgumentException(
- "argument [state] must be an instance of SingleSortState, but it is [" +
- state.getClass().getName() + "]:[" + state.toString() + "]");
+ "argument [state] must be an instance of SingleSortState, but it is [" +
+ state.getClass().getName() + "]:[" + state.toString() + "]");
}
this.state = (SingleSortState)state;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java?rev=647495&r1=647494&r2=647495&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/IMarkupResourceStreamProvider.java Sat Apr 12 13:58:20 2008
@@ -47,5 +47,6 @@
* The container the markup should be associated with
* @return A IResourceStream if the resource was found
*/
- IResourceStream getMarkupResourceStream(final MarkupContainer container, Class containerClass);
+ IResourceStream getMarkupResourceStream(final MarkupContainer< ? > container,
+ Class< ? extends MarkupContainer< ? >> containerClass);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java?rev=647495&r1=647494&r2=647495&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java Sat Apr 12 13:58:20 2008
@@ -58,6 +58,7 @@
* @see GridView
*
* @author Igor Vaynberg (ivaynberg)
+ * @param <T>
*
*/
public interface IDataProvider<T> extends IDetachable