You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2009/05/26 18:59:04 UTC
svn commit: r778799 -
/myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/EnumConverter.java
Author: weber
Date: Tue May 26 16:59:04 2009
New Revision: 778799
URL: http://svn.apache.org/viewvc?rev=778799&view=rev
Log:
(MFCOMMONS-8) EnumConverter can't fetch target class automatically
<https://issues.apache.org/jira/browse/MFCOMMONS-8>
Modified:
myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/EnumConverter.java
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/EnumConverter.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/EnumConverter.java?rev=778799&r1=778798&r2=778799&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/EnumConverter.java (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/EnumConverter.java Tue May 26 16:59:04 2009
@@ -66,13 +66,18 @@
Class converterClass = null;
String idPrefix = "";
+
if (targetClass != null) {
converterClass = targetClass;
} else if (value.getClass().isEnum()) {
converterClass = value.getClass();
idPrefix = value.getClass().getName() + SEPARATOR;
+ } else if (value.getClass().getDeclaringClass() != null && value.getClass().getDeclaringClass().isEnum()) {
+ converterClass = value.getClass().getDeclaringClass();
+ idPrefix = value.getClass().getDeclaringClass().getName() + SEPARATOR;
}
- if (converterClass == null) {
+
+ if (converterClass == null || targetClass != null) {
checkTargetClass(facesContext, uiComponent, value, converterClass);
}