You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/04/18 18:24:51 UTC
svn commit: r649589 - in
/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application:
LabelValueBindingFacesMessage.java LabelValueExpressionFacesMessage.java
Author: bommel
Date: Fri Apr 18 09:24:39 2008
New Revision: 649589
URL: http://svn.apache.org/viewvc?rev=649589&view=rev
Log:
(TOBAGO-650) Support for validatorMessage, requiredMessage, converterMessage and label attribute for EditableValueHolder
Modified:
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java?rev=649589&r1=649588&r2=649589&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java Fri Apr 18 09:24:39 2008
@@ -14,32 +14,32 @@
private Object[] args;
public LabelValueBindingFacesMessage() {
- super();
- }
+ super();
+ }
- public LabelValueBindingFacesMessage(FacesMessage.Severity severity, String summary, String detail,
+ public LabelValueBindingFacesMessage(FacesMessage.Severity severity, String summary, String detail,
Locale locale, Object... args) {
- super(severity, summary, detail);
+ super(severity, summary, detail);
this.locale = locale;
this.args = args;
}
- public LabelValueBindingFacesMessage(String summary, String detail) {
- super(summary, detail);
- }
+ public LabelValueBindingFacesMessage(String summary, String detail) {
+ super(summary, detail);
+ }
- public LabelValueBindingFacesMessage(String summary) {
- super(summary);
- }
+ public LabelValueBindingFacesMessage(String summary) {
+ super(summary);
+ }
- @Override
- public String getDetail() {
+ @Override
+ public String getDetail() {
String detail = super.getDetail();
if (args != null && args.length > 0) {
if (args.length == 1 && UIComponentTag.isValueReference(args[0].toString())) {
FacesContext facesContext = FacesContext.getCurrentInstance();
ValueBinding value = facesContext.getApplication().createValueBinding(detail);
- return MessageUtils.getFormatedMessage(detail, locale, value.getValue(facesContext));
+ return MessageUtils.getFormatedMessage(detail, locale, value.getValue(facesContext));
}
return MessageUtils.getFormatedMessage(detail, locale, args);
}
@@ -47,13 +47,13 @@
}
@Override
- public String getSummary() {
+ public String getSummary() {
String summary = super.getSummary();
if (args != null && args.length > 0) {
if (args.length == 1 && UIComponentTag.isValueReference(args[0].toString())) {
FacesContext facesContext = FacesContext.getCurrentInstance();
ValueBinding value = facesContext.getApplication().createValueBinding(summary);
- return MessageUtils.getFormatedMessage(summary, locale, value.getValue(facesContext));
+ return MessageUtils.getFormatedMessage(summary, locale, value.getValue(facesContext));
}
return MessageUtils.getFormatedMessage(summary, locale, args);
}
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java?rev=649589&r1=649588&r2=649589&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/application/LabelValueExpressionFacesMessage.java Fri Apr 18 09:24:39 2008
@@ -5,37 +5,37 @@
import javax.el.ValueExpression;
public class LabelValueExpressionFacesMessage extends FacesMessage {
- public LabelValueExpressionFacesMessage() {
- super();
- }
+ public LabelValueExpressionFacesMessage() {
+ super();
+ }
- public LabelValueExpressionFacesMessage(FacesMessage.Severity severity, String summary, String detail) {
- super(severity, summary, detail);
- }
+ public LabelValueExpressionFacesMessage(FacesMessage.Severity severity, String summary, String detail) {
+ super(severity, summary, detail);
+ }
- public LabelValueExpressionFacesMessage(String summary, String detail) {
- super(summary, detail);
- }
+ public LabelValueExpressionFacesMessage(String summary, String detail) {
+ super(summary, detail);
+ }
- public LabelValueExpressionFacesMessage(String summary) {
- super(summary);
- }
+ public LabelValueExpressionFacesMessage(String summary) {
+ super(summary);
+ }
- @Override
- public String getDetail() {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ValueExpression value = facesContext.getApplication().getExpressionFactory().
- createValueExpression(facesContext.getELContext(), super.getDetail(), String.class);
- return (String) value.getValue(facesContext.getELContext());
- }
+ @Override
+ public String getDetail() {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ ValueExpression value = facesContext.getApplication().getExpressionFactory().
+ createValueExpression(facesContext.getELContext(), super.getDetail(), String.class);
+ return (String) value.getValue(facesContext.getELContext());
+ }
- @Override
- public String getSummary() {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ValueExpression value = facesContext.getApplication().getExpressionFactory().
- createValueExpression(facesContext.getELContext(), super.getSummary(), String.class);
- return (String) value.getValue(facesContext.getELContext());
- }
+ @Override
+ public String getSummary() {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ ValueExpression value = facesContext.getApplication().getExpressionFactory().
+ createValueExpression(facesContext.getELContext(), super.getSummary(), String.class);
+ return (String) value.getValue(facesContext.getELContext());
+ }
}