Author: ivaynberg
Date: Wed Nov 26 10:34:19 2008
New Revision: 720936
URL: http://svn.apache.org/viewvc?rev=720936&view=rev
Log:
WICKET-1955
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java?rev=720936&r1=720935&r2=720936&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
Wed Nov 26 10:34:19 2008
@@ -66,7 +66,7 @@
* @return true, if componentId was handle by the resolver. False,
otherwise
*/
public boolean resolve(final MarkupContainer container, final
MarkupStream markupStream,
- final ComponentTag tag)
+ final ComponentTag tag)
{
// Only <head> component tags have the id == "_header"
if (tag.getId().equals(HtmlHeaderSectionHandler.HEADER_ID))
@@ -74,7 +74,7 @@
// 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());
+ HtmlHeaderSectionHandler.HEADER_ID +
container.getPage().getAutoIndex());
container.autoAdd(header, markupStream);
// Yes, we handled the tag
@@ -90,14 +90,14 @@
// 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());
+ 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
// markup. Thus we simply create a
WebMarkupContainer to handle
// the tag.
final WebMarkupContainer header2 = new
WebMarkupContainer(
-
HtmlHeaderSectionHandler.HEADER_ID)
+ HtmlHeaderSectionHandler.HEADER_ID)
{
private static final long
serialVersionUID = 1L;
@@ -120,7 +120,7 @@
// relevant markup. Thus we simply create a
WebMarkupContainer to handle
// the tag.
final WebMarkupContainer header = new
WebMarkupContainer(
-
HtmlHeaderSectionHandler.HEADER_ID)
+ HtmlHeaderSectionHandler.HEADER_ID)
{
private static final long
serialVersionUID = 1L;
@@ -138,15 +138,15 @@
catch (IllegalArgumentException ex)
{
throw new WicketRuntimeException("If
the root exception says something like "
- + "\"A child with id
'_header' already exists\" "
- + "then you most likely
forgot to override autoAdd() "
- + "in your bordered
page component.", ex);
+ + "\"A child with id '_header'
already exists\" "
+ + "then you most likely forgot
to override autoAdd() "
+ + "in your bordered page
component.", ex);
}
}
else
{
throw new MarkupException(
- "Mis-placed <wicket:head>.
<wicket:head> must be outside of <wicket:panel> and <wicket:border>");
+ "Mis-placed <wicket:head>.
<wicket:head> must be outside of <wicket:panel>, <wicket:border>, and
<wicket:extend>");
}
// Yes, we handled the tag
