svn commit: r1044240 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/markup/MarkupResourceStream.java test/java/org/apache/wicket/markup/WicketNamespaceTest.java

[mgrigorov]

Author: mgrigorov
Date: Fri Dec 10 08:24:29 2010
New Revision: 1044240

URL: http://svn.apache.org/viewvc?rev=1044240&view=rev
Log:
Use the markup of the base container when trying to resolve the doctype.
This way the functionality works for markup inheritance.

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java?rev=1044240&r1=1044239&r2=1044240&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/MarkupResourceStream.java
 Fri Dec 10 08:24:29 2010
@@ -364,6 +364,15 @@ public class MarkupResourceStream implem
         */
        public final String getDoctype()
        {
+               if (doctype == null)
+               {
+                       MarkupResourceStream baseMarkupResourceStream = 
getBaseMarkupResourceStream();
+                       if (baseMarkupResourceStream != null)
+                       {
+                               doctype = baseMarkupResourceStream.getDoctype();
+                       }
+               }
+
                return doctype;
        }
 
@@ -394,6 +403,6 @@ public class MarkupResourceStream implem
         */
        public boolean isHtml5()
        {
-               return "html".equalsIgnoreCase(doctype);
+               return "html".equalsIgnoreCase(getDoctype());
        }
 }

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java?rev=1044240&r1=1044239&r2=1044240&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
 Fri Dec 10 08:24:29 2010
@@ -97,7 +97,7 @@ public class WicketNamespaceTest extends
        /**
         * @throws Exception
         */
-       public void XXtestDoctype_InheritedPage() throws Exception
+       public void testDoctype_InheritedPage() throws Exception
        {
                executeTest(Doctype_1_InheritedPage.class, 
"DoctypeExpectedResult_1_Inherited.html");
                MarkupResourceStream rs = MarkupFactory.get()