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

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

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
index d1f67a426c7ff73a138c02dd25517f91f9407574..dc82a9fdf16542e8923d156deb42e0f539268d80 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
@@ -456,7 +456,7 @@ public class ExporterGenerator extends JavaGenerator{
                                return;\r
                    } else {\r
                        if (simpleType == null) {\r
-                               SchemaObject simpleTypeObj = base.simpleTypeName.get(primitiveType.getLocalPart());\r
+                               SchemaObject simpleTypeObj = base.getSimpleType(primitiveType);\r
                                if (simpleTypeObj != null)\r
                                        simpleType = simpleTypeObj.getSimpleType();\r
                        }       \r
@@ -524,7 +524,7 @@ public class ExporterGenerator 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
@@ -667,7 +667,7 @@ public class ExporterGenerator extends JavaGenerator{
                fw.writer.println("        "+getOntologyImport());\r
                fw.writer.println("        for (Statement attribute : attributes) {");\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
@@ -717,7 +717,7 @@ public class ExporterGenerator extends JavaGenerator{
                fw.writer.println("      super(graph);");\r
                fw.writer.println("      "+getOntologyImport());\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