]> gerrit.simantics Code Review - simantics/interop.git/blobdiff - org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
Handling ComplexTypes inheriting AtomicType
[simantics/interop.git] / org.simantics.xml.sax / src / org / simantics / xml / sax / ExporterGenerator.java
index 1d97259528bef8569311d85c27508f3e9b0f912a..c5c3f5ec32bfe9ba7fe4191b782eadbccb43c56c 100644 (file)
@@ -11,11 +11,12 @@ import java.util.Map;
 import javax.xml.namespace.QName;\r
 \r
 import org.simantics.utils.datastructures.BijectionMap;\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
@@ -25,7 +26,6 @@ import org.w3._2001.xmlschema.Element;
 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 +39,7 @@ public class ExporterGenerator extends JavaGenerator{
 \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
@@ -101,6 +101,7 @@ public class ExporterGenerator extends JavaGenerator{
                mainWriter.println("   public " + name + parserClassPostfix+"(Session session) throws DatabaseException {");\r
                if (schema.getTargetNamespace() != null)\r
                mainWriter.println("      setSchemaURI(\""+schema.getTargetNamespace()+"\");");\r
+               mainWriter.println("      setOntologyURI(\""+ontologyUri+"\");");\r
                mainWriter.println("      session.syncRequest(new ReadRequest() {");\r
                mainWriter.println("        @Override");\r
                mainWriter.println("        public void run(ReadGraph graph) throws DatabaseException {");\r
@@ -123,16 +124,19 @@ public class ExporterGenerator extends JavaGenerator{
        }\r
        \r
        @Override\r
-       protected String getBaseClass() {\r
+       protected String getBaseClass(ObjectType type) {\r
                return "org.simantics.xml.sax.base.XMLElementNamedChildWriterBase";\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
                String className = name;//"_"+name;\r
                \r
@@ -143,22 +147,26 @@ public class ExporterGenerator extends JavaGenerator{
                        throw new RuntimeException(e);\r
                }\r
                writers.put(complexTypeObj, fw);\r
-               \r
-               boolean isList = false;\r
 \r
-               String baseClass = "org.simantics.xml.sax.base.XMLElementNamedChildWriterBase";\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
+//             String baseClass = getBaseClass(ObjectType.COMPLEX_TYPE);\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
+//                     SchemaObject obj = complexTypeName.get(type.getLocalPart());\r
+////                   if (obj == null)\r
+////                           obj = simpleTypeName.get(type.getLocalPart());\r
+//                     if (obj != null) {\r
+//                             baseClass = getName(obj);\r
+//                             inherited = true;\r
+//                     }\r
+//             }\r
+               Inheritance inheritance = getInheritance(complexTypeObj);\r
                \r
                provider = getIDProvider(topLevelComplexType);\r
-               List<IDReference> references = getIDReferences(topLevelComplexType);\r
-               UnrecognizedChildElement unknownChildElement = getUnknown(topLevelComplexType);\r
+//             List<IDReference> references = getIDReferences(topLevelComplexType);\r
+//             UnrecognizedChildElement unknownChildElement = getUnknown(topLevelComplexType);\r
 \r
 //             List<String> intrerfaces = new ArrayList<String>();\r
 //             if (references.size() > 0)\r
@@ -167,7 +175,7 @@ public class ExporterGenerator extends JavaGenerator{
 //                     intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");\r
                \r
                createClassHeader(fw.writer);\r
-               writeClass(fw.writer,false, null, className, baseClass, Collections.EMPTY_LIST);\r
+               writeClass(fw.writer,false, topLevelComplexType.getName(), className, inheritance.baseClass, Collections.EMPTY_LIST);\r
                        \r
 //             writeIDProvider(fw.writer);\r
        \r
@@ -213,18 +221,17 @@ public class ExporterGenerator extends JavaGenerator{
                \r
                fw.writer.println("   }");\r
                \r
-//             fw.writer.println("   @Override");\r
-//             fw.writer.println("   public boolean connectChild(WriteGraph graph, ParserElement element, ParserElement child) throws DatabaseException{");\r
-//             fw.writer.println("      "+getOntologyImport());\r
-//             \r
-//             if (stringWriter.getBuffer().length() > 0) {\r
-//                     fw.writer.write(stringWriter.toString());\r
-//             }\r
-//             \r
-//             \r
-//             fw.writer.println("      return false;");\r
-//             fw.writer.println("   }");\r
-//             fw.writer.println();\r
+               fw.writer.println("   @Override");\r
+               fw.writer.println("   public void children(ReadGraph graph, WriterElement instance, java.util.Set<org.simantics.db.Resource> result) throws XMLStreamException, DatabaseException {");\r
+               fw.writer.println("      "+getOntologyImport());\r
+               \r
+               if (stringWriter.getBuffer().length() > 0) {\r
+                       fw.writer.write(stringWriter.toString());\r
+               }\r
+               if (inheritance.type == InheritanceType.ComplexType)\r
+               fw.writer.println("      super.children(graph,instance,result);");\r
+               fw.writer.println("   }");\r
+               fw.writer.println();\r
                \r
                if (stringWriter2.getBuffer().length() > 0) {\r
                        fw.writer.write(stringWriter2.toString());\r
@@ -239,7 +246,7 @@ public class ExporterGenerator extends JavaGenerator{
                \r
                fw.writer.println("   @Override");\r
                fw.writer.println("   public void attributes(ReadGraph graph, WriterElement instance, Collection<Statement> attributes, XMLStreamWriter writer) throws XMLStreamException, DatabaseException{");\r
-               if (inherited) {\r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
                fw.writer.println("             super.attributes(graph,instance,attributes,writer);");\r
                }\r
                fw.writer.println("        "+getOntologyImport());\r
@@ -249,6 +256,14 @@ public class ExporterGenerator extends JavaGenerator{
                fw.writer.println("        }");\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 characters(ReadGraph graph, WriterElement instance, XMLStreamWriter writer) throws XMLStreamException, DatabaseException {");\r
+               fw.writer.println("            writer.writeCharacters("+inheritance.atomicType.getToString("graph.getValue(instance.getResource(),"+inheritance.atomicType.binding+")")+");");\r
+               fw.writer.println("   }");\r
+               }\r
+               \r
 //             writeIDReferences(fw.writer,name, references);\r
 //             writeUnknownChild(fw.writer,name,unknownChildElement);\r
                \r
@@ -264,37 +279,137 @@ public class ExporterGenerator 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("        addRelationWriter("+ontShort+ getName(parent)+"_has"+refName +", "+secondaryClassName+".class);");\r
+                               fw.delayedWriter2.println("   public static class " + secondaryClassName +" extends " + primaryClassName +"{");\r
+                               fw.delayedWriter2.println("      public "+ secondaryClassName +"(ReadGraph graph){");\r
+                               fw.delayedWriter2.println("         super(graph);");\r
+                               fw.delayedWriter2.println("      }");\r
+                               fw.delayedWriter2.println("      ");\r
+                               fw.delayedWriter2.println("      @Override");\r
+                               fw.delayedWriter2.println("      public java.lang.String getElementId() {");\r
+                               fw.delayedWriter2.println("         return \"" + refName +"\";");\r
+                               fw.delayedWriter2.println("      }");\r
+                               fw.delayedWriter2.println("   }");\r
+                               } else { //referenceType == RefType.Reference\r
+                               fw.writer.println("        addWriter("+primaryClassName+".class);");\r
+                               if (!primaryClassName.equals(secondaryClassName))\r
+                               fw.writer.println("        addWriter("+secondaryClassName+".class);");\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, referenceType == RefType.Reference, refName, refType)) {\r
+               \r
+                               // element type specific list\r
+                               fw.delayedWriter.println("            {");\r
+                               fw.delayedWriter.println("               org.simantics.db.Resource list = graph.getPossibleObject(instance.getResource(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
+                               fw.delayedWriter.println("               if (list != null) {");\r
+                               fw.delayedWriter.println("                  java.util.List<org.simantics.db.Resource> l = org.simantics.db.common.utils.ListUtils.toList(graph, list);");\r
+                               fw.delayedWriter.println("                  result.addAll(l);");\r
+                               fw.delayedWriter.println("               } else {");\r
+                               fw.delayedWriter.println("                  result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
+                               fw.delayedWriter.println("               }");\r
+                               fw.delayedWriter.println("            }");\r
+                               } else {\r
+                               fw.delayedWriter.println("         result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
+                               }\r
+       //                      if (useOriginalList(parent, indicator,element, reference, ref, 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
+                               SchemaObject refElement = elementName.get(refType.getLocalPart());\r
+                               //writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");\r
+                               fw.writer.println("        addRelationWriter("+ ontShort +getName(parent) + "_has"+refName+", "+getName(parent) +"_" +refName+".class);");\r
+                               \r
+                               fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +refName+" extends org.simantics.xml.sax.base.ValueElementWriter {");\r
+                               fw.delayedWriter2.println("      public "+ getName(parent) +"_" +refName +"(){");\r
+                               //fw.delayedWriter2.println("           super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", "+binding+");");\r
+                               fw.delayedWriter2.println("           super(\""+refName+"\",null, "+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("        addTypeWriter("+ontShort+ className +", "+className+".class);");\r
-                       else\r
-                       fw.writer.println("        addWriter("+className+".class);");\r
-                       if (!className.equals(refClassName))\r
-                       fw.writer.println("        addWriter("+refClassName+".class);");\r
+                       String className = getName(obj);\r
+                       if (refName == null) {\r
+                               refName = obj.getName();//attrs.getName();\r
+                       }\r
+\r
+                       //if (!reference)\r
+                       fw.writer.println("        addTypeWriter("+ ontShort+getName(obj) +", "+className+".class);");\r
+//                     else\r
+//                     fw.writer.println("        addWriter("+className+".class);");\r
                        \r
-//                     fw.delayedWriter.println("         if (child.getElementParser() instanceof "+refClassName+"){");\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, refType)) {\r
-//     \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("               org.simantics.db.Resource list = graph.getPossibleObject(instance.getResource(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
+                       fw.delayedWriter.println("               if (list != null) {");\r
+                       fw.delayedWriter.println("                  java.util.List<org.simantics.db.Resource> l = org.simantics.db.common.utils.ListUtils.toList(graph, list);");\r
+                       fw.delayedWriter.println("                  result.addAll(l);");\r
+                       fw.delayedWriter.println("               } else {");\r
+                       fw.delayedWriter.println("                  result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
+                       fw.delayedWriter.println("               }");\r
+                       fw.delayedWriter.println("            }");\r
+                       } else {\r
+                       fw.delayedWriter.println("         result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\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
@@ -306,7 +421,7 @@ public class ExporterGenerator extends JavaGenerator{
 //                     fw.delayedWriter.println("               }");\r
 //                     fw.delayedWriter.println("            }");\r
 //                     }\r
-//                     if (useOriginalList(parent, indicator,element, reference, ref, refType)) {\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
@@ -322,65 +437,10 @@ public class ExporterGenerator extends JavaGenerator{
 //                     \r
 //                     fw.delayedWriter.println("            return true;");\r
 //                     fw.delayedWriter.println("         }");\r
-               } else {\r
-                       SchemaObject refElement = elementName.get(refType.getLocalPart());\r
-                       //writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");\r
-                       fw.writer.println("        addRelationWriter("+ ontShort +getName(parent) + "_has"+ref+", "+getName(parent) +"_" +ref+".class);");\r
-                       \r
-                       fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +ref+" extends org.simantics.xml.sax.base.ValueElementWriter {");\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("           super(\""+ref+"\",null, "+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("        addTypeWriter("+ ontShort+getName(obj) +", "+className+".class);");\r
-               else\r
-               fw.writer.println("        addWriter("+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
@@ -396,10 +456,7 @@ public class ExporterGenerator extends JavaGenerator{
                fw.delayedWriter2.println("      return null;");\r
                fw.delayedWriter2.println("   }");\r
        }\r
-       \r
-       \r
-       \r
-       \r
+\r
        @Override       \r
        protected void handle(SchemaObject parent, Attribute attribute) {\r
                String name = attribute.getName();\r
@@ -592,10 +649,7 @@ public class ExporterGenerator extends JavaGenerator{
        }\r
        \r
        \r
-       @Override\r
-       protected void handleSimpleType(SchemaObject parent, SchemaObject simpleType) {\r
-\r
-       }\r
+       \r
        \r
        \r
        \r
@@ -616,7 +670,7 @@ public class ExporterGenerator 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
@@ -629,7 +683,7 @@ public class ExporterGenerator extends JavaGenerator{
 //                     intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");\r
 \r
                createClassHeader(fw.writer);\r
-               writeClass(fw.writer,false, element.getName(), className, inhertiance.baseClass, Collections.EMPTY_LIST);\r
+               writeClass(fw.writer,false, element.getName(), className, inheritance.baseClass, Collections.EMPTY_LIST);\r
 //             writeIDProvider(fw.writer);\r
                fw.writer.println("   @Override");\r
                fw.writer.println("   public Resource getType(ReadGraph graph) throws DatabaseException {");\r
@@ -657,7 +711,7 @@ public class ExporterGenerator extends JavaGenerator{
                \r
                fw.writer.println("   @Override");\r
                fw.writer.println("   public void attributes(ReadGraph graph, WriterElement instance, Collection<Statement> attributes, XMLStreamWriter writer) throws XMLStreamException, DatabaseException{");\r
-               if (inhertiance.type == InheritanceType.ComplexType) {\r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
                fw.writer.println("        super.attributes(graph,instance,attributes,writer);");\r
                }\r
                fw.writer.println("        "+getOntologyImport());\r
@@ -669,6 +723,7 @@ public class ExporterGenerator extends JavaGenerator{
                fw.writer.println("        }");\r
                fw.writer.println("   }");\r
                \r
+               \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
@@ -685,7 +740,7 @@ public class ExporterGenerator 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
@@ -693,7 +748,7 @@ public class ExporterGenerator extends JavaGenerator{
 //             fw.writer.println("   }");\r
                fw.writer.println("   @Override");\r
                fw.writer.println("   public void characters(ReadGraph graph, WriterElement instance, XMLStreamWriter writer) throws XMLStreamException, DatabaseException {");\r
-               fw.writer.println("            writer.writeCharacters("+inhertiance.atomicType.getToString("graph.getValue(instance.getResource(),"+inhertiance.atomicType.binding+")")+");");\r
+               fw.writer.println("            writer.writeCharacters("+inheritance.atomicType.getToString("graph.getValue(instance.getResource(),"+inheritance.atomicType.binding+")")+");");\r
 //             fw.writer.println("      graph.claimValue(element.getData(),"+getValueGetter(binding)+", "+binding.binding +");");\r
                fw.writer.println("   }");\r
                }\r
@@ -720,21 +775,21 @@ public class ExporterGenerator extends JavaGenerator{
                \r
                fw.writer.println("   }");\r
                \r
-//             fw.writer.println("   @Override");\r
-//             fw.writer.println("   public boolean connectChild(WriteGraph graph, ParserElement element, ParserElement child) throws DatabaseException{");\r
-//             fw.writer.println("      "+getOntologyImport());\r
-//             \r
-//             if (stringWriter.getBuffer().length() > 0) {\r
-//                     fw.writer.write(stringWriter.toString());\r
-//             }\r
-//             if (inhertiance.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
+               fw.writer.println("   @Override");\r
+               fw.writer.println("   public void children(ReadGraph graph, WriterElement instance, java.util.Set<org.simantics.db.Resource> result) throws XMLStreamException, DatabaseException {");\r
+               fw.writer.println("      "+getOntologyImport());\r
+               \r
+               if (stringWriter.getBuffer().length() > 0) {\r
+                       fw.writer.write(stringWriter.toString());\r
+               }\r
                \r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
+               fw.writer.println("      super.children(graph,instance,result);");\r
+               }\r
+               \r
+               fw.writer.println("   }");\r
+               fw.writer.println();\r
+                               \r
                if (stringWriter2.getBuffer().length() > 0) {\r
                        fw.writer.write(stringWriter2.toString());\r
                }\r