You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/07/24 20:58:44 UTC
svn commit: r425148 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/engine/RequestCycle.java
java/org/apache/tapestry/form/Radio.java scripts/TestRadio.xml
Author: jkuhnert
Date: Mon Jul 24 11:58:43 2006
New Revision: 425148
URL: http://svn.apache.org/viewvc?rev=425148&view=rev
Log:
Fixes for TAPESTRY-810
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Radio.java
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRadio.xml
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java?rev=425148&r1=425147&r2=425148&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/RequestCycle.java Mon Jul 24 11:58:43 2006
@@ -514,8 +514,7 @@
page.validate(this);
- Tapestry
- .checkMethodInvocation(Tapestry.ABSTRACTPAGE_VALIDATE_METHOD_ID, "validate()", page);
+ Tapestry.checkMethodInvocation(Tapestry.ABSTRACTPAGE_VALIDATE_METHOD_ID, "validate()", page);
_page = page;
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Radio.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Radio.java?rev=425148&r1=425147&r2=425148&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Radio.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Radio.java Mon Jul 24 11:58:43 2006
@@ -78,7 +78,9 @@
writer.attribute("type", "radio");
writer.attribute("name", group.getName());
-
+
+ writer.attribute("id", group.getName()+option);
+
// As the group if the value for this Radio matches the selection
// for the group as a whole; if so this is the default radio and is checked.
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRadio.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRadio.xml?rev=425148&r1=425147&r2=425148&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRadio.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestRadio.xml Mon Jul 24 11:58:43 2006
@@ -32,10 +32,10 @@
<![CDATA[
<input type="radio" .*?> \w+
]]>
- <match><![CDATA[<input type="radio" name="RadioGroup" value="0"/> Small]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" checked="checked" value="1"/> Medium]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" value="2"/> Large]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="3"/> Gargantuan]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup0" value="0"/> Small]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup1" checked="checked" value="1"/> Medium]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup2" value="2"/> Large]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup3" disabled="disabled" value="3"/> Gargantuan]]></match>
</assert-output-matches>
@@ -64,10 +64,10 @@
<![CDATA[
<input type="radio" .*?> \w+
]]>
- <match><![CDATA[<input type="radio" name="RadioGroup" value="0"/> Small]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" value="1"/> Medium]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" checked="checked" value="2"/> Large]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="3"/> Gargantuan]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup0" value="0"/> Small]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup1" value="1"/> Medium]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup2" checked="checked" value="2"/> Large]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup3" disabled="disabled" value="3"/> Gargantuan]]></match>
</assert-output-matches>
@@ -95,10 +95,10 @@
<![CDATA[
<input type="radio" .*?> \w+
]]>
- <match><![CDATA[<input type="radio" name="RadioGroup" value="0"/> Small]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" checked="checked" value="1"/> Medium]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" value="2"/> Large]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="3"/> Gargantuan]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup0" value="0"/> Small]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup1" checked="checked" value="1"/> Medium]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup2" value="2"/> Large]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup3" disabled="disabled" value="3"/> Gargantuan]]></match>
</assert-output-matches>
@@ -127,10 +127,10 @@
<![CDATA[
<input type="radio" .*?> \w+
]]>
- <match><![CDATA[<input type="radio" name="RadioGroup" value="0"/> Small]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" checked="checked" value="1"/> Medium]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" value="2"/> Large]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="3"/> Gargantuan]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup0" value="0"/> Small]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup1" checked="checked" value="1"/> Medium]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup2" value="2"/> Large]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup3" disabled="disabled" value="3"/> Gargantuan]]></match>
</assert-output-matches>
@@ -159,10 +159,10 @@
<![CDATA[
<input type="radio" .*?> \w+
]]>
- <match><![CDATA[<input type="radio" name="RadioGroup" value="0"/> Small]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" checked="checked" value="1"/> Medium]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" value="2"/> Large]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="3"/> Gargantuan]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup0" value="0"/> Small]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup1" checked="checked" value="1"/> Medium]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup2" value="2"/> Large]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup3" disabled="disabled" value="3"/> Gargantuan]]></match>
</assert-output-matches>
@@ -189,10 +189,10 @@
<![CDATA[
<input type="radio" .*?> \w+
]]>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="0"/> Small]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" checked="checked" disabled="disabled" value="1"/> Medium]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="2"/> Large]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="3"/> Gargantuan]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup0" disabled="disabled" value="0"/> Small]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup1" checked="checked" disabled="disabled" value="1"/> Medium]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup2" disabled="disabled" value="2"/> Large]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup3" disabled="disabled" value="3"/> Gargantuan]]></match>
</assert-output-matches>
@@ -220,10 +220,10 @@
<![CDATA[
<input type="radio" .*?> \w+
]]>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="0"/> Small]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" checked="checked" disabled="disabled" value="1"/> Medium]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="2"/> Large]]></match>
- <match><![CDATA[<input type="radio" name="RadioGroup" disabled="disabled" value="3"/> Gargantuan]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup0" disabled="disabled" value="0"/> Small]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup1" checked="checked" disabled="disabled" value="1"/> Medium]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup2" disabled="disabled" value="2"/> Large]]></match>
+ <match><![CDATA[<input type="radio" name="RadioGroup" id="RadioGroup3" disabled="disabled" value="3"/> Gargantuan]]></match>
</assert-output-matches>
@@ -290,19 +290,19 @@
</assert-output>
<assert-output name="No Choice">
-<![CDATA[<input type="radio" name="group" checked="checked" value="0"/> No Choice]]>
+<![CDATA[<input type="radio" name="group" id="group0" checked="checked" value="0"/> No Choice]]>
</assert-output>
<assert-output name="Tapestry">
-<![CDATA[<input type="radio" name="group" value="1"/> Tapestry]]>
+<![CDATA[<input type="radio" name="group" id="group1" value="1"/> Tapestry]]>
</assert-output>
<assert-output name="Struts">
-<![CDATA[<input type="radio" name="group" value="2"/> Struts]]>
+<![CDATA[<input type="radio" name="group" id="group2" value="2"/> Struts]]>
</assert-output>
<assert-output name="WebWork">
-<![CDATA[<input type="radio" name="group" value="3"/> WebWork]]>
+<![CDATA[<input type="radio" name="group" id="group3" value="3"/> WebWork]]>
</assert-output>
<assert-output name="Selection">
@@ -322,19 +322,19 @@
<parameter name="group" value="1"/>
<assert-output name="No Choice">
-<![CDATA[<input type="radio" name="group" value="0"/> No Choice]]>
+<![CDATA[<input type="radio" name="group" id="group0" value="0"/> No Choice]]>
</assert-output>
<assert-output name="Tapestry">
-<![CDATA[<input type="radio" name="group" checked="checked" value="1"/> Tapestry]]>
+<![CDATA[<input type="radio" name="group" id="group1" checked="checked" value="1"/> Tapestry]]>
</assert-output>
<assert-output name="Struts">
-<![CDATA[<input type="radio" name="group" value="2"/> Struts]]>
+<![CDATA[<input type="radio" name="group" id="group2" value="2"/> Struts]]>
</assert-output>
<assert-output name="WebWork">
-<![CDATA[<input type="radio" name="group" value="3"/> WebWork]]>
+<![CDATA[<input type="radio" name="group" id="group3" value="3"/> WebWork]]>
</assert-output>
<assert-output name="Selection">
@@ -351,19 +351,19 @@
<parameter name="formids" value="group"/>
<assert-output name="No Choice">
-<![CDATA[<input type="radio" name="group" checked="checked" value="0"/> No Choice]]>
+<![CDATA[<input type="radio" name="group" id="group0" checked="checked" value="0"/> No Choice]]>
</assert-output>
<assert-output name="Tapestry">
-<![CDATA[<input type="radio" name="group" value="1"/> Tapestry]]>
+<![CDATA[<input type="radio" name="group" id="group1" value="1"/> Tapestry]]>
</assert-output>
<assert-output name="Struts">
-<![CDATA[<input type="radio" name="group" value="2"/> Struts]]>
+<![CDATA[<input type="radio" name="group" id="group2" value="2"/> Struts]]>
</assert-output>
<assert-output name="WebWork">
-<![CDATA[<input type="radio" name="group" value="3"/> WebWork]]>
+<![CDATA[<input type="radio" name="group" id="group3" value="3"/> WebWork]]>
</assert-output>
<assert-output name="Selection">
@@ -381,15 +381,15 @@
</assert-output>
<assert-output name="Java">
-<![CDATA[<input type="radio" name="group" value="0"/> Java]]>
+<![CDATA[<input type="radio" name="group" id="group0" value="0"/> Java]]>
</assert-output>
<assert-output name="C#">
-<![CDATA[<input type="radio" name="group" value="1"/> C#]]>
+<![CDATA[<input type="radio" name="group" id="group1" value="1"/> C#]]>
</assert-output>
<assert-output name="C#">
-<![CDATA[<input type="radio" name="group" value="2"/> Python]]>
+<![CDATA[<input type="radio" name="group" id="group2" value="2"/> Python]]>
</assert-output>
</request>
@@ -407,15 +407,15 @@
</assert-output>
<assert-output name="Java">
-<![CDATA[<input type="radio" name="group" value="0"/> Java]]>
+<![CDATA[<input type="radio" name="group" id="group0" value="0"/> Java]]>
</assert-output>
<assert-output name="C#">
-<![CDATA[<input type="radio" name="group" value="1"/> C#]]>
+<![CDATA[<input type="radio" name="group" id="group1" value="1"/> C#]]>
</assert-output>
<assert-output name="C#">
-<![CDATA[<input type="radio" name="group" checked="checked" value="2"/> Python]]>
+<![CDATA[<input type="radio" name="group" id="group2" checked="checked" value="2"/> Python]]>
</assert-output>
</request>