You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/03/19 15:09:36 UTC
svn commit: r925224 - in /myfaces/core/branches/1.2.x/api/src:
main/java/javax/faces/convert/EnumConverter.java
test/java/javax/faces/convert/EnumConverterTest.java
Author: jakobk
Date: Fri Mar 19 14:09:35 2010
New Revision: 925224
URL: http://svn.apache.org/viewvc?rev=925224&view=rev
Log:
MYFACES-2614 EnumConverter uses toString() instead of name() (reverted the changes on 1.2.x branch, because it will fail the TCK here)
Modified:
myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/convert/EnumConverter.java
myfaces/core/branches/1.2.x/api/src/test/java/javax/faces/convert/EnumConverterTest.java
Modified: myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/convert/EnumConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/convert/EnumConverter.java?rev=925224&r1=925223&r2=925224&view=diff
==============================================================================
--- myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/convert/EnumConverter.java (original)
+++ myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/convert/EnumConverter.java Fri Mar 19 14:09:35 2010
@@ -56,12 +56,8 @@ public class EnumConverter implements Co
if (value == null) return "";
checkTargetClass(facesContext, uiComponent, value);
- for (Object enumConstant : targetClass.getEnumConstants())
- {
- if (enumConstant == value)
- {
- return ((Enum<?>) enumConstant).name();
- }
+ for (Object enumConstant : targetClass.getEnumConstants()) {
+ if (enumConstant == value) return enumConstant.toString();
}
return value.toString();
Modified: myfaces/core/branches/1.2.x/api/src/test/java/javax/faces/convert/EnumConverterTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.2.x/api/src/test/java/javax/faces/convert/EnumConverterTest.java?rev=925224&r1=925223&r2=925224&view=diff
==============================================================================
--- myfaces/core/branches/1.2.x/api/src/test/java/javax/faces/convert/EnumConverterTest.java (original)
+++ myfaces/core/branches/1.2.x/api/src/test/java/javax/faces/convert/EnumConverterTest.java Fri Mar 19 14:09:35 2010
@@ -31,21 +31,7 @@ import org.apache.shale.test.base.Abstra
* @version $Revision$ $Date$
*/
public class EnumConverterTest extends AbstractJsfTestCase {
-
- private enum testEnum
- {
- ITEM1, ITEM2;
-
- @Override
- public String toString()
- {
- // overriding toString() to check if converter uses
- // name() instead of toString() to create the String value.
- return "enum value";
- }
-
- };
-
+ private enum testEnum {ITEM1, ITEM2};
private EnumConverter converter;
public EnumConverterTest(String name) {
@@ -118,7 +104,7 @@ public class EnumConverterTest extends A
public void testGetAsString() {
UIInput input = new UIInput();
String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, testEnum.ITEM1);
- assertEquals(convertedStr, testEnum.ITEM1.name());
+ assertEquals(convertedStr, testEnum.ITEM1.toString());
}
/**