svn commit: r739604 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging: AjaxPagingNavigationIncrementLink.java AjaxPagingNavigationLink.java

[ivaynberg]

Author: ivaynberg
Date: Sat Jan 31 20:50:12 2009
New Revision: 739604

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

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationLink.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java?rev=739604&r1=739603&r2=739604&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/markup/html/navigation/paging/AjaxPagingNavigationIncrementLink.java
 Sat Jan 31 20:50:12 2009
@@ -24,22 +24,22 @@
 /**
  * An incremental Ajaxian link to a page of a PageableListView. Assuming your 
list view navigation
  * looks like
- *
+ * 
  * <pre>
- *
+ * 
  *                      [first / &lt;&lt; / &lt;] 1 | 2 | 3 [&gt; / &gt;&gt; 
/last]
- *
+ * 
  * </pre>
- *
+ * 
  * <p>
  * and "&lt;" meaning the previous and "&lt;&lt;" goto the "current page - 5", 
than it is this kind
  * of incremental page links which can easily be created.
- *
+ * 
  * This link will update the pageable and itself or the navigator the link is 
part of using Ajax
  * techniques, or perform a full refresh when ajax is not available.
- *
+ * 
  * @since 1.2
- *
+ * 
  * @author Martijn Dashorst
  */
 public class AjaxPagingNavigationIncrementLink extends 
PagingNavigationIncrementLink<Void>
@@ -50,7 +50,7 @@
 
        /**
         * Constructor.
-        *
+        * 
         * @param id
         *            See Component
         * @param pageable
@@ -74,7 +74,7 @@
         * NOTE: It is recommended that you only prepend additional javascript 
to the default handler
         * because the default handler uses the return func() format so any 
appended javascript will not
         * be evaluated by default.
-        *
+        * 
         * @param defaultHandler
         *            default javascript event handler generated by this link
         * @return javascript event handler for this link
@@ -87,28 +87,21 @@
 
        /**
         * Fallback event listener, will redisplay the current page.
-        *
+        * 
         * @see org.apache.wicket.markup.html.link.Link#onClick()
         */
        @Override
        public void onClick()
        {
                onClick(null);
-
-               // We do not need to redirect
-               setRedirect(false);
-
-               // Return the the current page.
-               setResponsePage(getPage());
        }
 
        /**
         * Performs the actual action of this component, performing a non-ajax 
fallback when there was
         * no AjaxRequestTarget available.
-        *
+        * 
         * @param target
-        *            the request target, when <code>null</code>, a full page 
refresh will be
-        *            generated
+        *            the request target, when <code>null</code>, a full page 
refresh will be generated
         */
        public void onClick(AjaxRequestTarget target)
        {

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=739604&r1=739603&r2=739604&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
 Sat Jan 31 20:50:12 2009
@@ -23,9 +23,9 @@
 
 /**
  * An Ajax version of a link to a page of a PageableListView.
- *
+ * 
  * @since 1.2
- *
+ * 
  * @author Martijn Dashorst
  */
 public class AjaxPagingNavigationLink extends PagingNavigationLink<Void> 
implements IAjaxLink
@@ -34,7 +34,7 @@
 
        /**
         * Constructor.
-        *
+        * 
         * @param id
         *            See Component
         * @param pageable
@@ -52,28 +52,21 @@
 
        /**
         * Fallback event listener, will redisplay the current page.
-        *
+        * 
         * @see org.apache.wicket.markup.html.link.Link#onClick()
         */
        @Override
        public void onClick()
        {
                onClick(null);
-
-               // We do not need to redirect
-               setRedirect(false);
-
-               // Return the the current page.
-               setResponsePage(getPage());
        }
 
        /**
         * Performs the actual action of this component, performing a non-ajax 
fallback when there was
         * no AjaxRequestTarget available.
-        *
+        * 
         * @param target
-        *            the request target, when <code>null</code>, a full page 
refresh will be
-        *            generated
+        *            the request target, when <code>null</code>, a full page 
refresh will be generated
         */
        public void onClick(AjaxRequestTarget target)
        {