You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ca...@apache.org on 2007/03/15 11:33:53 UTC
svn commit: r518567 - in
/myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component:
UISelectManyTemplate.java UISelectOneTemplate.java
Author: cagatay
Date: Thu Mar 15 03:33:38 2007
New Revision: 518567
URL: http://svn.apache.org/viewvc?view=rev&rev=518567
Log:
Add missing label attribute support to uiselectone and uiselectmany
Modified:
myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component/UISelectManyTemplate.java
myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component/UISelectOneTemplate.java
Modified: myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component/UISelectManyTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component/UISelectManyTemplate.java?view=diff&rev=518567&r1=518566&r2=518567
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component/UISelectManyTemplate.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component/UISelectManyTemplate.java Thu Mar 15 03:33:38 2007
@@ -268,9 +268,7 @@
// verify that iterator was successfully created for convertedValue type
if (itemValues == null)
{
- _MessageUtils.addErrorMessage(context, this,
- INVALID_MESSAGE_ID,
- new Object[]{getId()});
+ _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
setValid(false);
return;
}
@@ -280,8 +278,7 @@
// if UISelectMany is required, then there must be some selected values
if (isRequired() && !hasValues)
{
- _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID,
- new Object[]{getId()});
+ _MessageUtils.addErrorMessage(context, this, REQUIRED_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
setValid(false);
return;
}
@@ -326,9 +323,7 @@
if (!_SelectItemsUtil.matchValue(context, itemValue,
items.iterator(), converter))
{
- _MessageUtils.addErrorMessage(context, this,
- INVALID_MESSAGE_ID,
- new Object[]{getId()});
+ _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
setValid(false);
return;
}
@@ -376,8 +371,7 @@
context.addMessage(getClientId(context), facesMessage);
} else
{
- _MessageUtils.addErrorMessage(context, this,
- CONVERSION_MESSAGE_ID, new Object[]{getId()});
+ _MessageUtils.addErrorMessage(context, this, CONVERSION_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
}
setValid(false);
}
Modified: myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component/UISelectOneTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component/UISelectOneTemplate.java?view=diff&rev=518567&r1=518566&r2=518567
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component/UISelectOneTemplate.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java-templates/javax/faces/component/UISelectOneTemplate.java Thu Mar 15 03:33:38 2007
@@ -53,8 +53,7 @@
// selected value must match to one of the available options
if (!_SelectItemsUtil.matchValue(context, value, new _SelectItemsIterator(this), converter))
{
- _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID,
- new Object[]{getId()});
+ _MessageUtils.addErrorMessage(context, this, INVALID_MESSAGE_ID, new Object[]{_MessageUtils.getLabel(context,this)});
setValid(false);
}
}