svn commit: r474020 - in /tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form: Hidden.java Radio.java

[jkuhnert]

Author: jkuhnert
Date: Sun Nov 12 11:36:59 2006
New Revision: 474020

URL: http://svn.apache.org/viewvc?view=rev&rev=474020
Log:
Fixes TAPESTRY-983

Modified:
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.java
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Radio.java

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.java?view=diff&rev=474020&r1=474019&r2=474020
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.java
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/Hidden.java
 Sun Nov 12 11:36:59 2006
@@ -65,9 +65,7 @@
         else
             externalValue = (String) 
getBinding("value").getObject(String.class);
         
-        String id = getClientId();
-        
-        form.addHiddenValue(getName(), id, externalValue);
+        form.addHiddenValue(getName(), getClientId(), externalValue);
     }
 
     /**

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?view=diff&rev=474020&r1=474019&r2=474020
==============================================================================
--- 
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
 Sun Nov 12 11:36:59 2006
@@ -49,6 +49,7 @@
     {
 
         RadioGroup group = RadioGroup.get(cycle);
+        
         if (group == null)
             throw new ApplicationRuntimeException(
                 Tapestry.getMessage("Radio.must-be-contained-by-group"),
@@ -70,20 +71,23 @@
 
             if (!isDisabled() && !group.isDisabled() && 
group.isSelected(option))
                 group.updateSelection(getValue());
+            
             return;
         }
 
+        setClientId(group.getName()+option);
+        
         writer.beginEmpty("input");
 
         writer.attribute("type", "radio");
 
         writer.attribute("name", group.getName());
         
-        writer.attribute("id", group.getName()+option);
+        renderIdAttribute(writer, cycle);
         
         // 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.
-
+        
         if (group.isSelection(getValue()))
             writer.attribute("checked", "checked");