You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2012/08/03 19:41:03 UTC
[2/2] git commit: replaced negation of if clause for better
readability
replaced negation of if clause for better readability
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5f00e55b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5f00e55b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5f00e55b
Branch: refs/heads/master
Commit: 5f00e55b88ac71f4afc5aa9ea58e58f59bdaa393
Parents: f17b6e4
Author: svenmeier <sv...@apache.org>
Authored: Fri Aug 3 18:00:26 2012 +0200
Committer: svenmeier <sv...@apache.org>
Committed: Fri Aug 3 18:00:26 2012 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/Component.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5f00e55b/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index b599813..3ed5afa 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -952,11 +952,7 @@ public abstract class Component
*/
public final void beforeRender()
{
- if (!(this instanceof IFeedback))
- {
- internalBeforeRender();
- }
- else
+ if (this instanceof IFeedback)
{
// this component is a feedback. Feedback must be initialized last, so that
// they can collect messages from other components
@@ -985,6 +981,10 @@ public abstract class Component
feedbacks.add(this);
}
}
+ else
+ {
+ internalBeforeRender();
+ }
}
/**
@@ -2210,7 +2210,8 @@ public abstract class Component
List<Component> feedbacks = getRequestCycle().getMetaData(FEEDBACK_LIST);
if (feedbacks != null)
{
- // iterate over a copy because a IFeedback may add more IFeedback children (WICKET-4687)
+ // iterate over a copy because a IFeedback may add more IFeedback children
+// (WICKET-4687)
Component[] feedbacksCopy = feedbacks.toArray(new Component[feedbacks.size()]);
for (Component feedback : feedbacksCopy)
{