Author: ivaynberg
Date: Sat May 7 18:50:06 2011
New Revision: 1100591
URL: http://svn.apache.org/viewvc?rev=1100591&view=rev
Log:
Issue: WICKET-3655
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java?rev=1100591&r1=1100590&r2=1100591&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java Sat
May 7 18:50:06 2011
@@ -2695,7 +2695,7 @@ public abstract class Component
if (response.wasRendered(this) == false)
{
// Let the component contribute something to
the header
- renderHead(response);
+ renderHead(this, response);
// Make sure the markup source strategy has
been considered as well.
getMarkupSourcingStrategy().renderHead(this,
container);
@@ -4391,10 +4391,20 @@ public abstract class Component
*/
public final void renderHead(Component component, IHeaderResponse
response)
{
+ if (component != this)
+ {
+ throw new IllegalStateException(
+ "This method is only meant to be invoked on the
component where the parameter component==this");
+ }
renderHead(response);
}
- /** {@inheritDoc} */
+ /**
+ * Render to the web response whatever the component wants to
contribute to the head section.
+ *
+ * @param response
+ * Response object
+ */
public void renderHead(IHeaderResponse response)
{
// noop
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java?rev=1100591&r1=1100590&r2=1100591&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/IHeaderContributor.java
Sat May 7 18:50:06 2011
@@ -33,7 +33,7 @@ import org.apache.wicket.IClusterable;
* super(id);
* }
*
- * public void renderHead(IHeaderResponse response)
+ * public void renderHead(Component component, IHeaderResponse response)
* {
* response.renderOnLoadJavaScript("alert('page
loaded!');");
* }
@@ -48,6 +48,11 @@ public interface IHeaderContributor exte
/**
* Render to the web response whatever the component wants to
contribute to the head section.
*
+ * @param component
+ * component which is contributing to the response. This
parameter is here to give
+ * the component as the context for behaviors implementing
this interface, when
+ * invoked on a component instance the parameter is simply
{@code this}.
+ *
* @param response
* Response object
*/
