Author: dkulp Date: Mon Jan 28 18:11:18 2013 New Revision: 1439546 URL: http://svn.apache.org/viewvc?rev=1439546&view=rev Log: Merged revisions 1439525 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1439525 | dkulp | 2013-01-28 12:48:40 -0500 (Mon, 28 Jan 2013) | 18 lines Merged revisions 1439487 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1439487 | dkulp | 2013-01-28 11:44:37 -0500 (Mon, 28 Jan 2013) | 10 lines Merged revisions 1439484 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1439484 | dkulp | 2013-01-28 11:41:49 -0500 (Mon, 28 Jan 2013) | 2 lines [CXF-4750] If the "base" is an enum, but the actual type isn't, it shouldn't be mapped to an enum ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansSchemaTypeUtils.java Modified: cxf/branches/2.5.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansSchemaTypeUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansSchemaTypeUtils.java?rev=1439546&r1=1439545&r2=1439546&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansSchemaTypeUtils.java (original) +++ cxf/branches/2.5.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansSchemaTypeUtils.java Mon Jan 28 18:11:18 2013 @@ -90,13 +90,8 @@ public final class XMLBeansSchemaTypeUti public static String getNaturalJavaClassName(SchemaType st) { SchemaType schemaType = st; String result = null; - if (st.getBaseEnumType() != null) { - if (hasBase(st)) { - schemaType = st.getBaseEnumType(); - return schemaType.getFullJavaName().replace('$', '.') + ".Enum"; - } else { - return st.getFullJavaName().replace('$', '.') + ".Enum"; - } + if (st.getBaseEnumType() != null && !hasBase(st)) { + return st.getFullJavaName().replace('$', '.') + ".Enum"; } else if (st.isSimpleType() && !st.isBuiltinType()) { schemaType = st.getBaseType(); while (schemaType != null && !schemaType.isBuiltinType()) {
