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 2010/11/21 18:55:25 UTC
svn commit: r1037514 - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/markup/renderStrategy/
test/java/org/apache/wicket/markup/html/basic/
test/java/org/apache/wicket/markup/renderStrategy/
Author: jdonnerstag
Date: Sun Nov 21 17:55:25 2010
New Revision: 1037514
URL: http://svn.apache.org/viewvc?rev=1037514&view=rev
Log:
fixed: execution order of header contributions (WICKET-2693)
Issue: WICKET-2693
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java?rev=1037514&r1=1037513&r2=1037514&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java Sun Nov 21 17:55:25 2010
@@ -87,10 +87,10 @@ public abstract class AbstractHeaderRend
// Our default header render strategy
// Pre 1.5
- return new ParentFirstHeaderRenderStrategy();
+ // return new ParentFirstHeaderRenderStrategy();
// Since 1.5
- // return new ChildFirstHeaderRenderStrategy();
+ return new ChildFirstHeaderRenderStrategy();
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html?rev=1037514&r1=1037513&r2=1037514&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html Sun Nov 21 17:55:25 2010
@@ -2,8 +2,7 @@
<! DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html wicket:id="html" xmlns:wicket="" xmlns="http://www.w3.org/1999/xhtml" xmlns:lang="[current language]" lang="de" id="html1" onclick="var wcall=wicketAjaxGet('../page?0-1.IBehaviorListener.0-html',function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('html1') != null;}.bind(this));return !wcall;">
- <head><link rel="stylesheet" type="text/css" href="../../BasePage.css" />
-<script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+ <head><script type="text/javascript" src="../resource/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.WicketAjaxReference/wicket-ajax.js"></script>
<script type="text/javascript" src="../resource/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax-debug.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
@@ -12,6 +11,7 @@ wicketAjaxDebugEnable=true;
<script type="text/javascript" id="wicket-ajax-base-url"><!--/*--><![CDATA[/*><!--*/
Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.basic.SimplePage_13?0";
/*-->]]>*/</script>
+<link rel="stylesheet" type="text/css" href="../../BasePage.css" />
</head><body>
</body>
</html>
\ No newline at end of file
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java?rev=1037514&r1=1037513&r2=1037514&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java Sun Nov 21 17:55:25 2010
@@ -57,6 +57,23 @@ public class ChildFirstHeaderRenderStrat
private <T extends Page> void executeCombinedTest(final Class<T> pageClass,
final String filename) throws Exception
{
+ WicketTester tester = new WicketTester();
+ tester.startPage(pageClass);
+ tester.assertRenderedPage(pageClass);
+ tester.assertResultPage(getClass(), filename + "_2");
+ System.setProperty("Wicket_HeaderRenderStrategy", "");
+ }
+
+ /**
+ *
+ * @param <T>
+ * @param pageClass
+ * @param filename
+ * @throws Exception
+ */
+ private <T extends Page> void executeCombinedTestPre1_5(final Class<T> pageClass,
+ final String filename) throws Exception
+ {
// Default Config: parent first header render strategy
log.error("=== PARENT first header render strategy ===");
WicketTester tester = new WicketTester();