svn commit: r517260 - /myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/_MessageUtils.java

[ca...@apache.org]

Author: cagatay
Date: Mon Mar 12 08:39:07 2007
New Revision: 517260

URL: http://svn.apache.org/viewvc?view=rev&rev=517260
Log:
Add getLabel to _MessageUtils

Modified:
    myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/_MessageUtils.java

Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/_MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/_MessageUtils.java?view=diff&rev=517260&r1=517259&r2=517260
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/_MessageUtils.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/validator/_MessageUtils.java Mon Mar 12 08:39:07 2007
@@ -15,7 +15,9 @@
  */
 package javax.faces.validator;
 
+import javax.el.ValueExpression;
 import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import java.text.MessageFormat;
 import java.util.Locale;
@@ -174,6 +176,19 @@
                 }
             }
         }
+    }
+    
+    static String getLabel(FacesContext facesContext, UIComponent component) {
+    	Object label = component.getAttributes().get("label");
+    	if(label != null)
+    		return label.toString();
+    	
+    	ValueExpression expression = component.getValueExpression("label");
+    	if(expression != null)
+    		return (String)expression.getValue(facesContext.getELContext());
+    	
+    	//If no label is not specified, use clientId
+    	return component.getClientId( facesContext );
     }
 
 }