Author: ivaynberg
Date: Tue Nov 4 14:02:38 2008
New Revision: 711438
URL: http://svn.apache.org/viewvc?rev=711438&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=711438&r1=711437&r2=711438&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:02:38 2008
@@ -338,7 +338,16 @@
*/
protected Link<?> newPagingNavigationLink(String id, IPageable
pageable, int pageIndex)
{
- return new PagingNavigationLink<Void>(id, pageable, pageIndex);
+ return new PagingNavigationLink<Void>(id, pageable, pageIndex)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isEnabled()
+ {
+ return 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=711438&r1=711437&r2=711438&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:02:38 2008
@@ -112,7 +112,16 @@
*/
protected Link<?> newPagingNavigationIncrementLink(String id, IPageable
pageable, int increment)
{
- return new PagingNavigationIncrementLink<Void>(id, pageable,
increment);
+ return new PagingNavigationIncrementLink<Void>(id, pageable,
increment)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isEnabled()
+ {
+ return PagingNavigator.this.isEnabled() &&
PagingNavigator.this.isEnableAllowed();
+ }
+ };
}
/**
@@ -129,7 +138,16 @@
*/
protected Link<?> newPagingNavigationLink(String id, IPageable
pageable, int pageNumber)
{
- return new PagingNavigationLink<Void>(id, pageable, pageNumber);
+ return new PagingNavigationLink<Void>(id, pageable, pageNumber)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isEnabled()
+ {
+ return PagingNavigator.this.isEnabled() &&
PagingNavigator.this.isEnableAllowed();
+ }
+ };
}
/**
@@ -144,7 +162,16 @@
protected PagingNavigation newNavigation(final IPageable pageable,
final IPagingLabelProvider labelProvider)
{
- return new PagingNavigation("navigation", pageable,
labelProvider);
+ return new PagingNavigation("navigation", pageable,
labelProvider)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isEnabled()
+ {
+ return PagingNavigator.this.isEnabled() &&
PagingNavigator.this.isEnableAllowed();
+ }
+ };
}
/**
