Updated Branches: refs/heads/master 71881ea69 -> 8c2dc53a8
Revert/re-apply WICKET-4736 This reverts commit c299899ea0ba18f629a9e45f31d658a61a28b973. The maven clirr plugin reported API breakage for commit c299899ea, so I've reinstated the old API, marked it deprecated and kept the changes from c299899ea. Looks horrible, but doesn't break semver. Should revisit in Wicket 7.0.0 to remove the deprecations and remove the createFilters method from the API. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8c2dc53a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8c2dc53a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8c2dc53a Branch: refs/heads/master Commit: 8c2dc53a826c330945fd8f0a1c2839a028ac4210 Parents: 71881ea Author: Martijn Dashorst <[email protected]> Authored: Tue Sep 25 15:48:16 2012 +0200 Committer: Martijn Dashorst <[email protected]> Committed: Tue Sep 25 15:48:16 2012 +0200 ---------------------------------------------------------------------- ...JavaScriptFilteredIntoFooterHeaderResponse.java | 30 ++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8c2dc53a/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 0c3dc5c..f7b8e37 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,8 +51,9 @@ public final class JavaScriptFilteredIntoFooterHeaderResponse extends FilteringH setFilters(createFilters(footerBucketName)); } - private Iterable<? extends IHeaderResponseFilter> createFilters(String footerBucketName) + protected Iterable<? extends IHeaderResponseFilter> createFilters(String footerBucketName) { + // TODO: make private method in wicket 7.x IHeaderResponseFilter footer = createFooterFilter(footerBucketName); IHeaderResponseFilter header = createHeaderFilter(HEADER_FILTER_NAME, footer); return Arrays.asList(header, footer); @@ -68,4 +69,31 @@ public final class JavaScriptFilteredIntoFooterHeaderResponse extends FilteringH return new OppositeHeaderResponseFilter(headerFilterName, footerFilter); } + /** + * see WICKET-4736 JavaScriptFilteredIntoFooterHeaderResponse should reverse filter logic + * + * @param footerBucketName + * @param header + * @return the correct header response filter, but a different one + * @deprecated no longer part of the API + */ + @Deprecated + protected IHeaderResponseFilter createFooterFilter(String footerBucketName, + IHeaderResponseFilter header) + { + return new OppositeHeaderResponseFilter(footerBucketName, header); + } + + /** + * see WICKET-4736 JavaScriptFilteredIntoFooterHeaderResponse should reverse filter logic + * + * @param headerFilterName + * @return the wrong header response filter + * @deprecated no longer part of the API + */ + @Deprecated + protected IHeaderResponseFilter createHeaderFilter(String headerFilterName) + { + return new CssAndPageAcceptingHeaderResponseFilter(HEADER_FILTER_NAME); + } }
