X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FExporterGenerator.java;fp=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FExporterGenerator.java;h=dc82a9fdf16542e8923d156deb42e0f539268d80;hb=f11cbe76b3f4be142c9f84ef9a7b6bc9dcc8ff23;hp=d1f67a426c7ff73a138c02dd25517f91f9407574;hpb=df5314af4f42f8e600d22f74e8e32e126f98a1a8;p=simantics%2Finterop.git

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 d1f67a4..dc82a9f 100644
--- 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;
 		    } else {
 		    	if (simpleType == null) {
-		    		SchemaObject simpleTypeObj = base.simpleTypeName.get(primitiveType.getLocalPart());
+		    		SchemaObject simpleTypeObj = base.getSimpleType(primitiveType);
 		    		if (simpleTypeObj != null)
 			    		simpleType = simpleTypeObj.getSimpleType();
 		    	}	
@@ -524,7 +524,7 @@ public class ExporterGenerator extends JavaGenerator{
 	public void handle(SchemaObject parent, AttributeGroup attribute) {
 		if (parent != null) {
 			FileWriter fw = getWriter(parent);
-			NamedAttributeGroup group = this.base.getAttributeGroup(attribute.getRef().getLocalPart());
+			NamedAttributeGroup group = this.base.getAttributeGroup(attribute.getRef());
 			fw.writer.println(commentTag+"    AttributeGroup " + group.getName());
 			SchemaObject obj = new SchemaObject(parent,attribute);
 			for (Annotated annotated : group.getAttributeOrAttributeGroup()) {
@@ -667,7 +667,7 @@ public class ExporterGenerator extends JavaGenerator{
 		fw.writer.println("        "+getOntologyImport());
 		fw.writer.println("        for (Statement attribute : attributes) {");
 		if (complexType != null) {
-			SchemaObject obj = this.base.complexTypes.get(complexType);
+			SchemaObject obj = this.base.getComplexType(complexType);
 			this.base.handleElementComplexTypeAttributes(obj);
 		} 
 		fw.writer.println("        }");
@@ -717,7 +717,7 @@ public class ExporterGenerator extends JavaGenerator{
 		fw.writer.println("      super(graph);");
 		fw.writer.println("      "+getOntologyImport());
 		if (complexType != null) {
-			SchemaObject obj = this.base.complexTypes.get(complexType);
+			SchemaObject obj = this.base.getComplexType(complexType);
 			this.base.handleComplexTypeExtension(obj);
 		} else if (simpleType != null) {