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

[ivaynberg]

Author: ivaynberg
Date: Tue Nov  4 14:07:40 2008
New Revision: 711443

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

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=711443&r1=711442&r2=711443&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  4 14:07:40 2008
@@ -345,7 +345,8 @@
                        @Override
                        public boolean isEnabled()
                        {
-                               return PagingNavigation.this.isEnabled() && 
PagingNavigation.this.isEnableAllowed();
+                               return super.isEnabled() && 
PagingNavigation.this.isEnabled() &&
+                                       PagingNavigation.this.isEnableAllowed();
                        }
                };
        }

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=711443&r1=711442&r2=711443&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  4 14:07:40 2008
@@ -119,7 +119,8 @@
                        @Override
                        public boolean isEnabled()
                        {
-                               return PagingNavigator.this.isEnabled() && 
PagingNavigator.this.isEnableAllowed();
+                               return super.isEnabled() && 
PagingNavigator.this.isEnabled() &&
+                                       PagingNavigator.this.isEnableAllowed();
                        }
                };
        }
@@ -145,9 +146,11 @@
                        @Override
                        public boolean isEnabled()
                        {
-                               return PagingNavigator.this.isEnabled() && 
PagingNavigator.this.isEnableAllowed();
+                               return super.isEnabled() && 
PagingNavigator.this.isEnabled() &&
+                                       PagingNavigator.this.isEnableAllowed();
                        }
                };
+
        }
 
        /**
@@ -169,7 +172,8 @@
                        @Override
                        public boolean isEnabled()
                        {
-                               return PagingNavigator.this.isEnabled() && 
PagingNavigator.this.isEnableAllowed();
+                               return super.isEnabled() && 
PagingNavigator.this.isEnabled() &&
+                                       PagingNavigator.this.isEnableAllowed();
                        }
                };
        }