commit e38a8135c11dbfc93af389d688a8b2d1030c8679
author emerks <emerks> Thu May 12 21:40:47 2011 +0000
committer emerks <emerks> Thu May 12 21:40:47 2011 +0000
tree dca560113d993e704bba76ae9841340cabb1bda1
parent dd96ec13e4bbee6210e42765ed71a99acd0df660

[342344] Modify the builder so that the XMLType.ecore contains only self references rather than references to the generated XMLTypePackage.eINSTANCE.

plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/XSDEcoreBuilder.java

diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/XSDEcoreBuilder.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/XSDEcoreBuilder.java
index 8fc824e..a3ac60c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/XSDEcoreBuilder.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/ecore/XSDEcoreBuilder.java
@@ -12,7 +12,7 @@
  *
  * </copyright>
  *
- * $Id: XSDEcoreBuilder.java,v 1.103 2010/09/04 17:20:43 emerks Exp $
+ * $Id: XSDEcoreBuilder.java,v 1.104 2011/05/12 21:40:47 emerks Exp $
  */
 package org.eclipse.xsd.ecore;
 
@@ -1408,13 +1408,14 @@
       {
         XSDSimpleTypeDefinition contentType = xsdComplexTypeDefinition.getSimpleType();
         extendedMetaData.setContentKind(eClass, ExtendedMetaData.SIMPLE_CONTENT);
-        if ("SimpleAnyType".equals(eClass.getName()) && XMLTypePackage.eNS_URI.equals(eClass.getEPackage().getNsURI()))
+        boolean isSimpleAnyType = "SimpleAnyType".equals(eClass.getName()) && XMLTypePackage.eNS_URI.equals(eClass.getEPackage().getNsURI());
+        if (isSimpleAnyType)
         {
           EStructuralFeature eStructuralFeature =
             createFeature
               (eClass,
                "rawValue",
-               getBuiltInEClassifier(xsdComplexTypeDefinition.getSchema().getSchemaForSchemaNamespace(), "string"),
+               getEClassifier(xsdComplexTypeDefinition.getSchema().resolveTypeDefinition("string")),
                null,
                0,
                1);
@@ -1428,7 +1429,7 @@
           createFeature
             (eClass,
              "value",
-             getEClassifier(baseSimpleContentType),
+             getEClassifier(isSimpleAnyType ? xsdComplexTypeDefinition.getSchema().resolveTypeDefinition("anySimpleType") : baseSimpleContentType),
              null,
              0,
              1);
@@ -1436,7 +1437,7 @@
         eStructuralFeature.setTransient(true);
         eStructuralFeature.setVolatile(true);
 
-        if ("SimpleAnyType".equals(eClass.getName()) && XMLTypePackage.eNS_URI.equals(eClass.getEPackage().getNsURI()))
+        if (isSimpleAnyType)
         {
           eStructuralFeature =
             createFeature