Author: ivaynberg
Date: Wed Nov 26 10:42:34 2008
New Revision: 720939
URL: http://svn.apache.org/viewvc?rev=720939&view=rev
Log:
WICKET-1955
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
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=720939&r1=720938&r2=720939&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
Wed Nov 26 10:42:34 2008
@@ -17,6 +17,7 @@
package org.apache.wicket.markup.resolver;
import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupException;
@@ -27,6 +28,7 @@
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler;
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
+import org.apache.wicket.util.resource.IResourceStream;
/**
* This is a tag resolver which handles <head> and
<wicket:head>tags. It must be
@@ -147,8 +149,15 @@
}
else
{
+ final Page page = container.getPage();
+ final String pageClassName = (page != null) ?
page.getClass().getName() : "unknown";
+ final IResourceStream stream =
markupStream.getResource();
+ final String streamName = (stream != null) ?
stream.toString() : "unknown";
+
throw new MarkupException(
- "Mis-placed <wicket:head>.
<wicket:head> must be outside of <wicket:panel>, <wicket:border>, and
<wicket:extend>");
+ "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
