[214804] Enumerations in complex types with simple content not showing in content model

1 files changed, 7 insertions, 1 deletions

diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java
index 709a7c9f33..3658e83d9f 100644
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java
+++ b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
+ * Copyright (c) 2001, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -358,6 +358,12 @@ public class XSDImpl
   public static String[] getEnumeratedValuesForType(XSDTypeDefinition type)
   {
     List result = new ArrayList();
+    // See bug 214804 - Content assist not showing valid values when it's a complex
+    // type with simple content
+    if (type instanceof XSDComplexTypeDefinition)
+    {
+      type = ((XSDComplexTypeDefinition)type).getSimpleType();
+    }
     if (type instanceof XSDSimpleTypeDefinition)
     {         
       if (TYPE_NAME_BOOLEAN.equals(type.getName()) && type.getSchema().getSchemaForSchema() == type.getSchema())