svn commit: r477535 - /incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/RadioChoice.java

[ivaynberg]

Author: ivaynberg
Date: Mon Nov 20 23:02:09 2006
New Revision: 477535

URL: http://svn.apache.org/viewvc?view=rev&rev=477535
Log:
WICKET-56 RadioChoice produces invalid XHTML

Modified:
    
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/RadioChoice.java

Modified: 
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/RadioChoice.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/RadioChoice.java?view=diff&rev=477535&r1=477534&r2=477535
==============================================================================
--- 
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/RadioChoice.java
 (original)
+++ 
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/html/form/RadioChoice.java
 Mon Nov 20 23:02:09 2006
@@ -42,10 +42,10 @@
  * HTML:
  * 
  * <pre>
- *      &lt;span valign=&quot;top&quot; wicket:id=&quot;site&quot;&gt;
- *             &lt;input type=&quot;radio&quot;&gt;site 1&lt;/input&gt;
- *             &lt;input type=&quot;radio&quot;&gt;site 2&lt;/input&gt;
- *      &lt;/span&gt;
+ *        &lt;span valign=&quot;top&quot; wicket:id=&quot;site&quot;&gt;
+ *             &lt;input type=&quot;radio&quot;&gt;site 1&lt;/input&gt;
+ *             &lt;input type=&quot;radio&quot;&gt;site 2&lt;/input&gt;
+ *        &lt;/span&gt;
  * </pre>
  * 
  * </p>
@@ -413,6 +413,19 @@
        }
 
        /**
+        * @see 
wicket.markup.html.form.FormComponent#onComponentTag(wicket.markup.ComponentTag)
+        */
+       @Override
+       protected void onComponentTag(ComponentTag tag)
+       {
+               super.onComponentTag(tag);
+
+               // since this component should not be attached to input tag the 
name
+               // attribute is not needed and is invalid.
+               tag.remove("name");
+       }
+
+       /**
         * @see wicket.Component#onComponentTagBody(MarkupStream, ComponentTag)
         */
        @Override
@@ -456,8 +469,8 @@
                                buffer.append("<input 
name=\"").append(getInputName()).append("\"").append(
                                                " type=\"radio\"").append(
                                                (isSelected(choice, index, 
selected) ? " checked=\"checked\"" : ""))
-                                               .append((isEnabled() ? "" : " 
disabled=\"disabled\"")).append(" value=\"").append(id)
-                                               .append("\" 
id=\"").append(idAttr).append("\"");
+                                               .append((isEnabled() ? "" : " 
disabled=\"disabled\"")).append(" value=\"")
+                                               .append(id).append("\" 
id=\"").append(idAttr).append("\"");
 
                                // Should a roundtrip be made (have 
onSelectionChanged called)
                                // when the option is clicked?
@@ -475,8 +488,8 @@
                                        {
                                                // NOTE: do not encode the url 
as that would give
                                                // invalid JavaScript
-                                               buffer.append(" 
onclick=\"window.location.href='").append(url).append("&" + getInputName())
-                                                               
.append("=").append(id).append("';\"");
+                                               buffer.append(" 
onclick=\"window.location.href='").append(url).append(
+                                                               "&" + 
getInputName()).append("=").append(id).append("';\"");
                                        }
                                }