Author: ivaynberg
Date: Thu Aug 23 18:07:12 2007
New Revision: 569207
URL: http://svn.apache.org/viewvc?rev=569207&view=rev
Log:
WICKET-882 proper super call for onbeforerender() overrides
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.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/repeater/RefreshingView.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?rev=569207&r1=569206&r2=569207&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
Thu Aug 23 18:07:12 2007
@@ -3303,8 +3303,15 @@
}
/**
- * Called just before a component is rendered. If you override this, you
- * *must* call super.onBeforeRender() within your implementation.
+ * Called just before a component is rendered.
+ * <p>
+ * *NOTE* If you override this, you *must* call super.onBeforeRender()
+ * within your implementation.
+ *
+ * Because this method is responsible for cascading
+ * [EMAIL PROTECTED] #onBeforeRender()} call to its children it is
strongly recommended
+ * that super call is made at the end of the override.
+ * </p>
*/
protected void onBeforeRender()
{
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=569207&r1=569206&r2=569207&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 Aug 23 18:07:12 2007
@@ -113,26 +113,30 @@
*/
protected void onBeforeRender()
{
- super.onBeforeRender();
-
- // Remove any previous loop contents
- removeAll();
-
- // Get number of iterations
- final int iterations = getIterations();
- if (iterations > 0)
+ if (isVisibleInHierarchy())
{
- // Create LoopItems for each iteration
- for (int iteration = 0; iteration < iterations;
iteration++)
+ // Remove any previous loop contents
+ removeAll();
+
+ // Get number of iterations
+ final int iterations = getIterations();
+ if (iterations > 0)
{
- // Create item for loop iteration
- LoopItem item = newItem(iteration);
+ // Create LoopItems for each iteration
+ for (int iteration = 0; iteration < iterations;
iteration++)
+ {
+ // Create item for loop iteration
+ LoopItem item = newItem(iteration);
- // Add and populate item
- add(item);
- populateItem(item);
+ // Add and populate item
+ add(item);
+ populateItem(item);
+ }
}
}
+
+ 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=569207&r1=569206&r2=569207&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 Aug 23 18:07:12 2007
@@ -91,8 +91,6 @@
*/
protected void onBeforeRender()
{
- super.onBeforeRender();
-
if (isVisibleInHierarchy())
{
@@ -114,7 +112,7 @@
removeAll();
addItems(items);
}
-
+ super.onBeforeRender();
}
/**
@@ -243,8 +241,8 @@
public String toString()
{
- return
"ItemsReuseStrategyChange[component: " + getPath() + ", reuse: "
- + old + "]";
+ return
"ItemsReuseStrategyChange[component: " + getPath() + ", reuse: " +
+ old + "]";
}
});
}
