Repository: wicket Updated Branches: refs/heads/wicket-6.x a289bd1e3 -> ffdefe28e
WICKET-6052 CSS header contribution overlap Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ffdefe28 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ffdefe28 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ffdefe28 Branch: refs/heads/wicket-6.x Commit: ffdefe28e9d89eb8c376f493a4b03e5c91dc7f26 Parents: a289bd1 Author: Sebastien <[email protected]> Authored: Sun Dec 20 15:04:59 2015 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Dec 23 09:45:10 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/wicket/markup/ContainerInfo.java | 14 ++++++++++++++ .../markup/DefaultMarkupResourceStreamProvider.java | 3 +-- .../markup/html/header/MyPageExpectedResult.html | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ffdefe28/wicket-core/src/main/java/org/apache/wicket/markup/ContainerInfo.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/ContainerInfo.java b/wicket-core/src/main/java/org/apache/wicket/markup/ContainerInfo.java index 6e0e126..8df7df2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/ContainerInfo.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/ContainerInfo.java @@ -52,6 +52,20 @@ public class ContainerInfo * Construct. * * @param containerClass + * the real container class (could be a parent class) + * @param container + * The container to create the information from + */ + public ContainerInfo(final Class<?> containerClass, final MarkupContainer container) + { + this(containerClass != null ? containerClass : container.getClass(), container.getLocale(), container.getStyle(), + container.getVariation(), container.getMarkupType()); + } + + /** + * Construct. + * + * @param containerClass * @param locale * @param style * @param variation http://git-wip-us.apache.org/repos/asf/wicket/blob/ffdefe28/wicket-core/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java b/wicket-core/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java index 42bf66c..c605c06 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java @@ -90,8 +90,7 @@ public class DefaultMarkupResourceStreamProvider implements IMarkupResourceStrea // Did we find it already? if (resourceStream != null) { - return new MarkupResourceStream(resourceStream, new ContainerInfo(container), - containerClass); + return new MarkupResourceStream(resourceStream, new ContainerInfo(containerClass, container), containerClass); } // Walk up the class hierarchy one level, if markup has not http://git-wip-us.apache.org/repos/asf/wicket/blob/ffdefe28/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html index 17fef79..be3a42e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/MyPageExpectedResult.html @@ -2,7 +2,7 @@ <html> <head> - <script id="org-apache-wicket-markup-html-header-PanelA-0"> + <script id="org-apache-wicket-markup-html-header-BasePanel-0"> /*<