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 11:22:59 UTC
svn commit: r925164 - in /myfaces/core/trunk/api/src:
main/java/javax/faces/convert/EnumConverter.java
test/java/javax/faces/convert/EnumConverterTest.java
Author: jakobk
Date: Fri Mar 19 10:22:59 2010
New Revision: 925164
URL: http://svn.apache.org/viewvc?rev=925164&view=rev
Log:
MYFACES-2614 EnumConverter uses toString() instead of name()
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java
myfaces/core/trunk/api/src/test/java/javax/faces/convert/EnumConverterTest.java (contents, props changed)
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java?rev=925164&r1=925163&r2=925164&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/EnumConverter.java Fri Mar 19 10:22:59 2010
@@ -20,7 +20,6 @@
package javax.faces.convert;
import javax.faces.component.PartialStateHolder;
-import javax.faces.component.StateHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -72,7 +71,9 @@ public class EnumConverter implements Co
for (Object enumConstant : targetClass.getEnumConstants())
{
if (enumConstant == value)
- return enumConstant.toString();
+ {
+ return ((Enum<?>) enumConstant).name();
+ }
}
Object[] params =
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/convert/EnumConverterTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/convert/EnumConverterTest.java?rev=925164&r1=925163&r2=925164&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/convert/EnumConverterTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/convert/EnumConverterTest.java Fri Mar 19 10:22:59 2010
@@ -34,7 +34,16 @@ public class EnumConverterTest extends A
{
private enum testEnum
{
- ITEM1, ITEM2
+ 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 EnumConverter converter;
@@ -125,7 +134,7 @@ public class EnumConverterTest extends A
{
UIInput input = new UIInput();
String convertedStr = converter.getAsString(FacesContext.getCurrentInstance(), input, testEnum.ITEM1);
- assertEquals(convertedStr, testEnum.ITEM1.toString());
+ assertEquals(convertedStr, testEnum.ITEM1.name());
}
/**
Propchange: myfaces/core/trunk/api/src/test/java/javax/faces/convert/EnumConverterTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL