You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2005/09/29 16:09:45 UTC
svn commit: r292438 -
/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java
Author: mbr
Date: Thu Sep 29 07:09:39 2005
New Revision: 292438
URL: http://svn.apache.org/viewcvs?rev=292438&view=rev
Log:
undo patch for MYFACES-636
patch should go into the 1.1.1 release and is merged from that branch into the trunk later
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java?rev=292438&r1=292437&r2=292438&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java Thu Sep 29 07:09:39 2005
@@ -15,8 +15,6 @@
*/
package org.apache.myfaces.component.html.ext;
-import java.util.Iterator;
-
import javax.faces.application.FacesMessage;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
@@ -27,7 +25,6 @@
import javax.faces.validator.ValidatorException;
import org.apache.myfaces.component.DisplayValueOnlyCapable;
-
import org.apache.myfaces.component.UserRoleAware;
import org.apache.myfaces.component.UserRoleUtils;
import org.apache.myfaces.component.html.util.HtmlComponentUtils;
@@ -41,7 +38,7 @@
extends javax.faces.component.html.HtmlSelectOneRadio
implements UserRoleAware, DisplayValueOnlyCapable
{
- public String getClientId(FacesContext context)
+ public String getClientId(FacesContext context)
{
String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
if (clientId == null)
@@ -81,20 +78,9 @@
//Check required and empty
if (isRequired() && empty)
{
- //Only add this message once, not for every radio button in set
- String clientId = this.getClientId(context);
- Iterator messages = context.getMessages(clientId);
- boolean messageExists = messages.hasNext();
-
- if(!messageExists)
- {
- //Add message
- FacesMessage message = MessageUtils.getMessage(REQUIRED_MESSAGE_ID, new Object[]{clientId});
- message.setSeverity(FacesMessage.SEVERITY_WARN);
- context.addMessage(clientId, message);
-
+ MessageUtils.addMessage(FacesMessage.SEVERITY_WARN, REQUIRED_MESSAGE_ID,
+ new Object[] {getId()});
setValid(false);
- }
return;
}
@@ -105,7 +91,7 @@
}
}
}
-
+
private static void callValidators(FacesContext context, UIInput input, Object convertedValue)
{
Validator[] validators = input.getValidators();