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 2012/09/03 13:40:27 UTC
[1/2] git commit: WICKET-4736
JavaScriptFilteredIntoFooterHeaderResponse should reverse filter logic
Updated Branches:
refs/heads/master 995559ef0 -> c299899ea
WICKET-4736 JavaScriptFilteredIntoFooterHeaderResponse should reverse filter logic
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c299899e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c299899e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c299899e
Branch: refs/heads/master
Commit: c299899ea0ba18f629a9e45f31d658a61a28b973
Parents: 19204fd
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 3 13:40:06 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Sep 3 13:40:06 2012 +0200
----------------------------------------------------------------------
...JavaScriptFilteredIntoFooterHeaderResponse.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c299899e/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
index 03a25f4..0c3dc5c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
@@ -51,22 +51,21 @@ public final class JavaScriptFilteredIntoFooterHeaderResponse extends FilteringH
setFilters(createFilters(footerBucketName));
}
- protected Iterable<? extends IHeaderResponseFilter> createFilters(String footerBucketName)
+ private Iterable<? extends IHeaderResponseFilter> createFilters(String footerBucketName)
{
- IHeaderResponseFilter header = createHeaderFilter(HEADER_FILTER_NAME);
- IHeaderResponseFilter footer = createFooterFilter(footerBucketName, header);
+ IHeaderResponseFilter footer = createFooterFilter(footerBucketName);
+ IHeaderResponseFilter header = createHeaderFilter(HEADER_FILTER_NAME, footer);
return Arrays.asList(header, footer);
}
- protected IHeaderResponseFilter createFooterFilter(String footerBucketName,
- IHeaderResponseFilter header)
+ private IHeaderResponseFilter createFooterFilter(String footerBucketName)
{
- return new OppositeHeaderResponseFilter(footerBucketName, header);
+ return new JavaScriptAcceptingHeaderResponseFilter(footerBucketName);
}
- protected IHeaderResponseFilter createHeaderFilter(String headerFilterName)
+ private IHeaderResponseFilter createHeaderFilter(String headerFilterName, IHeaderResponseFilter footerFilter)
{
- return new CssAndPageAcceptingHeaderResponseFilter(HEADER_FILTER_NAME);
+ return new OppositeHeaderResponseFilter(headerFilterName, footerFilter);
}
}