Author: jdonnerstag
Date: Fri Feb 13 18:46:40 2009
New Revision: 744218
URL: http://svn.apache.org/viewvc?rev=744218&view=rev
Log:
minor improvements to header handling
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java?rev=744218&r1=744217&r2=744218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
Fri Feb 13 18:46:40 2009
@@ -151,7 +151,8 @@
// create a unique id for the
HtmlHeaderContainer to be
// created
final String headerId = "_" +
Classes.simpleName(markupClass) +
- container.getVariation() + "Header" +
index;
+ (container.getVariation() == null ? ""
: container.getVariation()) + "Header" +
+ index;
// Create the header container and associate
the markup with
// it
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?rev=744218&r1=744217&r2=744218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
Fri Feb 13 18:46:40 2009
@@ -254,7 +254,7 @@
* The component's id
* @return true, if the component ok to render
*/
- public final boolean okToRenderComponent(final String scope, final
String id)
+ public boolean okToRenderComponent(final String scope, final String id)
{
if (renderedComponentsPerScope == null)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java?rev=744218&r1=744217&r2=744218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
Fri Feb 13 18:46:40 2009
@@ -75,8 +75,8 @@
{
// Create a special header component which will gather
additional
// input the <head> from 'contributors'.
- final WebMarkupContainer header = new
HtmlHeaderContainer(
- HtmlHeaderSectionHandler.HEADER_ID +
container.getPage().getAutoIndex());
+ final WebMarkupContainer header =
newHtmlHeaderContainer(HtmlHeaderSectionHandler.HEADER_ID +
+ container.getPage().getAutoIndex());
container.autoAdd(header, markupStream);
// Yes, we handled the tag
@@ -91,8 +91,8 @@
{
// Create a special header component which will
gather
// additional input the <head> from
'contributors'.
- final MarkupContainer header = new
HtmlHeaderContainer(
- HtmlHeaderSectionHandler.HEADER_ID +
container.getPage().getAutoIndex());
+ final MarkupContainer header =
newHtmlHeaderContainer(HtmlHeaderSectionHandler.HEADER_ID +
+ container.getPage().getAutoIndex());
// It is <wicket:head>. Because they do not
provide any
// additional functionality they are merely a
means of surrounding relevant
@@ -157,7 +157,6 @@
throw new MarkupException(
"Mis-placed <wicket:head>.
<wicket:head> must be outside of <wicket:panel>, <wicket:border>, and
<wicket:extend>. Error occured while rendering page: " +
pageClassName + " using markup
stream: " + streamName);
-
}
// Yes, we handled the tag
@@ -167,4 +166,15 @@
// We were not able to handle the tag
return false;
}
+
+ /**
+ * Return a new HtmlHeaderContainer
+ *
+ * @param id
+ * @return HtmlHeaderContainer
+ */
+ protected HtmlHeaderContainer newHtmlHeaderContainer(String id)
+ {
+ return new HtmlHeaderContainer(id);
+ }
}
\ No newline at end of file
