Schema parsing can access data from other schemas (work in progress)

[simantics/interop.git] / org.simantics.xml.sax / src / org / simantics / xml / sax / ImporterGenerator.java

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
index 2e5fb272438b917481ab6fd67fe24d3aa76ea939..3d137cf33b7357cba1decc999bc3e32852c419ea 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
@@ -390,7 +390,7 @@ public class ImporterGenerator extends JavaGenerator{
                                return;\r
                    } else {\r
                        if (simpleType == null) {\r
-                               SchemaObject simpleTypeObj = this.base.simpleTypeName.get(primitiveType.getLocalPart());\r
+                               SchemaObject simpleTypeObj = this.base.getSimpleType(primitiveType);//this.base.simpleTypeName.get(primitiveType.getLocalPart());\r
                                if (simpleTypeObj != null)\r
                                        simpleType = simpleTypeObj.getSimpleType();\r
                        }       \r
@@ -458,7 +458,7 @@ public class ImporterGenerator extends JavaGenerator{
        public void handle(SchemaObject parent, AttributeGroup attribute) {\r
                if (parent != null) {\r
                        FileWriter fw = getWriter(parent);\r
-                       NamedAttributeGroup group = this.base.getAttributeGroup(attribute.getRef().getLocalPart());\r
+                       NamedAttributeGroup group = this.base.getAttributeGroup(attribute.getRef());\r
                        fw.writer.println(commentTag+"    AttributeGroup " + group.getName());\r
                        SchemaObject obj = new SchemaObject(parent,attribute);\r
                        for (Annotated annotated : group.getAttributeOrAttributeGroup()) {\r
@@ -470,6 +470,9 @@ public class ImporterGenerator extends JavaGenerator{
                                        handle(obj,(AttributeGroup)annotated);\r
                                }\r
                        }\r
+                       //dd\r
+                       if(true)\r
+                               System.out.println();\r
                        fw.writer.println(commentTag+"    End of AttributeGroup " + group.getName());\r
                }\r
                \r
@@ -593,7 +596,7 @@ public class ImporterGenerator extends JavaGenerator{
                LocalSimpleType simpleType = element.getSimpleType();\r
                \r
                if (complexType != null) {\r
-                       SchemaObject obj = this.base.complexTypes.get(complexType);\r
+                       SchemaObject obj = this.base.getComplexType(complexType);\r
                        this.base.handleElementComplexTypeAttributes(obj);\r
                } \r
                fw.writer.println("   }");\r
@@ -620,7 +623,7 @@ public class ImporterGenerator extends JavaGenerator{
                fw.writer.println("      super();");\r
                \r
                if (complexType != null) {\r
-                       SchemaObject obj = this.base.complexTypes.get(complexType);\r
+                       SchemaObject obj = this.base.getComplexType(complexType);\r
                        this.base.handleComplexTypeExtension(obj);\r
                } else if (simpleType != null) {\r
                        \r