Updated Branches: refs/heads/wicket-1.5.x 2d8a76f7c -> c1056c40a
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/c1056c40 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c1056c40 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c1056c40 Branch: refs/heads/wicket-1.5.x Commit: c1056c40a4bbfc21ee329ec624eff271aaa86984 Parents: 2d8a76f Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Sep 3 13:40:06 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Sep 3 13:45:05 2012 +0200 ---------------------------------------------------------------------- ...JavaScriptFilteredIntoFooterHeaderResponse.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c1056c40/wicket-core/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java index e608f56..8956c68 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/filtering/JavaScriptFilteredIntoFooterHeaderResponse.java @@ -47,21 +47,21 @@ public final class JavaScriptFilteredIntoFooterHeaderResponse extends setFilters(createFilters(footerBucketName)); } - protected IHeaderResponseFilter[] createFilters(String footerBucketName) + private IHeaderResponseFilter[] createFilters(String footerBucketName) { - IHeaderResponseFilter header = createHeaderFilter(HEADER_FILTER_NAME); IHeaderResponseFilter footer = createFooterFilter(footerBucketName); + IHeaderResponseFilter header = createHeaderFilter(HEADER_FILTER_NAME, footer); return new IHeaderResponseFilter[] { header, footer }; } - protected JavaScriptAcceptingHeaderResponseFilter createFooterFilter(String footerBucketName) + private IHeaderResponseFilter createFooterFilter(String footerBucketName) { return new JavaScriptAcceptingHeaderResponseFilter(footerBucketName); } - protected CssAcceptingHeaderResponseFilter createHeaderFilter(String headerFilterName) + private IHeaderResponseFilter createHeaderFilter(String headerFilterName, IHeaderResponseFilter footerFilter) { - return new CssAcceptingHeaderResponseFilter(HEADER_FILTER_NAME); + return new OppositeHeaderResponseFilter(headerFilterName, footerFilter); } }
