You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2012/02/03 14:22:59 UTC
[2/2] git commit: fixed: FeedbackPanel collects messages for itself
and child components, not for page
fixed: FeedbackPanel collects messages for itself and child components, not for page
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b1cc7019
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b1cc7019
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b1cc7019
Branch: refs/heads/master
Commit: b1cc70192eed866c1e85ab561aa3f315be7c023f
Parents: 614e3b5
Author: Peter Ertl <pe...@apache.org>
Authored: Fri Feb 3 14:22:13 2012 +0100
Committer: Peter Ertl <pe...@apache.org>
Committed: Fri Feb 3 14:22:13 2012 +0100
----------------------------------------------------------------------
.../wicket/feedback/FeedbackMessagesModel.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b1cc7019/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
index a6a4a46..2cf51b9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
@@ -44,22 +44,22 @@ public class FeedbackMessagesModel implements IModel<List<FeedbackMessage>>
/** Comparator used for sorting the messages. */
private Comparator<FeedbackMessage> sortingComparator;
- private final Component component;
+ private final Component pageResolvingComponent;
/**
* Constructor. Creates a model for all feedback messages on the page.
*
- * @param component
+ * @param pageResolvingComponent
* The component where the page will be get from for which messages will be displayed
* usually the same page as the one feedbackpanel is attached to
*/
- public FeedbackMessagesModel(Component component)
+ public FeedbackMessagesModel(Component pageResolvingComponent)
{
- if (component == null)
+ if (pageResolvingComponent == null)
{
- throw new IllegalArgumentException("Argument 'component' cannot be null");
+ throw new IllegalArgumentException("Argument 'pageResolvingComponent' cannot be null");
}
- this.component = component;
+ this.pageResolvingComponent = pageResolvingComponent;
}
/**
@@ -103,7 +103,7 @@ public class FeedbackMessagesModel implements IModel<List<FeedbackMessage>>
if (messages == null)
{
// Get filtered messages from page where component lives
- messages = new FeedbackCollector(component).collect(filter);
+ messages = new FeedbackCollector(pageResolvingComponent.getPage()).collect(filter);
// Sort the list before returning it
if (sortingComparator != null)