You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2017/12/30 20:56:12 UTC
wicket git commit: WICKET-6514 FeedbackCollector(Component) should
not collect session-scoped feedback messages
Repository: wicket
Updated Branches:
refs/heads/master db2317bf4 -> 63a3296c7
WICKET-6514 FeedbackCollector(Component) should not collect session-scoped feedback messages
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/63a3296c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/63a3296c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/63a3296c
Branch: refs/heads/master
Commit: 63a3296c7e56be1d0a41541989834b21f976c363
Parents: db2317b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Dec 30 22:54:50 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Dec 30 22:54:50 2017 +0200
----------------------------------------------------------------------
.../wicket/feedback/FeedbackCollector.java | 21 +++++++++++++++++---
.../wicket/feedback/FencedFeedbackPanel.java | 2 +-
.../wicket/util/tester/BaseWicketTester.java | 2 +-
3 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/63a3296c/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackCollector.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackCollector.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackCollector.java
index 3a3fb2e..2af17f6 100755
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackCollector.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackCollector.java
@@ -38,15 +38,15 @@ public class FeedbackCollector
/**
* Constructs a collector that will only collect messages from {@link Session}. To collect
- * messages from session and components use {@link #FeedbackCollector(Component)}.
+ * messages from session and components use {@link #FeedbackCollector(Component, boolean)}.
*/
public FeedbackCollector()
{
- this(null);
+ this(null, true);
}
/**
- * Constructs a collector that will collect messages from {@link Session} and specified
+ * Constructs a collector that will collect messages from the specified
* {@code container}
*
* @param component
@@ -54,7 +54,22 @@ public class FeedbackCollector
*/
public FeedbackCollector(Component component)
{
+ this(component, false);
+ }
+
+ /**
+ * Constructs a collector that will collect messages from {@link Session} and specified
+ * {@code container}
+ *
+ * @param component
+ * root component from which feedback will be collected
+ * @param includeSession
+ * controls whether or not feedback from the {@link Session} will be collected
+ */
+ public FeedbackCollector(Component component, boolean includeSession)
+ {
this.component = component;
+ this.includeSession = includeSession;
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/63a3296c/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
index 42e1344..7360d61 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FencedFeedbackPanel.java
@@ -180,7 +180,7 @@ public class FencedFeedbackPanel extends FeedbackPanel
{
// this is the catch-all panel
- return new FeedbackCollector(panel.getPage())
+ return new FeedbackCollector(panel.getPage(), true)
{
@Override
protected boolean shouldRecurseInto(Component component)
http://git-wip-us.apache.org/repos/asf/wicket/blob/63a3296c/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index b0263c7..fe66d12 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -2220,7 +2220,7 @@ public class BaseWicketTester
*/
public List<FeedbackMessage> getFeedbackMessages(final IFeedbackMessageFilter filter)
{
- return new FeedbackCollector(getLastRenderedPage()).collect(filter);
+ return new FeedbackCollector(getLastRenderedPage(), true).collect(filter);
}
/**