svn commit: r713094 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging: PagingNavigation.java PagingNavigator.java

[ivaynberg]

Author: ivaynberg
Date: Tue Nov 11 09:58:15 2008
New Revision: 713094

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

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.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/markup/html/navigation/paging/PagingNavigation.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java?rev=713094&r1=713093&r2=713094&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
 Tue Nov 11 09:58:15 2008
@@ -17,7 +17,7 @@
 package org.apache.wicket.markup.html.navigation.paging;
 
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.link.AbstractLink;
 import org.apache.wicket.markup.html.list.Loop;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.version.undo.Change;
@@ -309,7 +309,7 @@
                final int pageIndex = getStartIndex() + loopItem.getIteration();
 
                // Add a page link pointing to the page
-               final Link<?> link = newPagingNavigationLink("pageLink", 
pageable, pageIndex);
+               final AbstractLink link = newPagingNavigationLink("pageLink", 
pageable, pageIndex);
                loopItem.add(link);
 
                // Add a page number label to the list which is enclosed by the 
link
@@ -336,7 +336,7 @@
         *            the page index the link points to
         * @return the page navigation link.
         */
-       protected Link<?> newPagingNavigationLink(String id, IPageable 
pageable, int pageIndex)
+       protected AbstractLink newPagingNavigationLink(String id, IPageable 
pageable, int pageIndex)
        {
                return new PagingNavigationLink<Void>(id, pageable, pageIndex);
        }

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=713094&r1=713093&r2=713094&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 Nov 11 09:58:15 2008
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.markup.html.navigation.paging;
 
-import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.link.AbstractLink;
 import org.apache.wicket.markup.html.panel.Panel;
 
 /**
@@ -110,7 +110,8 @@
         *            the increment
         * @return the increment link
         */
-       protected Link<?> newPagingNavigationIncrementLink(String id, IPageable 
pageable, int increment)
+       protected AbstractLink newPagingNavigationIncrementLink(String id, 
IPageable pageable,
+               int increment)
        {
                return new PagingNavigationIncrementLink<Void>(id, pageable, 
increment);
        }
@@ -127,7 +128,7 @@
         *            the page to jump to
         * @return the pagenumber link
         */
-       protected Link<?> newPagingNavigationLink(String id, IPageable 
pageable, int pageNumber)
+       protected AbstractLink newPagingNavigationLink(String id, IPageable 
pageable, int pageNumber)
        {
                return new PagingNavigationLink<Void>(id, pageable, pageNumber);
        }