Repository: wicket Updated Branches: refs/heads/WICKET-6498_deferred_javascript_2 3e65110d3 -> 2e12a26f6
WICKET-6498 allow subclasses to decorate response so it's possible to use the former setup of a ResourceAggregator behind the FilteringHeaderResponse Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2e12a26f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2e12a26f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2e12a26f Branch: refs/heads/WICKET-6498_deferred_javascript_2 Commit: 2e12a26f6e372e34797f205e2f21cf87665d683c Parents: 3e65110 Author: Sven Meier <[email protected]> Authored: Mon Jan 29 14:16:06 2018 +0100 Committer: Sven Meier <[email protected]> Committed: Mon Jan 29 14:16:06 2018 +0100 ---------------------------------------------------------------------- .../markup/head/filter/FilteringHeaderResponse.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2e12a26f/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java index 233b588..4b27c02 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java @@ -233,6 +233,7 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse * the name of the filter to get the bucket for * @return the content that was accepted by the filter with this name */ + @SuppressWarnings("resource") public final CharSequence getContent(String filterName) { if (filterName == null || !responseFilterMap.containsKey(filterName)) @@ -262,6 +263,8 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse } }; + headerRenderer = decorate(headerRenderer); + for (HeaderItem curItem : resp) { headerRenderer.render(curItem); @@ -272,6 +275,18 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse return strResponse.getBuffer(); } + /** + * Decorate the given response used to get contents. + * + * @param response + * response to decorate + * @return default implementation just returns the response + */ + protected IHeaderResponse decorate(IHeaderResponse response) + { + return response; + } + private void render(HeaderItem item, String filterName) { if (responseFilterMap.containsKey(filterName) == false)
