Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage_expected.html Fri Aug 13 07:17:16 2010 @@ -9,7 +9,7 @@ wicketAjaxDebugEnable=true; Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.AjaxFormSubmitTestPage?0"; /*-->]]>*/</script> </head><body> - <form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <input type="text" wicket:id="txt1" value="foo" name="txt1"/> <input type="text" wicket:id="txt2" value="bar" name="txt2"/> <input type="submit" value="Submit" wicket:id="submit" name=":submit" id="submit2" onclick="var wcall=wicketSubmitFormById('form1', '../page?0-1.IBehaviorListener.0-form-submit', ':submit' ,function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$$(this)&&Wicket.$$('form1')}.bind(this));;; return false;"/>
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTestPage_expected.html Fri Aug 13 07:17:16 2010 @@ -9,7 +9,7 @@ wicketAjaxDebugEnable=true; Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.form.OnChangeAjaxBehaviorTestPage?0"; /*-->]]>*/</script> </head><body> - <form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <input type="text" wicket:id="field" value="" name="field" id="field2" onchange="var wcall=wicketAjaxPost('../page?0-1.IBehaviorListener.0-form-field', wicketSerialize(Wicket.$('field2')),function() { }.bind(this),function() { }.bind(this), function() {return Wicket.$('field2') != null;}.bind(this));"/><script type="text/javascript"><!--/*--><![CDATA[/*><!--*/ new Wicket.ChangeHandler('field2'); /*-->]]>*/</script> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_13.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_13.java?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_13.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_13.java Fri Aug 13 07:17:16 2010 @@ -20,7 +20,7 @@ import org.apache.wicket.AttributeModifi import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; -import org.apache.wicket.behavior.CssLocationHeaderContributor; +import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.model.Model; @@ -51,8 +51,11 @@ public class SimplePage_13 extends WebPa }; header.add(new AttributeModifier("lang", new Model<String>("de"))); add(header); + } - // HeaderContributions must work with <html> components in place as well - add(new CssLocationHeaderContributor("BasePage.css")); + @Override + public void renderHead(IHeaderResponse response) + { + response.renderCSSReference("BasePage.css"); } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.java?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_15.java Fri Aug 13 07:17:16 2010 @@ -16,7 +16,7 @@ */ package org.apache.wicket.markup.html.basic; -import org.apache.wicket.behavior.CssLocationHeaderContributor; +import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebPage; @@ -29,11 +29,9 @@ public class SimplePage_15 extends WebPa { private static final long serialVersionUID = 1L; - /** - * Construct. - */ - public SimplePage_15() + @Override + public void renderHead(IHeaderResponse response) { - add(new CssLocationHeaderContributor("BasePage.css")); + response.renderCSSReference("BasePage.css"); } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTestPage_ExpectedResult_3.html Fri Aug 13 07:17:16 2010 @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml";> <body> <span wicket:id="border"><wicket:border> - <form wicket:id="myForm" id="myForm1" method="post" action="../page?0-1.IFormSubmitListener-border-myForm"><div style="display:none"><input type="hidden" name="myForm1_hf_0" id="myForm1_hf_0" /></div> + <form wicket:id="myForm" id="myForm1" method="post" action="../page?0-1.IFormSubmitListener-border-myForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="myForm1_hf_0" id="myForm1_hf_0" /></div> <wicket:body> <input type="text" wicket:id="name" value="" name="border_body:name"/> </wicket:body> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage_expected.html Fri Aug 13 07:17:16 2010 @@ -2,7 +2,7 @@ <head><title>CheckGroupTestPage1</title></head> <body> <!-- In addition test that chars are not converted from upper to lower and vice versa --> - <FORM wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <FORM wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <span wicket:id="group"> <Input type="checkbox" wicket:id="check1" id="check12" name="group" value="check1" checked="checked" disabled="disabled" class="wicket-group3">check1</input> <span wicket:id="container"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage1_expected.html Fri Aug 13 07:17:16 2010 @@ -2,7 +2,7 @@ <head><title>CheckGroupTestPage1</title></head> <body> <!-- In addition test that chars are not converted from upper to lower and vice versa --> - <FORM wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <FORM wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <Input type="checkbox" wicket:id="check1" id="check12" name="group" value="check1" class="wicket-group3">check1</input> <span wicket:id="container"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage2_expected.html Fri Aug 13 07:17:16 2010 @@ -1,7 +1,7 @@ <html> <head><title>CheckGroupTestPage2</title></head> <body> - <form wicket:id="form" id="form5" method="post" action="../page?1-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form5_hf_0" id="form5_hf_0" /></div> + <form wicket:id="form" id="form5" method="post" action="../page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form5_hf_0" id="form5_hf_0" /></div> <input type="checkbox" wicket:id="check1" id="check16" name="group" value="check1" checked="checked" class="wicket-group7">check1</input> <span wicket:id="container"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage3_expected.html Fri Aug 13 07:17:16 2010 @@ -1,7 +1,7 @@ <html> <head><title>CheckGroupTestPage3</title></head> <body> - <form wicket:id="form" id="form9" method="post" action="../page?2-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form9_hf_0" id="form9_hf_0" /></div> + <form wicket:id="form" id="form9" method="post" action="../page?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form9_hf_0" id="form9_hf_0" /></div> <input type="checkbox" wicket:id="check1" id="check1a" name="group" value="check1" class="wicket-groupb">check1</input> <span wicket:id="container"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage4_expected.html Fri Aug 13 07:17:16 2010 @@ -1,7 +1,7 @@ <html> <head><title>CheckGroupTestPage4</title></head> <body> - <form wicket:id="form" id="formd" method="post" action="../page?3-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="formd_hf_0" id="formd_hf_0" /></div> + <form wicket:id="form" id="formd" method="post" action="../page?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formd_hf_0" id="formd_hf_0" /></div> <input type="checkbox" wicket:id="check1" id="check1e" name="group" value="check1" checked="checked" class="wicket-groupf">check1</input> <span wicket:id="container"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormMethodTestPage_expected.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html> <body> - <form wicket:id="formpost" id="formpost1" method="post" action="../page?0-1.IFormSubmitListener-formpost"><div style="display:none"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form> - <form wicket:id="formget" id="formget2" method="get" action="../page"><div style="display:none"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" name="0-1.IFormSubmitListener-formget" value="" /></div></form> + <form wicket:id="formpost" id="formpost1" method="post" action="../page?0-1.IFormSubmitListener-formpost"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form> + <form wicket:id="formget" id="formget2" method="get" action="../page"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" name="0-1.IFormSubmitListener-formget" value="" /></div></form> </body> </html> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage_expected.html Fri Aug 13 07:17:16 2010 @@ -1,7 +1,7 @@ <html> <head><title>RadioGroupTestPage1</title></head> <body> - <form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <span wicket:id="group"> <input type="radio" wicket:id="radio1" id="radio12" name="group" value="radio1" disabled="disabled" class="wicket-group3">radio1</input> <span wicket:id="container"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1_expected.html Fri Aug 13 07:17:16 2010 @@ -1,7 +1,7 @@ <html> <head><title>RadioGroupTestPage1</title></head> <body> - <form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <input type="radio" wicket:id="radio1" id="radio12" name="group" value="radio1" class="wicket-group3">radio1</input> <span wicket:id="container"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage3_expected.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <input wicket:id="check1" type="radio" id="check12" name="radio" value="radio1" checked="checked" class="wicket-radio3">Yes <input wicket:id="check2" type="radio" id="check24" name="radio" value="radio2" checked="checked" class="wicket-radio3">No Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result1.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <span wicket:id="feedback"><wicket:border> <wicket:body> <input type="text" wicket:id="input" value="" name="feedback:feedback_body:input"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage_result2.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="../page?0-2.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="../page?0-2.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <span wicket:id="feedback"><wicket:border> <wicket:body> <input type="text" wicket:id="input" value="" name="feedback:feedback_body:input"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result1.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <input type="text" wicket:id="input" value="" name="input"> </form> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage_result2.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="../page?1-2.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="../page?1-2.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <input type="text" wicket:id="input" value="" name="input"> <span wicket:id="feedback"><wicket:panel><span style="color:red;">*</span></wicket:panel></span> </form> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePage1_ExpectedResult.html Fri Aug 13 07:17:16 2010 @@ -8,7 +8,7 @@ <span wicket:id="message">If you see this message wicket is properly configured and running</span> <div wicket:id="bug"><wicket:panel> - <form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-bug-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-bug-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <div wicket:id="border"><wicket:border> <wicket:body> <input wicket:id="name" value="" name="border:border_body:name"/> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/MyPage2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/MyPage2.java?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/MyPage2.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/MyPage2.java Fri Aug 13 07:17:16 2010 @@ -16,8 +16,9 @@ */ package org.apache.wicket.markup.html.header; -import org.apache.wicket.behavior.CssHeaderContributor; +import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.request.resource.PackageResourceReference; /** * @@ -31,7 +32,12 @@ public class MyPage2 extends WebPage */ public MyPage2() { - // And it is not problem if historically it has been added. Wicket will render it just once - add(new CssHeaderContributor(this.getClass(), this.getClass().getSimpleName() + ".css")); + } + + @Override + public void renderHead(IHeaderResponse response) + { + response.renderCSSReference(new PackageResourceReference(getClass(), + getClass().getSimpleName() + ".css")); } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1-1.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html xmlns:wicket> <body> - <form wicket:id="form" id="form1" method="post" action="page?2-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="page?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing --> <wicket:enclosure child="label"> <input wicket:id="input" type="checkbox" name="input"/> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-1.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html xmlns:wicket> <body> - <form wicket:id="form" id="form1" method="post" action="page?1-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing --> <wicket:enclosure child="label"></wicket:enclosure> </form> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2-1.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html xmlns:wicket> <body> - <form wicket:id="form" id="form1" method="post" action="page?2-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="page?2-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing --> <wicket:enclosure child="label"></wicket:enclosure> </form> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-2.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html xmlns:wicket> <body> - <form wicket:id="form" id="form1" method="post" action="page?4-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="page?4-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing --> <wicket:enclosure child="label"></wicket:enclosure> </form> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-1.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html xmlns:wicket> <body> - <form wicket:id="form" id="form1" method="post" action="page?5-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="page?5-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing --> <wicket:enclosure child="label"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3-2.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html xmlns:wicket> <body> - <form wicket:id="form" id="form1" method="post" action="page?6-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="page?6-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing --> <wicket:enclosure child="label"> <input wicket:id="input" type="checkbox" name="input"/> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-3.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html xmlns:wicket> <body> - <form wicket:id="form" id="form1" method="post" action="page?3-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="page?3-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing --> <wicket:enclosure child="label"> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9-4.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html xmlns:wicket> <body> - <form wicket:id="form" id="form1" method="post" action="page?1-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="page?1-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing --> <wicket:enclosure child="label"> <input wicket:id="input" type="checkbox" checked="checked" name="input"/> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePageExpectedResult_9.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html xmlns:wicket> <body> - <form wicket:id="form" id="form1" method="post" action="page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> + <form wicket:id="form" id="form1" method="post" action="page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <!-- does Wicket behave different if the enclosure child is a FormComponent?? Needs testing --> <wicket:enclosure child="label"> <input wicket:id="input" type="checkbox" name="input"/> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> </form> </body> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html Fri Aug 13 07:17:16 2010 @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="display:none"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="../page?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <input wicket:id="input" type="text" value="" name="input"> </form> </body> Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/PanelWithHeaderPart.java Fri Aug 13 07:17:16 2010 @@ -16,7 +16,6 @@ */ package org.apache.wicket.markup.parser.filter; -import org.apache.wicket.markup.html.IHeaderContributor; import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Panel; @@ -27,7 +26,7 @@ import org.apache.wicket.request.resourc * @author jcompagner * */ -public class PanelWithHeaderPart extends Panel implements IHeaderContributor +public class PanelWithHeaderPart extends Panel { private static final long serialVersionUID = 1L; @@ -41,6 +40,7 @@ public class PanelWithHeaderPart extends add(new Label("body")); } + @Override public void renderHead(IHeaderResponse response) { response.renderCSSReference(new PackageResourceReference(PanelWithHeaderPart.class, Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage1.java Fri Aug 13 07:17:16 2010 @@ -17,7 +17,8 @@ package org.apache.wicket.markup.renderStrategy; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.behavior.HeaderContributor; +import org.apache.wicket.behavior.AbstractBehavior; +import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; @@ -34,8 +35,6 @@ public class SimplePage1 extends WebPage */ public SimplePage1() { - add(HeaderContributor.forCss(getClass().getSimpleName() + ".css")); - MarkupContainer container1 = addXXX("container1", this); MarkupContainer container2 = addXXX("container2", this); MarkupContainer container2_1 = addXXX("container2_1", container2); @@ -56,7 +55,21 @@ public class SimplePage1 extends WebPage { MarkupContainer container = new WebMarkupContainer(id); parent.add(container); - container.add(HeaderContributor.forCss(id + ".css")); + container.add(new AbstractBehavior() + { + @Override + public void renderHead(IHeaderResponse response) + { + response.renderCSSReference(id + ".css"); + } + }); return container; } + + @Override + public void renderHead(IHeaderResponse response) + { + super.renderHead(response); + response.renderCSSReference(getClass().getSimpleName() + ".css"); + } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePage2.java Fri Aug 13 07:17:16 2010 @@ -17,7 +17,8 @@ package org.apache.wicket.markup.renderStrategy; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.behavior.HeaderContributor; +import org.apache.wicket.behavior.AbstractBehavior; +import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; @@ -34,8 +35,6 @@ public class SimplePage2 extends WebPage */ public SimplePage2() { - add(HeaderContributor.forCss(getClass().getSimpleName() + ".css")); - MarkupContainer container1 = addXXX("container1", this); MarkupContainer container2 = addXXX("container2", this); MarkupContainer container2_1 = addXXX("container2_1", container2); @@ -58,7 +57,22 @@ public class SimplePage2 extends WebPage { MarkupContainer container = new WebMarkupContainer(id); parent.add(container); - container.add(HeaderContributor.forCss(id + ".css")); + container.add(new AbstractBehavior() + { + @Override + public void renderHead(IHeaderResponse response) + { + response.renderCSSReference(id + ".css"); + } + }); return container; } + + @Override + public void renderHead(IHeaderResponse response) + { + super.renderHead(response); + response.renderCSSReference(getClass().getSimpleName() + ".css"); + } + } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/renderStrategy/SimplePanel1.java Fri Aug 13 07:17:16 2010 @@ -17,7 +17,8 @@ package org.apache.wicket.markup.renderStrategy; import org.apache.wicket.MarkupContainer; -import org.apache.wicket.behavior.HeaderContributor; +import org.apache.wicket.behavior.AbstractBehavior; +import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.panel.Panel; @@ -38,11 +39,7 @@ public class SimplePanel1 extends Panel public SimplePanel1(final String id) { super(id); - - add(HeaderContributor.forCss(getClass().getSimpleName() + ".css")); - addAll(""); - addAll("pre_"); } @@ -68,7 +65,21 @@ public class SimplePanel1 extends Panel { MarkupContainer container = new WebMarkupContainer(id); parent.add(container); - container.add(HeaderContributor.forCss(id + ".css")); + container.add(new AbstractBehavior() + { + @Override + public void renderHead(IHeaderResponse response) + { + response.renderCSSReference(id + ".css"); + } + }); return container; } + + @Override + public void renderHead(IHeaderResponse response) + { + super.renderHead(response); + response.renderCSSReference(getClass().getSimpleName() + ".css"); + } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java?rev=985109&r1=985108&r2=985109&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/HomePage_2.java Fri Aug 13 07:17:16 2010 @@ -16,10 +16,11 @@ */ package org.apache.wicket.markup.resolver; -import org.apache.wicket.behavior.CssHeaderContributor; +import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.request.resource.PackageResourceReference; /** * Homepage @@ -41,7 +42,11 @@ public class HomePage_2 extends WebPage // Add the simplest type of label add(new Label("message", "If you see this message wicket is properly configured and running")); + } - add(new CssHeaderContributor(HomePage_2.class, "main.css")); + @Override + public void renderHead(IHeaderResponse response) + { + response.renderCSSReference(new PackageResourceReference(HomePage_2.class, "main.css")); } }
