Author: jcompagner
Date: Thu Sep 6 13:39:38 2007
New Revision: 573364
URL: http://svn.apache.org/viewvc?rev=573364&view=rev
Log:
AbstractRepeater.onBeforeRender not final again
all implementations of onPopulate are final
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java?rev=573364&r1=573363&r2=573364&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/ListView.java
Thu Sep 6 13:39:38 2007
@@ -513,7 +513,7 @@
/**
* @see org.apache.wicket.markup.repeater.AbstractRepeater#onPopulate()
*/
- protected void onPopulate()
+ protected final void onPopulate()
{
// Get number of items to be displayed
final int size = getViewSize();
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java?rev=573364&r1=573363&r2=573364&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/list/Loop.java
Thu Sep 6 13:39:38 2007
@@ -110,7 +110,7 @@
/**
* @see org.apache.wicket.Component#onBeforeRender()
*/
- protected void onPopulate()
+ protected final void onPopulate()
{
// Remove any previous loop contents
removeAll();
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java?rev=573364&r1=573363&r2=573364&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
Thu Sep 6 13:39:38 2007
@@ -267,19 +267,16 @@
this.separator = separator;
}
- /**
- * @see org.apache.wicket.markup.html.list.Loop#onPopulate()
- */
- protected void onPopulate()
- {
+ protected void onBeforeRender()
+ {
// PagingNavigation itself (as well as the PageableListView)
// may have pages.
// The index of the first page link depends on the
PageableListView's
// page currently printed.
setStartIndex();
- super.onPopulate();
+ super.onBeforeRender();
}
/**
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java?rev=573364&r1=573363&r2=573364&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractPageableView.java
Thu Sep 6 13:39:38 2007
@@ -105,10 +105,10 @@
super.onAttach();
}
- protected void onPopulate()
+ protected void onBeforeRender()
{
clearCachedItemCount();
- super.onPopulate();
+ super.onBeforeRender();
}
/**
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java?rev=573364&r1=573363&r2=573364&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/AbstractRepeater.java
Thu Sep 6 13:39:38 2007
@@ -117,12 +117,9 @@
/**
* @see org.apache.wicket.Component#onBeforeRender()
*/
- protected final void onBeforeRender()
+ protected void onBeforeRender()
{
- if (isVisibleInHierarchy())
- {
- onPopulate();
- }
+ onPopulate();
super.onBeforeRender();
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java?rev=573364&r1=573363&r2=573364&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
Thu Sep 6 13:39:38 2007
@@ -85,7 +85,7 @@
* Refresh the items in the view. Delegates the creation of items to
the selected item reuse
* strategy
*/
- protected void onPopulate()
+ protected final void onPopulate()
{
IItemFactory itemFactory = new IItemFactory()
