Author: jcompagner
Date: Tue May 13 12:41:17 2008
New Revision: 655986
URL: http://svn.apache.org/viewvc?rev=655986&view=rev
Log:
generics
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java?rev=655986&r1=655985&r2=655986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigation.java
Tue May 13 12:41:17 2008
@@ -78,8 +78,8 @@
* @return the ajaxified page number link.
*/
@Override
- protected Link< ? > newPagingNavigationLink(String id, IPageable
pageable, int pageIndex)
+ protected Link<Object> newPagingNavigationLink(String id, IPageable
pageable, int pageIndex)
{
- return new AjaxPagingNavigationLink<Void>(id, pageable,
pageIndex);
+ return new AjaxPagingNavigationLink(id, pageable, pageIndex);
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java?rev=655986&r1=655985&r2=655986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java
Tue May 13 12:41:17 2008
@@ -27,10 +27,8 @@
* @since 1.2
*
* @author Martijn Dashorst
- * @param <T>
- * The model data type
*/
-public class AjaxPagingNavigationLink<T> extends PagingNavigationLink<T>
implements IAjaxLink
+public class AjaxPagingNavigationLink extends PagingNavigationLink implements
IAjaxLink
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java?rev=655986&r1=655985&r2=655986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigator.java
Tue May 13 12:41:17 2008
@@ -91,7 +91,7 @@
* @return the increment link
*/
@Override
- protected Link< ? > newPagingNavigationIncrementLink(String id,
IPageable pageable,
+ protected Link<Object> newPagingNavigationIncrementLink(String id,
IPageable pageable,
int increment)
{
return new AjaxPagingNavigationIncrementLink(id, pageable,
increment);
@@ -110,9 +110,9 @@
* @return the pagenumber link
*/
@Override
- protected Link< ? > newPagingNavigationLink(String id, IPageable
pageable, int pageNumber)
+ protected Link<Object> newPagingNavigationLink(String id, IPageable
pageable, int pageNumber)
{
- return new AjaxPagingNavigationLink<Void>(id, pageable,
pageNumber);
+ return new AjaxPagingNavigationLink(id, pageable, pageNumber);
}
/**
@@ -146,7 +146,7 @@
// the pageable is a component, and that it is a child of a web
// markup container.
- Component< ? > container = ((Component< ? >)pageable);
+ Component<?> container = ((Component<?>)pageable);
// no need for a nullcheck as there is bound to be a
non-repeater
// somewhere higher in the hierarchy
while (container instanceof AbstractRepeater)
@@ -157,7 +157,7 @@
// in case the navigator is not contained by the container, we
have
// to add it to the response
- if (((MarkupContainer< ? >)container).contains(this, true) ==
false)
+ if (((MarkupContainer<?>)container).contains(this, true) ==
false)
{
target.addComponent(this);
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java?rev=655986&r1=655985&r2=655986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLink.java
Tue May 13 12:41:17 2008
@@ -36,7 +36,7 @@
* @author Juergen Donnerstag
* @author Martijn Dashorst
*/
-public class PagingNavigationIncrementLink extends Link
+public class PagingNavigationIncrementLink extends Link<Object>
{
private static final long serialVersionUID = 1L;
@@ -57,7 +57,7 @@
* increment by
*/
public PagingNavigationIncrementLink(final String id, final IPageable
pageable,
- final int increment)
+ final int increment)
{
super(id);
setAutoEnable(true);
@@ -68,6 +68,7 @@
/**
* @see org.apache.wicket.markup.html.link.Link#onClick()
*/
+ @Override
public void onClick()
{
// Tell the PageableListView which page to print next
@@ -119,7 +120,8 @@
* @return True if this link links to the given page
* @see
org.apache.wicket.markup.html.link.PageLink#linksTo(org.apache.wicket.Page)
*/
- public boolean linksTo(final Page page)
+ @Override
+ public boolean linksTo(final Page<?> page)
{
pageable.getCurrentPage();
return ((increment < 0) && isFirst()) || ((increment > 0) &&
isLast());
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink.java?rev=655986&r1=655985&r2=655986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLink.java
Tue May 13 12:41:17 2008
@@ -25,10 +25,8 @@
* @author Jonathan Locke
* @author Eelco Hillenius
* @author Martijn Dashorst
- * @param <T>
- * The model data type
*/
-public class PagingNavigationLink<T> extends Link<T>
+public class PagingNavigationLink extends Link<Object>
{
private static final long serialVersionUID = 1L;
@@ -117,7 +115,7 @@
* @see
org.apache.wicket.markup.html.link.PageLink#linksTo(org.apache.wicket.Page)
*/
@Override
- public final boolean linksTo(final Page page)
+ public final boolean linksTo(final Page<?> page)
{
return getPageNumber() == pageable.getCurrentPage();
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java?rev=655986&r1=655985&r2=655986&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigator.java
Tue May 13 12:41:17 2008
@@ -27,7 +27,7 @@
*
* @author Juergen Donnerstag
*/
-public class PagingNavigator extends Panel
+public class PagingNavigator extends Panel<Object>
{
private static final long serialVersionUID = 1L;
@@ -98,7 +98,8 @@
* the increment
* @return the increment link
*/
- protected Link newPagingNavigationIncrementLink(String id, IPageable
pageable, int increment)
+ protected Link<Object> newPagingNavigationIncrementLink(String id,
IPageable pageable,
+ int increment)
{
return new PagingNavigationIncrementLink(id, pageable,
increment);
}
@@ -115,7 +116,7 @@
* the page to jump to
* @return the pagenumber link
*/
- protected Link newPagingNavigationLink(String id, IPageable pageable,
int pageNumber)
+ protected Link<Object> newPagingNavigationLink(String id, IPageable
pageable, int pageNumber)
{
return new PagingNavigationLink(id, pageable, pageNumber);
}
