You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/10/29 19:00:51 UTC

svn commit: r708963 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java

Author: ivaynberg
Date: Wed Oct 29 11:00:51 2008
New Revision: 708963

URL: http://svn.apache.org/viewvc?rev=708963&view=rev
Log:
WICKET-1903

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

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java?rev=708963&r1=708962&r2=708963&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java Wed Oct 29 11:00:51 2008
@@ -452,13 +452,16 @@
 				String id = getChoiceRenderer().getIdValue(choice, index);
 				final String idAttr = getMarkupId() + "_" + id;
 
+				boolean enabled = isEnabled() && isEnableAllowed() &&
+					!isDisabled(choice, index, selected);
+
 				// Add radio tag
 				buffer.append("<input name=\"")
 					.append(getInputName())
 					.append("\"")
 					.append(" type=\"radio\"")
 					.append((isSelected(choice, index, selected) ? " checked=\"checked\"" : ""))
-					.append((isEnabled() ? "" : " disabled=\"disabled\""))
+					.append((enabled ? "" : " disabled=\"disabled\""))
 					.append(" value=\"")
 					.append(id)
 					.append("\" id=\"")