Updated Branches: refs/heads/master 8a4f6a722 -> 9759e26e7
WICKET-4964 Rename Component#renderHead(HtmlHeaderContainer) Rename Component#renderHead(HtmlHeaderContainer) to #internalRenderHead(HtmlHeaderContainer) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9759e26e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9759e26e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9759e26e Branch: refs/heads/master Commit: 9759e26e7558b713ed082e349cba2a6ed437725a Parents: 8a4f6a7 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed May 1 14:05:48 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed May 1 14:05:48 2013 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Component.java | 4 ++-- .../AbstractHeaderRenderStrategy.java | 2 +- .../ChildFirstHeaderRenderStrategy.java | 2 +- .../ParentFirstHeaderRenderStrategy.java | 2 +- .../apache/wicket/ajax/AjaxHeaderContribution.java | 4 ++-- .../wicket/ajax/AjaxHeaderContribution2.java | 4 ++-- .../org/apache/wicket/ajax/DomReadyOrderPage.java | 4 ++-- .../parser/filter/HeaderSectionMyLabel2.java | 2 +- .../extensions/markup/html/tree/AbstractTree.java | 8 ++++---- 9 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9759e26e/wicket-core/src/main/java/org/apache/wicket/Component.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java index 50076b5..eed72f5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -2665,13 +2665,13 @@ public abstract class Component * @param container * The HtmlHeaderContainer */ - public void renderHead(final HtmlHeaderContainer container) + public void internalRenderHead(final HtmlHeaderContainer container) { if (isVisibleInHierarchy() && isRenderAllowed()) { if (log.isDebugEnabled()) { - log.debug("renderHead: {}", toString(false)); + log.debug("internalRenderHead: {}", toString(false)); } IHeaderResponse response = container.getHeaderResponse(); http://git-wip-us.apache.org/repos/asf/wicket/blob/9759e26e/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java index b657787..ada6b2f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java @@ -124,7 +124,7 @@ public abstract class AbstractHeaderRenderStrategy implements IHeaderRenderStrat final HeaderStreamState headerStreamState, final Component rootComponent) { headerContainer.renderHeaderTagBody(headerStreamState); - rootComponent.renderHead(headerContainer); + rootComponent.internalRenderHead(headerContainer); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/9759e26e/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategy.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategy.java index 8938182..f1b03a4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategy.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategy.java @@ -82,7 +82,7 @@ public class ChildFirstHeaderRenderStrategy extends AbstractHeaderRenderStrategy { if (component != rootComponent) { - component.renderHead(headerContainer); + component.internalRenderHead(headerContainer); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/9759e26e/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/ParentFirstHeaderRenderStrategy.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/ParentFirstHeaderRenderStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/ParentFirstHeaderRenderStrategy.java index 331de6d..93f4e2f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/ParentFirstHeaderRenderStrategy.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/ParentFirstHeaderRenderStrategy.java @@ -61,7 +61,7 @@ public class ParentFirstHeaderRenderStrategy extends AbstractHeaderRenderStrateg { if (component.isVisibleInHierarchy()) { - component.renderHead(headerContainer); + component.internalRenderHead(headerContainer); } else { http://git-wip-us.apache.org/repos/asf/wicket/blob/9759e26e/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution.java index a219e69..8d25927 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution.java @@ -37,9 +37,9 @@ class AjaxHeaderContribution extends Panel } @Override - public void renderHead(HtmlHeaderContainer container) + public void internalRenderHead(HtmlHeaderContainer container) { - super.renderHead(container); + super.internalRenderHead(container); container.getHeaderResponse().render(JavaScriptHeaderItem.forUrl("javascripturl")); container.getHeaderResponse().render(OnDomReadyHeaderItem.forScript("domReady();")); http://git-wip-us.apache.org/repos/asf/wicket/blob/9759e26e/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution2.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution2.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution2.java index c098250..49c1a34 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution2.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContribution2.java @@ -37,9 +37,9 @@ class AjaxHeaderContribution2 extends Panel } @Override - public void renderHead(HtmlHeaderContainer container) + public void internalRenderHead(HtmlHeaderContainer container) { - super.renderHead(container); + super.internalRenderHead(container); container.getHeaderResponse().render(JavaScriptHeaderItem.forUrl("javascripturlB")); container.getHeaderResponse().render(OnDomReadyHeaderItem.forScript("domReadyB();")); http://git-wip-us.apache.org/repos/asf/wicket/blob/9759e26e/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java index 4cef699..17670d3 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java @@ -51,9 +51,9 @@ public class DomReadyOrderPage extends WebPage } @Override - public void renderHead(HtmlHeaderContainer container) + public void internalRenderHead(HtmlHeaderContainer container) { - super.renderHead(container); + super.internalRenderHead(container); container.getHeaderResponse().render(OnDomReadyHeaderItem.forScript("test1();")); container.getHeaderResponse().render(OnDomReadyHeaderItem.forScript("test2();")); http://git-wip-us.apache.org/repos/asf/wicket/blob/9759e26e/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java index 61272ff..186e4bf 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionMyLabel2.java @@ -45,7 +45,7 @@ public class HeaderSectionMyLabel2 extends Label * @param container */ @Override - public void renderHead(HtmlHeaderContainer container) + public void internalRenderHead(HtmlHeaderContainer container) { this.getResponse().write("text added by contributor"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/9759e26e/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java index 3ee40fb..4d3989e 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java @@ -264,9 +264,9 @@ public abstract class AbstractTree extends Panel } @Override - public void renderHead(final HtmlHeaderContainer container) + public void internalRenderHead(final HtmlHeaderContainer container) { - super.renderHead(container); + super.internalRenderHead(container); if (isRenderChildren()) { @@ -278,7 +278,7 @@ public abstract class AbstractTree extends Panel { if (item.isVisible()) { - item.renderHead(container); + item.internalRenderHead(container); } // write header contributions from the children of item @@ -290,7 +290,7 @@ public abstract class AbstractTree extends Panel { if (component.isVisible()) { - component.renderHead(container); + component.internalRenderHead(container); } else {
