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

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

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
index f98a85f5673785e292347149b5865cde0454f392..2de5908f48374a85667f66ba1443f5465b56cd6e 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
@@ -144,7 +144,7 @@ public class OntologyGenerator implements SchemaConversionComponent {
                                type = base.getL0TypeFromPrimitiveType(refType);\r
                        }\r
                        if (type == null) {\r
-                               SchemaObject obj = base.getWithName(parent, refType.getLocalPart());\r
+                               SchemaObject obj = base.getWithName(refType);\r
                                types.add(getName(obj,"has"));\r
                        } \r
                }\r
@@ -197,7 +197,7 @@ public class OntologyGenerator implements SchemaConversionComponent {
                        if (refType == RefType.Type) {\r
                                referenceType = element.getElement().getType();\r
                                //refName = element.getElement().getName()\r
-                               SchemaObject eObj = base.elements.get(element.getElement());\r
+                               SchemaObject eObj = base.getElement(element.getElement());//base.elements.get(element.getElement());\r
                                if (refName == null)\r
                                        refName = eObj.getName();\r
                        } else {\r
@@ -208,7 +208,7 @@ public class OntologyGenerator implements SchemaConversionComponent {
                        String type = base.getL0TypeFromPrimitiveType(referenceType);\r
                        SchemaObject obj = null;\r
                        if (type == null) {\r
-                               obj = base.getWithName(parent, referenceType.getLocalPart());\r
+                               obj = base.getWithName(referenceType);\r
                                \r
                                writer.println(getName(parent)+".has"+refName + " <R " +  getName(obj,"has"));\r
                                writer.println("   --> " + getName(obj));\r
@@ -524,11 +524,11 @@ public class OntologyGenerator implements SchemaConversionComponent {
                LocalSimpleType simpleType = element.getSimpleType();\r
                \r
                if (complexType != null) {\r
-                       SchemaObject complexTypeObj = this.base.complexTypes.get(complexType);\r
+                       SchemaObject complexTypeObj = this.base.getComplexType(complexType);\r
                        this.base.handleElementComplexTypeAttributes(complexTypeObj);\r
                        this.base.handleComplexTypeExtension(complexTypeObj);\r
                } else if (simpleType != null) {\r
-                       SchemaObject simpleTypeObj = this.base.simpleTypes.get(simpleType);\r
+                       SchemaObject simpleTypeObj = this.base.getSimpleType(simpleType);\r
                        this.base.handleElementSimpleTypeAttributes(simpleTypeObj);\r
                }\r
                \r