You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2007/06/24 10:23:05 UTC
svn commit: r550177 - in /incubator/wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/markup/html/internal/
test/java/org/apache/wicket/markup/html/basic/
Author: jdonnerstag
Date: Sun Jun 24 01:23:04 2007
New Revision: 550177
URL: http://svn.apache.org/viewvc?view=rev&rev=550177
Log:
- added a junit test for HeaderContributor added to a Page
- modified HtmlHeaderContainer to even work if a component is attached to <html>. That is, HtmlHeaderContainer no longer expects its parent to be a Page.
Added:
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_15.html (with props)
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.html (with props)
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.java (with props)
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_13.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?view=diff&rev=550177&r1=550176&r2=550177
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java Sun Jun 24 01:23:04 2007
@@ -28,7 +28,6 @@
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.border.Border;
import org.apache.wicket.response.StringResponse;
@@ -131,19 +130,8 @@
// with the markup
super.onComponentTagBody(markupStream, openTag);
- // If the parent component is a Page (or a bordered Page), we must
- // now include the header sections of all components in the
- // component hierarchie.
- MarkupContainer parent = getParent();
-
- // If bordered page ...
- while ((parent instanceof Border))
- {
- parent = parent.getParent();
- }
-
- // must be a Page
- renderHeaderSections(parent, this);
+ // Render all header sections of all components on the page
+ renderHeaderSections(getPage(), this);
// Automatically add <head> if necessary
CharSequence output = response.getBuffer();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html?view=diff&rev=550177&r1=550176&r2=550177
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html Sun Jun 24 01:23:04 2007
@@ -2,14 +2,14 @@
<! DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html lang="de" wicket:id="html" xmlns:wicket="" xmlns="http://www.w3.org/1999/xhtml" xmlns:lang="[current language]" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:html::IBehaviorListener:0:', function() { }.bind(this), function() { }.bind(this));return !wcall;" id="html0">
- <head><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+ <head><link rel="stylesheet" type="text/css" href="../BasePage.css" />
+<script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
/*-->]]>*/</script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
-<link rel="stylesheet" type="text/css" href="../BasePage.css" />
</head><body>
</body>
</html>
Added: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_15.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_15.html?view=auto&rev=550177
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_15.html (added)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_15.html Sun Jun 24 01:23:04 2007
@@ -0,0 +1,6 @@
+<html xmlns:wicket>
+<head><link rel="stylesheet" type="text/css" href="../BasePage.css" />
+</head><body>
+ test
+</body>
+</html>
Propchange: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_15.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java?view=diff&rev=550177&r1=550176&r2=550177
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java Sun Jun 24 01:23:04 2007
@@ -409,5 +409,12 @@
{
executeTest(SimplePage_14.class, "SimplePageExpectedResult_14.html");
}
-
+
+ /**
+ * @throws Exception
+ */
+ public void testRenderHomePage_15() throws Exception
+ {
+ executeTest(SimplePage_15.class, "SimplePageExpectedResult_15.html");
+ }
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_13.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_13.java?view=diff&rev=550177&r1=550176&r2=550177
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_13.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_13.java Sun Jun 24 01:23:04 2007
@@ -51,6 +51,7 @@
header.add(new AttributeModifier("lang", new Model("de")));
add(header);
- header.add(HeaderContributor.forCss("BasePage.css"));
+ // HeaderContributions must work with <html> components in place as well
+ add(HeaderContributor.forCss("BasePage.css"));
}
}
Added: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.html?view=auto&rev=550177
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.html (added)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.html Sun Jun 24 01:23:04 2007
@@ -0,0 +1,5 @@
+<html xmlns:wicket>
+<body>
+ test
+</body>
+</html>
Propchange: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.html
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.java?view=auto&rev=550177
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.java (added)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.java Sun Jun 24 01:23:04 2007
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.html.basic;
+
+import org.apache.wicket.behavior.HeaderContributor;
+import org.apache.wicket.markup.html.WebPage;
+
+
+/**
+ * Wicket component attached to <html> tag
+ *
+ * @author Juergen Donnerstag
+ */
+public class SimplePage_15 extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public SimplePage_15()
+ {
+ add(HeaderContributor.forCss("BasePage.css"));
+ }
+}
Propchange: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.java
------------------------------------------------------------------------------
svn:eol-style = native