]> gerrit.simantics Code Review - simantics/interop.git/blobdiff - org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
Handling ComplexTypes inheriting AtomicType
[simantics/interop.git] / org.simantics.xml.sax / src / org / simantics / xml / sax / ImporterGenerator.java
index cff6e923c9aa668dc6ae73e467366d9bd0238860..55ff5ef7e52f32ab0b830e9efa5a8b6ad689d2c1 100644 (file)
@@ -5,29 +5,28 @@ import java.io.IOException;
 import java.io.PrintWriter;\r
 import java.io.StringWriter;\r
 import java.util.ArrayList;\r
-import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
 \r
 import javax.xml.namespace.QName;\r
 \r
 import org.simantics.utils.datastructures.BijectionMap;\r
+import org.simantics.xml.sax.SchemaConversionBase.InheritanceType;\r
+import org.simantics.xml.sax.SchemaConversionBase.RefType;\r
+import org.simantics.xml.sax.SchemaObject.ObjectType;\r
 import org.simantics.xml.sax.configuration.AttributeComposition;\r
 import org.simantics.xml.sax.configuration.Configuration;\r
 import org.simantics.xml.sax.configuration.IDProvider;\r
 import org.simantics.xml.sax.configuration.IDReference;\r
-import org.simantics.xml.sax.configuration.Rename;\r
 import org.simantics.xml.sax.configuration.UnrecognizedChildElement;\r
 import org.w3._2001.xmlschema.Annotated;\r
 import org.w3._2001.xmlschema.Attribute;\r
 import org.w3._2001.xmlschema.AttributeGroup;\r
-import org.w3._2001.xmlschema.AttributeGroupRef;\r
 import org.w3._2001.xmlschema.ComplexType;\r
 import org.w3._2001.xmlschema.Element;\r
 import org.w3._2001.xmlschema.LocalComplexType;\r
 import org.w3._2001.xmlschema.LocalSimpleType;\r
 import org.w3._2001.xmlschema.NamedAttributeGroup;\r
-import org.w3._2001.xmlschema.OpenAttrs;\r
 import org.w3._2001.xmlschema.Restriction;\r
 import org.w3._2001.xmlschema.Schema;\r
 import org.w3._2001.xmlschema.SimpleType;\r
@@ -39,7 +38,7 @@ public class ImporterGenerator extends JavaGenerator{
                super(configuration);\r
        }\r
        \r
