Updated Branches: refs/heads/master c7448aee3 -> 1d6dbc421
WICKET-4788: unwrap items before checking class Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1d6dbc42 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1d6dbc42 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1d6dbc42 Branch: refs/heads/master Commit: 1d6dbc4217b24fd40a4d94bf07ce65959bebf9e0 Parents: c7448ae Author: Emond Papegaaij <[email protected]> Authored: Thu Sep 27 15:08:51 2012 +0200 Committer: Emond Papegaaij <[email protected]> Committed: Thu Sep 27 15:08:51 2012 +0200 ---------------------------------------------------------------------- .../head/filter/AbstractHeaderResponseFilter.java | 10 ++++++++++ .../filter/CssAcceptingHeaderResponseFilter.java | 2 +- .../CssAndPageAcceptingHeaderResponseFilter.java | 2 +- .../JavaScriptAcceptingHeaderResponseFilter.java | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6dbc42/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/AbstractHeaderResponseFilter.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/AbstractHeaderResponseFilter.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/AbstractHeaderResponseFilter.java index 03d9744..9ef290e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/AbstractHeaderResponseFilter.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/AbstractHeaderResponseFilter.java @@ -17,6 +17,7 @@ package org.apache.wicket.markup.head.filter; import org.apache.wicket.markup.head.HeaderItem; +import org.apache.wicket.markup.head.IWrappedHeaderItem; import org.apache.wicket.markup.head.filter.FilteringHeaderResponse.IHeaderResponseFilter; /** @@ -51,6 +52,15 @@ public abstract class AbstractHeaderResponseFilter implements IHeaderResponseFil @Override public boolean accepts(HeaderItem item) { + while (item instanceof IWrappedHeaderItem) + { + item = ((IWrappedHeaderItem)item).getWrapped(); + } + return acceptsWrapped(item); + } + + protected boolean acceptsWrapped(HeaderItem item) + { return true; } } http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6dbc42/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/CssAcceptingHeaderResponseFilter.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/CssAcceptingHeaderResponseFilter.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/CssAcceptingHeaderResponseFilter.java index c6bfd57..2ccb454 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/CssAcceptingHeaderResponseFilter.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/CssAcceptingHeaderResponseFilter.java @@ -39,7 +39,7 @@ public class CssAcceptingHeaderResponseFilter extends AbstractHeaderResponseFilt } @Override - public boolean accepts(HeaderItem item) + protected boolean acceptsWrapped(HeaderItem item) { return item instanceof CssHeaderItem; } http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6dbc42/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/CssAndPageAcceptingHeaderResponseFilter.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/CssAndPageAcceptingHeaderResponseFilter.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/CssAndPageAcceptingHeaderResponseFilter.java index db03f73..8cb22e8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/CssAndPageAcceptingHeaderResponseFilter.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/CssAndPageAcceptingHeaderResponseFilter.java @@ -40,7 +40,7 @@ public class CssAndPageAcceptingHeaderResponseFilter extends AbstractHeaderRespo } @Override - public boolean accepts(HeaderItem item) + protected boolean acceptsWrapped(HeaderItem item) { return item instanceof CssHeaderItem || item instanceof PageHeaderItem; } http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6dbc42/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptAcceptingHeaderResponseFilter.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptAcceptingHeaderResponseFilter.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptAcceptingHeaderResponseFilter.java index 4c28f47..b77ce9b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptAcceptingHeaderResponseFilter.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptAcceptingHeaderResponseFilter.java @@ -43,7 +43,7 @@ public class JavaScriptAcceptingHeaderResponseFilter extends AbstractHeaderRespo } @Override - public boolean accepts(HeaderItem item) + protected boolean acceptsWrapped(HeaderItem item) { return item instanceof JavaScriptHeaderItem; }
