You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by pf...@apache.org on 2006/03/21 18:54:41 UTC
svn commit: r387589 - in /jakarta/tapestry/branches/4.0: ./
framework/src/java/org/apache/tapestry/form/
Author: pferraro
Date: Tue Mar 21 09:54:25 2006
New Revision: 387589
URL: http://svn.apache.org/viewcvs?rev=387589&view=rev
Log:
Fixed TAPESTRY-830: RadioGroup has to render body on rewind
Modified:
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/LinkSubmit.java
jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/RadioGroup.java
jakarta/tapestry/branches/4.0/status.xml
Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java?rev=387589&r1=387588&r2=387589&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/AbstractFormComponent.java Tue Mar 21 09:54:25 2006
@@ -111,14 +111,10 @@
if (form.isRewinding())
{
if (!isDisabled())
- {
rewindFormComponent(writer, cycle);
- }
-
- // This is for the benefit of the couple of components (LinkSubmit) that allow a body.
- // The body should render when the component rewinds.
-
- if (getRenderBodyOnRewind())
+
+ // This is for the benefit of the couple of components (LinkSubmit and RadioGroup) that allow a body.
+ else if (getAlwaysRenderBodyOnRewind())
renderBody(writer, cycle);
}
else if (!cycle.isRewinding())
@@ -146,7 +142,7 @@
*
* @return false; override this method to change.
*/
- protected boolean getRenderBodyOnRewind()
+ protected boolean getAlwaysRenderBodyOnRewind()
{
return false;
}
Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/LinkSubmit.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/LinkSubmit.java?rev=387589&r1=387588&r2=387589&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/LinkSubmit.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/LinkSubmit.java Tue Mar 21 09:54:25 2006
@@ -93,6 +93,16 @@
}
/**
+ * @see org.apache.tapestry.form.AbstractSubmit#rewindFormComponent(org.apache.tapestry.IMarkupWriter, org.apache.tapestry.IRequestCycle)
+ */
+ protected void rewindFormComponent(IMarkupWriter writer, IRequestCycle cycle)
+ {
+ super.rewindFormComponent(writer, cycle);
+
+ renderBody(writer, cycle);
+ }
+
+ /**
* @see org.apache.tapestry.AbstractComponent#prepareForRender(org.apache.tapestry.IRequestCycle)
*/
protected void prepareForRender(IRequestCycle cycle)
@@ -126,7 +136,7 @@
* Returns true; the LinkSubmit's body should render during a rewind, even if the component is
* itself disabled.
*/
- protected boolean getRenderBodyOnRewind()
+ protected boolean getAlwaysRenderBodyOnRewind()
{
return true;
}
Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/RadioGroup.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/RadioGroup.java?rev=387589&r1=387588&r2=387589&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/RadioGroup.java (original)
+++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/form/RadioGroup.java Tue Mar 21 09:54:25 2006
@@ -204,4 +204,12 @@
{
return false;
}
+
+ /**
+ * @see org.apache.tapestry.form.AbstractFormComponent#getRenderBodyOnRewind()
+ */
+ protected boolean getAlwaysRenderBodyOnRewind()
+ {
+ return true;
+ }
}
Modified: jakarta/tapestry/branches/4.0/status.xml
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/status.xml?rev=387589&r1=387588&r2=387589&view=diff
==============================================================================
--- jakarta/tapestry/branches/4.0/status.xml (original)
+++ jakarta/tapestry/branches/4.0/status.xml Tue Mar 21 09:54:25 2006
@@ -128,6 +128,9 @@
<action type="fix" dev="JK" fixes-bug="TAPESTRY-745" due-to="Brian K. Wallace" >
JDK 1.5 requirement added to jboss documentation in examples.
</action>
+ <action type="fix" dev="PF" fixes-bug="TAPESTRY-830">
+ RadioGroup component now rewinds its body appropriately when disabled.
+ </action>
</release>
<release version="4.0" date="Jan 6 2006">
<action type="update" dev="HLS">Add link to DeveloperWorks Tapestry article</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org