-       public void createParser(Schema schema,String className, SchemaConverter converter) throws IOException {\r
+       public void createParser(Schema schema,String ontologyUri, String className, SchemaConverter converter) throws IOException {\r
                this.schema = schema;\r
                this.ontologyClassName = className;\r
                this.converter = converter;\r
@@ -106,15 +105,22 @@ public class ImporterGenerator extends JavaGenerator{
        }\r
 \r
        protected void handle(TopLevelAttribute topLevelAttribute) {\r
-\r
        }\r
        \r
+       @Override\r
+       protected void handleSimpleType(SchemaObject parent, SchemaObject simpleTypeObj) {\r
+       }\r
        \r
        @Override\r
        protected void handleComplexType(SchemaObject complexTypeObj) {\r
                ComplexType topLevelComplexType = complexTypeObj.getComplexType();\r
                \r
-               String name = getName(complexTypeObj);//topLevelComplexType.getName();\r
+               String name = getName(complexTypeObj);\r
+               \r
+               //if (topLevelComplexType.getName().equals("LocalizedText"))\r
+               //if (topLevelComplexType.getName().equals("Reference"))\r
+//             if (topLevelComplexType.getName().equals("NodeIdAlias"))\r
+//                     System.out.println();\r
                \r
                String className = name;//"_"+name;\r
                \r
@@ -126,17 +132,7 @@ public class ImporterGenerator extends JavaGenerator{
                }\r
                writers.put(complexTypeObj, fw);\r
                \r
-               boolean isList = false;\r
-\r
-               String baseClass = "org.simantics.xml.sax.base.XMLElementNamedChildParserBase";\r
-               \r
-               boolean inherited = false;\r
-               \r
-               QName type = getComplexTypeBase(topLevelComplexType);\r
-               if (type != null && !type.getNamespaceURI().equals("http://www.w3.org/2001/XMLSchema")) {\r
-                       baseClass = getName(complexTypeName.get(type.getLocalPart()));\r
-                       inherited = true;\r
-               }\r
+               Inheritance inheritance = getInheritance(complexTypeObj);\r
                \r
                provider = getIDProvider(topLevelComplexType);\r
                List<IDReference> references = getIDReferences(topLevelComplexType);\r
@@ -148,8 +144,8 @@ public class ImporterGenerator extends JavaGenerator{
                if (unknownChildElement != null)\r
                        intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");\r
                \r
-               createClassHeader(fw.writer, isList);\r
-               writeClass(fw.writer,false, null, className, baseClass, intrerfaces);\r
+               createClassHeader(fw.writer, false);\r
+               writeClass(fw.writer,false, null, className, inheritance.baseClass, intrerfaces);\r
                        \r
                writeIDProvider(fw.writer);\r
        \r
@@ -157,12 +153,8 @@ public class ImporterGenerator extends JavaGenerator{
                fw.writer.println("   public Resource create(WriteGraph graph, ParserElement element) throws DatabaseException{");\r
                fw.writer.println("      Layer0 L0 = Layer0.getInstance(graph);");\r
                fw.writer.println("      "+getOntologyImport());\r
-               if (!isList) {\r
                fw.writer.println("      Resource res = graph.newResource();");\r
                fw.writer.println("      graph.claim(res, L0.InstanceOf, "+ontShort+name+");");\r
-               } else {\r
-               fw.writer.println("      Resource res = ListUtils.create(graph, "+ontShort+name+", Collections.EMPTY_LIST);");\r
-               }\r
                fw.writer.println("      return res;");\r
                fw.writer.println("   }");\r
                fw.writer.println();\r
@@ -194,9 +186,11 @@ public class ImporterGenerator extends JavaGenerator{
                if (stringWriter.getBuffer().length() > 0) {\r
                        fw.writer.write(stringWriter.toString());\r
                }\r
-               \r
-               \r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
+               fw.writer.println("      return super.connectChild(graph,element,child);");\r
+               }else{\r
                fw.writer.println("      return false;");\r
+               }\r
                fw.writer.println("   }");\r
                fw.writer.println();\r
                \r
@@ -213,7 +207,7 @@ public class ImporterGenerator extends JavaGenerator{
                \r
                fw.writer.println("   @Override");\r
                fw.writer.println("   public void configure(WriteGraph graph, Deque<ParserElement> parents, ParserElement element) throws DatabaseException {");\r
-               if (inherited) {\r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
                fw.writer.println("             super.configure(graph,parents,element);");\r
                }\r
                fw.writer.println("        "+getOntologyImport());\r
@@ -223,6 +217,14 @@ public class ImporterGenerator extends JavaGenerator{
                \r
                fw.writer.println("   }");\r
                \r
+               if (inheritance.type == InheritanceType.AtomicType) {\r
+               fw.writer.println();\r
+               fw.writer.println("   @Override");\r
+               fw.writer.println("   public void configure(WriteGraph graph, ParserElement element, java.lang.String string) throws DatabaseException {");\r
+               fw.writer.println("      graph.claimValue(element.getData(), "+getValueGetter(inheritance.atomicType,"string")+", "+inheritance.atomicType.binding+");");\r
+               fw.writer.println("   }");\r
+               }\r
+               \r
                writeIDReferences(fw.writer,name, references);\r
                writeUnknownChild(fw.writer,name,unknownChildElement);\r
                \r
@@ -236,49 +238,127 @@ public class ImporterGenerator extends JavaGenerator{
        }\r
        \r
        @Override\r
-       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element,  boolean reference, String ref, QName refType) {\r
+       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType referenceType) {\r
                FileWriter fw = getWriter(parent);\r
-               String binding = getBindingFromPrimitiveType(refType);\r
-               if (binding == null) {\r
-                       SchemaObject refElement = elementName.get(refType.getLocalPart());\r
-                       SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart());\r
-\r
-                       String className = null;\r
-                       String refClassName = null;\r
-                       if (refElement != null)\r
-                               className = getName(refElement);\r
-                       else\r
-                               className = getName(refComplexType);\r
+               String objectName;\r
+               if (referenceType != RefType.Element) {\r
+                       QName refType;\r
+                       if (referenceType == RefType.Type) {\r
+                               refType = element.getElement().getType();\r
+                               if (refName == null)\r
+                                       refName = element.getElement().getName();\r
+                               objectName = element.getElement().getName();\r
+                       } else {\r
+                               refType = element.getElement().getRef();\r
+                               if (refName == null)\r
+                                       refName = refType.getLocalPart();\r
+                               objectName = refType.getLocalPart();\r
+                       }\r
                        \r
-                       if (refComplexType != null) {\r
-                               refClassName = getName(refComplexType);\r
+                       String binding = getBindingFromPrimitiveType(refType);\r
+                       if (binding == null) {\r
+                               SchemaObject refElement = elementName.get(refType.getLocalPart());\r
+                               SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart());\r
+       \r
+                               // prefer element reference over complex type reference\r
+                               String primaryClassName = null;\r
+                               String secondaryClassName = null;\r
+                               if (refElement != null)\r
+                                       primaryClassName = getName(refElement);\r
+                               else\r
+                                       primaryClassName = getName(refComplexType);\r
+                               \r
+                               if (refComplexType != null) {\r
+                                       secondaryClassName = getName(refComplexType);\r
+                               } else {\r
+                                       secondaryClassName = getName(refElement);\r
+                               }\r
+                               \r
+                               if (referenceType == RefType.Type) {\r
+                               // create internal class for handling the element and child attachment\r
+                               secondaryClassName = getName(parent) +"_" +objectName;\r
+                               fw.writer.println("        addParser(\""+ objectName +"\", "+secondaryClassName+".class);");\r
+                               fw.delayedWriter2.println("   public static class " + secondaryClassName +" extends " + primaryClassName +"{");\r
+                               fw.delayedWriter2.println("      public "+ secondaryClassName +"(){");\r
+                               fw.delayedWriter2.println("      }");\r
+                               fw.delayedWriter2.println("   }");\r
+                               } else { // referenceType == RefType.Reference\r
+                               fw.writer.println("        addParser("+primaryClassName+".class);");\r
+                               if (!primaryClassName.equals(secondaryClassName))\r
+                               fw.writer.println("        addParser("+secondaryClassName+".class);");\r
+                               }\r
+                               \r
+                               fw.delayedWriter.println("         if (child.getElementParser() instanceof "+secondaryClassName+"){");\r
+                               fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+refName + ", child.getData());");\r
+                               if (useElementList(parent, indicator,element, referenceType == RefType.Reference, refName, refType)) {\r
+               \r
+                               // element type specific list\r
+                               fw.delayedWriter.println("            {");\r
+                               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
+                               fw.delayedWriter.println("               if (list == null) {");\r
+                               fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
+                               fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List,list);");\r
+                               fw.delayedWriter.println("               } else {");\r
+                               fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
+                               fw.delayedWriter.println("               }");\r
+                               fw.delayedWriter.println("            }");\r
+                               }\r
+                               if (useOriginalList(parent, indicator,element, referenceType == RefType.Reference, refName, refType)) {\r
+                               // generic list\r
+                               fw.delayedWriter.println("            {");\r
+                               fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");\r
+                               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(), XML.hasOriginalElementList);");\r
+                               fw.delayedWriter.println("               if (list == null) {");\r
+                               fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
+                               fw.delayedWriter.println("                  graph.claim(element.getData(), XML.hasOriginalElementList,list);");\r
+                               fw.delayedWriter.println("               } else {");\r
+                               fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
+                               fw.delayedWriter.println("               }");\r
+                               fw.delayedWriter.println("            }");\r
+                               }\r
+                               \r
+                               fw.delayedWriter.println("            return true;");\r
+                               fw.delayedWriter.println("         }");\r
                        } else {\r
-                               refClassName = getName(refElement);\r
+                               //writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");\r
+                               fw.writer.println("        addParser(\""+ refName +"\", "+getName(parent) +"_" +refName+".class);");\r
+                               \r
+                               fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +refName+" extends org.simantics.xml.sax.base.ValueElementParser {");\r
+                               fw.delayedWriter2.println("      public "+ getName(parent) +"_" +refName +"(){");\r
+                               fw.delayedWriter2.println("           super(\""+refName+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+refName+", "+binding+");");\r
+                               fw.delayedWriter2.println("       }");\r
+                               fw.delayedWriter2.println("   }");\r
                        }\r
+               } else {\r
+                       Element attrs= element.getElement();\r
+                       SchemaObject obj = getWithObj(parent, attrs);\r
                        \r
-                       if (!reference)\r
-                       fw.writer.println("        addParser(\""+ ref +"\", "+className+".class);");\r
-                       else\r
-                       fw.writer.println("        addParser("+className+".class);");\r
-                       if (!className.equals(refClassName))\r
-                       fw.writer.println("        addParser("+refClassName+".class);");\r
+                       String className = getName(obj);\r
+                       if (refName == null)\r
+                               refName = attrs.getName();\r
                        \r
-                       fw.delayedWriter.println("         if (child.getElementParser() instanceof "+refClassName+"){");\r
-                       fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");\r
-                       if (useElementList(parent, indicator,element, reference, ref, refType)) {\r
-       \r
+                       \r
+                       //if (!reference)\r
+                       fw.writer.println("        addParser(\""+ refName +"\", "+className+".class);");\r
+//                     else\r
+//                     fw.writer.println("        addParser("+className+".class);");\r
+                       \r
+                       fw.delayedWriter.println("         if (child.getElementParser() instanceof "+className+"){");\r
+                       fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+refName + ", child.getData());");\r
+                       if (useElementList(parent, indicator,element, false, refName, new QName(obj.getName()))) {\r
+\r
                        // element type specific list\r
                        fw.delayedWriter.println("            {");\r
-                       fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List);");\r
+                       fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
                        fw.delayedWriter.println("               if (list == null) {");\r
                        fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
-                       fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List,list);");\r
+                       fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List,list);");\r
                        fw.delayedWriter.println("               } else {");\r
                        fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
                        fw.delayedWriter.println("               }");\r
                        fw.delayedWriter.println("            }");\r
                        }\r
-                       if (useOriginalList(parent, indicator,element, reference, ref, refType)) {\r
+                       if (useOriginalList(parent, indicator,element, false, refName, new QName(obj.getName()))) {\r
                        // generic list\r
                        fw.delayedWriter.println("            {");\r
                        fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");\r
@@ -294,64 +374,9 @@ public class ImporterGenerator extends JavaGenerator{
                        \r
                        fw.delayedWriter.println("            return true;");\r
                        fw.delayedWriter.println("         }");\r
-               } else {\r
-                       //writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");\r
-                       fw.writer.println("        addParser(\""+ ref +"\", "+getName(parent) +"_" +ref+".class);");\r
-                       \r
-                       fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +ref+" extends org.simantics.xml.sax.base.ValueElementParser {");\r
-                       fw.delayedWriter2.println("      public "+ getName(parent) +"_" +ref +"(){");\r
-                       fw.delayedWriter2.println("           super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", "+binding+");");\r
-                       fw.delayedWriter2.println("       }");\r
-                       fw.delayedWriter2.println("   }");\r
                }\r
        }\r
        \r
-       @Override\r
-       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element,  boolean reference, String ref, OpenAttrs attrs) {\r
-               FileWriter fw = getWriter(parent);\r
-               SchemaObject obj = getWithObj(parent, attrs);\r
-       \r
-               String className = getName(obj);\r
-\r
-               if (!reference)\r
-               fw.writer.println("        addParser(\""+ ref +"\", "+className+".class);");\r
-               else\r
-               fw.writer.println("        addParser("+className+".class);");\r
-               \r
-               fw.delayedWriter.println("         if (child.getElementParser() instanceof "+className+"){");\r
-               fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");\r
-               if (useElementList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {\r
-\r
-               // element type specific list\r
-               fw.delayedWriter.println("            {");\r
-               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List);");\r
-               fw.delayedWriter.println("               if (list == null) {");\r
-               fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
-               fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List,list);");\r
-               fw.delayedWriter.println("               } else {");\r
-               fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
-               fw.delayedWriter.println("               }");\r
-               fw.delayedWriter.println("            }");\r
-               }\r
-               if (useOriginalList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {\r
-               // generic list\r
-               fw.delayedWriter.println("            {");\r
-               fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");\r
-               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(), XML.hasOriginalElementList);");\r
-               fw.delayedWriter.println("               if (list == null) {");\r
-               fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
-               fw.delayedWriter.println("                  graph.claim(element.getData(), XML.hasOriginalElementList,list);");\r
-               fw.delayedWriter.println("               } else {");\r
-               fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
-               fw.delayedWriter.println("               }");\r
-               fw.delayedWriter.println("            }");\r
-               }\r
-               \r
-               fw.delayedWriter.println("            return true;");\r
-               fw.delayedWriter.println("         }");\r
-               \r
-       }\r
-       \r
        @Override\r
        protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement any) {               \r
                // generates overriding method that allows parsing any element\r
@@ -553,10 +578,7 @@ public class ImporterGenerator extends JavaGenerator{
        }\r
        \r
        \r
-       @Override\r
-       protected void handleSimpleType(SchemaObject parent, SchemaObject simpleType) {\r
-\r
-       }\r
+       \r
 \r
        \r
        IDProvider provider;\r
@@ -576,7 +598,7 @@ public class ImporterGenerator extends JavaGenerator{
                writers.put(elementObj, fw);\r
                boolean isList = false;\r
                \r
-               Inheritance inhertiance = getElementInheritance(elementObj);    \r
+               Inheritance inheritance = getInheritance(elementObj);   \r
                \r
                provider = getIDProvider(element);\r
                List<IDReference> references = getIDReferences(element);\r
@@ -589,7 +611,7 @@ public class ImporterGenerator extends JavaGenerator{
                        intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");\r
 \r
                createClassHeader(fw.writer, isList);\r
-               writeClass(fw.writer,false, element.getName(), className, inhertiance.baseClass, intrerfaces);\r
+               writeClass(fw.writer,false, element.getName(), className, inheritance.baseClass, intrerfaces);\r
                writeIDProvider(fw.writer);\r
                fw.writer.println("   @Override");\r
                fw.writer.println("   public Resource create(WriteGraph graph, ParserElement element) throws DatabaseException{");\r
@@ -615,7 +637,7 @@ public class ImporterGenerator extends JavaGenerator{
                \r
                fw.writer.println("   @Override");\r
                fw.writer.println("   public void configure(WriteGraph graph, Deque<ParserElement> parents, ParserElement element) throws DatabaseException {");\r
-               if (inhertiance.type == InheritanceType.ComplexType) {\r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
                fw.writer.println("             super.configure(graph,parents,element);");\r
                }\r
                fw.writer.println("        "+getOntologyImport());\r
@@ -629,11 +651,11 @@ public class ImporterGenerator extends JavaGenerator{
                } \r
                fw.writer.println("   }");\r
                \r
-               if (inhertiance.type == InheritanceType.AtomicType) {\r
+               if (inheritance.type == InheritanceType.AtomicType) {\r
                fw.writer.println();\r
                fw.writer.println("   @Override");\r
                fw.writer.println("   public void configure(WriteGraph graph, ParserElement element, java.lang.String string) throws DatabaseException {");\r
-               fw.writer.println("      graph.claimValue(element.getData(), "+getValueGetter(inhertiance.atomicType,"string")+", "+inhertiance.atomicType.binding+");");\r
+               fw.writer.println("      graph.claimValue(element.getData(), "+getValueGetter(inheritance.atomicType,"string")+", "+inheritance.atomicType.binding+");");\r
                fw.writer.println("   }");\r
                }\r
 //             if (simpleType != null) {\r
@@ -666,7 +688,7 @@ public class ImporterGenerator extends JavaGenerator{
                if (stringWriter.getBuffer().length() > 0) {\r
                        fw.writer.write(stringWriter.toString());\r
                }\r
-               if (inhertiance.type == InheritanceType.ComplexType) {\r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
                fw.writer.println("      return super.connectChild(graph,element,child);");     \r
                } else {\r
                fw.writer.println("      return false;");\r
@@ -759,7 +781,7 @@ public class ImporterGenerator extends JavaGenerator{
        }\r
        \r
        @Override\r
-       protected String getBaseClass() {\r
+       protected String getBaseClass(ObjectType type) {\r
                return "org.simantics.xml.sax.base.XMLElementNamedChildParserBase";\r
        }\r
        \r