]> gerrit.simantics Code Review - simantics/interop.git/blobdiff - org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
Several updates to interoperability.
[simantics/interop.git] / org.simantics.xml.sax / src / org / simantics / xml / sax / ExporterGenerator.java
index 1976664fa73b758358a20d98a162379fc5e07381..121a6352b8e73401ad894c00b90add2e29083c7d 100644 (file)
@@ -11,8 +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.Inheritance;\r
+import org.simantics.xml.sax.SchemaConversionBase.InheritanceType;\r
+import org.simantics.xml.sax.SchemaConversionBase.RefType;\r
+import org.simantics.xml.sax.SchemaConversionBase.TypeEntry;\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.UnrecognizedChildElement;\r
@@ -24,31 +28,18 @@ 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.NamedGroup;\r
 import org.w3._2001.xmlschema.Restriction;\r
-import org.w3._2001.xmlschema.Schema;\r
 import org.w3._2001.xmlschema.SimpleType;\r
-import org.w3._2001.xmlschema.TopLevelAttribute;\r
 \r
 public class ExporterGenerator extends JavaGenerator{\r
        \r
-       public ExporterGenerator(Configuration configuration) {\r
-               super(configuration);\r
+       public ExporterGenerator(SchemaConverter converter, SchemaConversionBase base) {\r
+               super(converter, base);\r
        }\r
 \r
-       \r
-       \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
-               \r
+       public void createParser() throws IOException {\r
                \r
-               String packageParts[] = className.split("\\.");\r
-               String name = packageParts[packageParts.length-1];\r
-       \r
-               \r
-               ontShort = name.substring(0, 3).toUpperCase();\r
-               ontShort +=".";\r
                String parserPackagePostfix = "_exp";\r
                String importerClassPostfix = "Exporter";\r
                String parserClassPostfix = "Writer";\r
@@ -58,7 +49,7 @@ public class ExporterGenerator extends JavaGenerator{
                if (!importParserDir.exists())\r
                        importParserDir.mkdirs();\r
                \r
-               handle(schema);\r
+               base.handle(this);\r
                // Create Importer class\r
                File importerFile = new File(converter.getParserDir().getAbsolutePath()+"/"+name+importerClassPostfix+".java");\r
                PrintWriter mainWriter = createFile(importerFile);\r
@@ -117,21 +108,28 @@ public class ExporterGenerator extends JavaGenerator{
                mainWriter.close();\r
        }\r
        \r
-       protected void handle(TopLevelAttribute topLevelAttribute) {\r
-\r
-       }\r
+//     @Override\r
+//     protected void handle(TopLevelAttribute topLevelAttribute) {\r
+//\r
+//     }\r
        \r
        @Override\r
-       protected String getBaseClass() {\r
+       public 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
+       public void handleSimpleType(SchemaObject parent, SchemaObject simpleTypeObj) {\r
+       }\r
+       \r
+       @Override\r
+       public void handle(SchemaObject parent, NamedGroup attribute) {\r
+               // TODO Auto-generated method stub\r
+               \r
        }\r
 \r
        @Override\r
-       protected void handleComplexType(SchemaObject complexTypeObj) {\r
+       public void handleComplexType(SchemaObject complexTypeObj) {\r
                ComplexType topLevelComplexType = complexTypeObj.getComplexType();\r
                \r
                String name = getName(complexTypeObj);\r
@@ -146,22 +144,23 @@ public class ExporterGenerator extends JavaGenerator{
                }\r
                writers.put(complexTypeObj, fw);\r
 \r
-               String baseClass = getBaseClass();\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
+//             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 = base.getInheritance(complexTypeObj);\r
                \r
-               provider = getIDProvider(topLevelComplexType);\r
+               provider = base.getIDProvider(topLevelComplexType);\r
 //             List<IDReference> references = getIDReferences(topLevelComplexType);\r
 //             UnrecognizedChildElement unknownChildElement = getUnknown(topLevelComplexType);\r
 \r
@@ -172,7 +171,7 @@ public class ExporterGenerator extends JavaGenerator{
 //                     intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");\r
                \r
                createClassHeader(fw.writer);\r
-               writeClass(fw.writer,false, topLevelComplexType.getName(), 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
@@ -214,7 +213,7 @@ public class ExporterGenerator extends JavaGenerator{
                fw.writer.println("      super(graph);");\r
                fw.writer.println("      "+getOntologyImport());\r
                \r
-               handleComplexTypeExtension(complexTypeObj);\r
+               base.handleComplexTypeExtension(complexTypeObj);\r
                \r
                fw.writer.println("   }");\r
                \r
@@ -225,7 +224,8 @@ public class ExporterGenerator extends JavaGenerator{
                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
                fw.writer.println("   }");\r
                fw.writer.println();\r
                \r
@@ -242,16 +242,24 @@ 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
                fw.writer.println("        for (Statement attribute : attributes) {");\r
-               handleComplexTypeAttributes(complexTypeObj);\r
-               handleExtensionAttributes(complexTypeObj);\r
+               base.handleComplexTypeAttributes(complexTypeObj);\r
+               base.handleExtensionAttributes(complexTypeObj);\r
                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,137 +272,52 @@ public class ExporterGenerator extends JavaGenerator{
                provider = null;\r
        }\r
        \r
-       \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
+       protected void createReferenceIndicator(SchemaObject parent, RefType referenceType, String refName, String objectName,\r
+                       String primaryClassName, String secondaryClassName, boolean useElementList, boolean useOriginalList) {\r
                FileWriter fw = getWriter(parent);\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
-                       } else {\r
-                               refType = element.getElement().getRef();\r
-                               if (refName == null)\r
-                                       refName = refType.getLocalPart();\r
-                       }\r
-                       \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
-                               \r
-                               if (refComplexType != null) {\r
-                                       refClassName = getName(refComplexType);\r
-                               } else {\r
-                                       refClassName = getName(refElement);\r
-                               }\r
-                               \r
-                               if (referenceType != RefType.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
-                               \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
-                               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
-                       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 "+className+"){");\r
+               if ("TextOrField".equals(refName))\r
+                       System.out.println();\r
+               if (referenceType == RefType.Type) {\r
+               // create internal class for handling the element and child attachment\r
+               secondaryClassName = getName(parent) +"_" +objectName;\r
+               if (objectName.equals(refName))\r
+               fw.writer.println("      addRelationWriter("+ontShort+ getName(parent)+"_has"+refName +", "+secondaryClassName+".class);");\r
+               else // FIXME : type name may not be correct\r
+               fw.writer.println("      addRelationTypeWriter("+ontShort+ getName(parent)+"_has"+refName +", " +ontShort+primaryClassName +", "+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, 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
-//                     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
+               if (useElementList) {\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
@@ -407,16 +330,78 @@ public class ExporterGenerator extends JavaGenerator{
 //                     fw.delayedWriter.println("               }");\r
 //                     fw.delayedWriter.println("            }");\r
 //                     }\r
-//                     \r
+               \r
 //                     fw.delayedWriter.println("            return true;");\r
 //                     fw.delayedWriter.println("         }");\r
-               }\r
+               \r
        }\r
        \r
+       @Override\r
+       protected void createPrimitiveIndicator(SchemaObject parent, String refName, TypeEntry typeEntry, QName typeName) {\r
+               FileWriter fw = getWriter(parent);\r
+               String ontologyClassName = converter.getOntologyClassName(typeName.getNamespaceURI());\r
+               String typeURI = ontologyClassName != null ? ontologyClassName + ".URIs." + getName(base.getSimpleType(typeName)) : "null";\r
+               \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(\""+refName+"\", " + typeURI + ", " + typeEntry.binding+");");\r
+               fw.delayedWriter2.println("      }\n");\r
+               fw.delayedWriter2.println("      @Override");\r
+               fw.delayedWriter2.println("      public String decode(Object value) {");\r
+               fw.delayedWriter2.println("         return " + typeEntry.stringPrefix + "(" + typeEntry.javaType + ")value" + typeEntry.stringPostfix + ";");\r
+               fw.delayedWriter2.println("      }");\r
+               fw.delayedWriter2.println("   }");\r
+       }\r
        \r
+       @Override\r
+       protected void createElementIndicator(SchemaObject parent, boolean useElementList, String refName, String className,\r
+                       boolean useOriginalList) {\r
+               FileWriter fw = getWriter(parent);\r
+               //if (!reference)\r
+               fw.writer.println("        addTypeWriter("+ ontShort+className +", "+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) {\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, 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
+       public void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement any) {          \r
                // generates overriding method that allows writing any element\r
                FileWriter fw = getWriter(parent);\r
                fw.delayedWriter2.println("   @Override");\r
@@ -431,7 +416,9 @@ public class ExporterGenerator extends JavaGenerator{
        }\r
 \r
        @Override       \r
-       protected void handle(SchemaObject parent, Attribute attribute) {\r
+       public void handle(SchemaObject parent, Attribute attribute) {\r
+               if (parent == null)\r
+                       return;\r
                String name = attribute.getName();\r
                QName primitiveType = attribute.getType();\r
                SimpleType simpleType = attribute.getSimpleType();\r
@@ -449,7 +436,7 @@ public class ExporterGenerator extends JavaGenerator{
                        attrName = ref.getLocalPart();\r
                        relationName = ontShort+getName(parent)+"_has"+ref.getLocalPart();\r
                        \r
-                       Attribute referred = getRefAttribute(ref);\r
+                       Attribute referred = base.getRefAttribute(ref);\r
                        if (referred != null) {\r
                                primitiveType = referred.getType();\r
                                simpleType = referred.getSimpleType();\r
@@ -466,14 +453,14 @@ public class ExporterGenerator extends JavaGenerator{
                if (primitiveType != null) {\r
                        \r
                        //String binding = getBindingFromPrimitiveType(primitiveType);\r
-                       TypeEntry binding = getTypeEntry(primitiveType);\r
+                       TypeEntry binding = base.getTypeEntry(primitiveType);\r
                        \r
                        if (binding != null) {\r
                                writeAttribute(fw, attrName, relationName, binding, isReference);\r
                                return;\r
                    } else {\r
                        if (simpleType == null) {\r
-                               SchemaObject simpleTypeObj = simpleTypeName.get(primitiveType.getLocalPart());\r
+                               SchemaObject simpleTypeObj = base.getSimpleType(primitiveType);\r
                                if (simpleTypeObj != null)\r
                                        simpleType = simpleTypeObj.getSimpleType();\r
                        }       \r
@@ -482,7 +469,7 @@ public class ExporterGenerator extends JavaGenerator{
                if (simpleType != null) {\r
                        org.w3._2001.xmlschema.List list = simpleType.getList();\r
                        if (list != null) {\r
-                               TypeEntry binding = getTypeEntry(new QName(SCHEMA_NS, "string"));\r
+                               TypeEntry binding = base.getTypeEntry(new QName(SchemaConversionBase.SCHEMA_NS, "string"));\r
                                writeAttribute(fw, attrName, relationName, binding, isReference);\r
                        } else {\r
                                Restriction restriction = simpleType.getRestriction();\r
@@ -492,7 +479,7 @@ public class ExporterGenerator extends JavaGenerator{
                                \r
                                \r
                                //String binding = getBindingFromPrimitiveType(base);\r
-                               TypeEntry binding = getTypeEntry(base);\r
+                               TypeEntry binding = this.base.getTypeEntry(base);\r
                                writeAttribute(fw, attrName, relationName, binding, isReference);\r
                        }\r
                } else {\r
@@ -500,11 +487,10 @@ public class ExporterGenerator extends JavaGenerator{
                        //throw new RuntimeException("Cannot resolve type for Attribute " + attrName + " -> " + primitiveType.getLocalPart());\r
                        fw.writer.println("    //FIXME: Cannot resolve type for Attribute " + attrName + " Using default type String");\r
                        //writeAttribute(fw, attrName, relationName, "STRING", isReference);\r
-                       writeAttribute(fw, attrName, relationName, getTypeEntry("string"), isReference);\r
+                       writeAttribute(fw, attrName, relationName, base.getTypeEntry("string"), isReference);\r
                }\r
        }\r
        \r
-       //private void writeAttribute(FileWriter fw, String attrName, String relationName, String binding, boolean isReference) {\r
        private void writeAttribute(FileWriter fw, String attrName, String relationName, TypeEntry binding, boolean isReference) {\r
                fw.writer.println("      {");\r
                fw.writer.println("         if (attribute.getPredicate().equals("+relationName+")) {"); \r
@@ -517,7 +503,7 @@ public class ExporterGenerator extends JavaGenerator{
        }\r
        \r
        @Override\r
-       protected void handleAttributes(SchemaObject simpleTypeObj) {\r
+       public void handleAttributes(SchemaObject simpleTypeObj) {\r
                SchemaObject parent = simpleTypeObj.getParent();\r
                FileWriter fw = getWriter(parent);\r
                \r
@@ -529,7 +515,7 @@ public class ExporterGenerator extends JavaGenerator{
                \r
                \r
                //String binding = getBindingFromPrimitiveType(base);\r
-               TypeEntry binding = getTypeEntry(base);\r
+               TypeEntry binding = this.base.getTypeEntry(base);\r
                \r
                fw.writer.println("   @Override");\r
                fw.writer.println("   public void characters(ReadGraph graph, WriterElement instance, XMLStreamWriter writer) throws XMLStreamException, DatabaseException {");\r
@@ -539,10 +525,10 @@ public class ExporterGenerator extends JavaGenerator{
        }\r
        \r
        @Override\r
-       protected void handle(SchemaObject parent, AttributeGroup attribute) {\r
+       public void handle(SchemaObject parent, AttributeGroup attribute) {\r
                if (parent != null) {\r
                        FileWriter fw = getWriter(parent);\r
-                       NamedAttributeGroup group = 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
@@ -560,10 +546,10 @@ public class ExporterGenerator extends JavaGenerator{
        }\r
        \r
        @Override\r
-       protected void handleAttributeComposition(SchemaObject parent, AttributeComposition composition, BijectionMap<org.simantics.xml.sax.configuration.Attribute, Annotated> attributes) {\r
+       public void handleAttributeComposition(SchemaObject parent, AttributeComposition composition, BijectionMap<org.simantics.xml.sax.configuration.Attribute, Annotated> attributes) {\r
                FileWriter fw = getWriter(parent);\r
-               QName type = new QName(CONVERSION_NS, composition.getType());\r
-               TypeEntry typeEntry = getTypeEntry(type);\r
+               QName type = new QName(SchemaConversionBase.CONVERSION_NS, composition.getType());\r
+               TypeEntry typeEntry = this.base.getTypeEntry(type);\r
                String arrayBinding = typeEntry.binding;//getBindingFromPrimitiveType(type);\r
                String javaType = typeEntry.javaType;//getJavaTypeFromPrimitiveType(type);\r
                String name = composition.getName();\r
@@ -612,7 +598,7 @@ public class ExporterGenerator extends JavaGenerator{
        }\r
        \r
        protected String getDefaultValue(QName atype) {\r
-               Map<String,TypeEntry> types = typeMap.get(atype.getNamespaceURI());\r
+               Map<String,TypeEntry> types = this.base.typeMap.get(atype.getNamespaceURI());\r
                if (types == null)\r
                        return null;\r
                TypeEntry entry =  types.get(atype.getLocalPart());\r
@@ -621,14 +607,9 @@ public class ExporterGenerator extends JavaGenerator{
                return entry.defaultValue;\r
        }\r
        \r
-       \r
-       \r
-       \r
-       \r
-       \r
        IDProvider provider;\r
        @Override\r
-       protected void handleElement(SchemaObject elementObj)  {\r
+       public void handleElement(SchemaObject elementObj)  {\r
                Element element = elementObj.getElement();\r
                \r
                String name = getName(elementObj);//topLevelElement.getName();\r
@@ -643,11 +624,11 @@ public class ExporterGenerator extends JavaGenerator{
                writers.put(elementObj, fw);\r
                boolean isList = false;\r
                \r
-               Inheritance inhertiance = getElementInheritance(elementObj);    \r
+               Inheritance inheritance = this.base.getInheritance(elementObj); \r
                \r
-               provider = getIDProvider(element);\r
-               List<IDReference> references = getIDReferences(element);\r
-               UnrecognizedChildElement unknownChildElement = getUnknown(element);\r
+               provider = this.base.getIDProvider(element);\r
+               List<IDReference> references = this.base.getIDReferences(element);\r
+               UnrecognizedChildElement unknownChildElement = this.base.getUnknown(element);\r
 \r
 //             List<String> intrerfaces = new ArrayList<String>();\r
 //             if (references.size() > 0)\r
@@ -656,7 +637,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
@@ -684,14 +665,14 @@ 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
                fw.writer.println("        for (Statement attribute : attributes) {");\r
                if (complexType != null) {\r
-                       SchemaObject obj = complexTypes.get(complexType);\r
-                       handleElementComplexTypeAttributes(obj);\r
+                       SchemaObject obj = this.base.getComplexType(complexType);\r
+                       this.base.handleElementComplexTypeAttributes(obj);\r
                } \r
                fw.writer.println("        }");\r
                fw.writer.println("   }");\r
@@ -713,7 +694,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
@@ -721,7 +702,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
@@ -740,8 +721,8 @@ public class ExporterGenerator extends JavaGenerator{
                fw.writer.println("      super(graph);");\r
                fw.writer.println("      "+getOntologyImport());\r
                if (complexType != null) {\r
-                       SchemaObject obj = complexTypes.get(complexType);\r
-                       handleComplexTypeExtension(obj);\r
+                       SchemaObject obj = this.base.getComplexType(complexType);\r
+                       this.base.handleComplexTypeExtension(obj);\r
                } else if (simpleType != null) {\r
                        \r
                }\r
@@ -756,7 +737,7 @@ public class ExporterGenerator extends JavaGenerator{
                        fw.writer.write(stringWriter.toString());\r
                }\r
                \r
-               if (inhertiance.type == InheritanceType.ComplexType) {\r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
                fw.writer.println("      super.children(graph,instance,result);");\r
                }\r
                \r