]> gerrit.simantics Code Review - simantics/interop.git/blobdiff - org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
Initial support for XML export (order of Elements is not kept)
[simantics/interop.git] / org.simantics.xml.sax / src / org / simantics / xml / sax / ImporterGenerator.java
index 4245e3e1b4d471cd19e233e757bd0ae977554578..cff6e923c9aa668dc6ae73e467366d9bd0238860 100644 (file)
@@ -16,6 +16,7 @@ import org.simantics.xml.sax.configuration.AttributeComposition;
 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
@@ -32,24 +33,11 @@ import org.w3._2001.xmlschema.Schema;
 import org.w3._2001.xmlschema.SimpleType;\r
 import org.w3._2001.xmlschema.TopLevelAttribute;\r
 \r
-public class ImporterGenerator extends SchemaConversionBase{\r
+public class ImporterGenerator extends JavaGenerator{\r
        \r
        public ImporterGenerator(Configuration configuration) {\r
                super(configuration);\r
        }\r
-\r
-       String commentTag = "//";\r
-       \r
-       Schema schema;\r
-       String ontologyClassName;\r
-       SchemaConverter converter;\r
-       \r
-       List<String> ruleClassNames = new ArrayList<String>();\r
-       \r
-       String ontShort = "ONT"; \r
-       \r
-       File importParserDir;\r
-       String elementPackageName;\r
        \r
        public void createParser(Schema schema,String className, SchemaConverter converter) throws IOException {\r
                this.schema = schema;\r
@@ -88,12 +76,6 @@ public class ImporterGenerator extends SchemaConversionBase{
                mainWriter.println("      super(session, file, new "+name + parserClassPostfix+"());");\r
                mainWriter.println("   }");\r
                mainWriter.println();\r
-//             mainWriter.println("   @Override");\r
-//             mainWriter.println("   public void configure(XMLParser parser) {");\r
-//             for (String s : ruleClassNames) {\r
-//             mainWriter.println("      parser.add(new "+s+"());");\r
-//             }\r
-//             mainWriter.println("   }");\r
                mainWriter.println("}");\r
                \r
                mainWriter.println();\r
@@ -122,80 +104,12 @@ public class ImporterGenerator extends SchemaConversionBase{
                mainWriter.flush();\r
                mainWriter.close();\r
        }\r
-       \r
-       protected PrintWriter createFile(File file) throws IOException {\r
-               if (!file.exists())\r
-                       file.createNewFile();\r
-               PrintWriter writer = new PrintWriter(file);\r
-               for (String s : converter.getHeader()) {\r
-                       writer.println(commentTag + " " + s);   \r
-               }\r
-               writer.println();\r
-               return writer;\r
-       }\r
-       \r
-//     protected String getValueGetter(String binding,String name) {\r
-//             if (binding == null)\r
-//                     return name+".getValue()";\r
-//             if ("STRING".equals(binding))\r
-//                     return name+".getValue()";\r
-//             if ("BOOLEAN".equals(binding))\r
-//                     return "Boolean.parseBoolean("+name+".getValue())";\r
-//             if ("INTEGER".equals(binding))\r
-//                     return "Integer.parseInt("+name+".getValue())";\r
-//             if ("DOUBLE".equals(binding))\r
-//                     return "Double.parseDouble("+name+".getValue())";\r
-//             if ("FLOAT".equals(binding))\r
-//                     return "Float.parseFloat("+name+".getValue())";\r
-//             return name+".getValue()";\r
-//     }\r
-//     protected String getValueGetter(String binding) {\r
-//             if (binding == null)\r
-//                     return "value";\r
-//             if ("STRING".equals(binding))\r
-//                     return "value";\r
-//             if ("BOOLEAN".equals(binding))\r
-//                     return "Boolean.parseBoolean(value)";\r
-//             if ("INTEGER".equals(binding))\r
-//                     return "Integer.parseInt(value)";\r
-//             if ("DOUBLE".equals(binding))\r
-//                     return "Double.parseDouble(value)";\r
-//             if ("FLOAT".equals(binding))\r
-//                     return "Float.parseFloat(value)";\r
-//             return "value";\r
-//     }\r
-       protected String getValueGetterMethod(TypeEntry binding,String name) {\r
-               if (binding == null)\r
-                       return name+".getValue()";\r
-               return binding.getValueGetterMethod(name);\r
-       }\r
-       \r
-       protected String getValueGetter(TypeEntry binding,String name) {\r
-               if (binding == null)\r
-                       return name;\r
-               return binding.getValueGetter(name);\r
-       }\r
-       protected String getValueGetter(TypeEntry binding) {\r
-               if (binding == null)\r
-                       return "value";\r
-               return binding.getValueGetter();\r
-       }\r
-       \r
+\r
        protected void handle(TopLevelAttribute topLevelAttribute) {\r
 \r
        }\r
        \r
-\r
-       \r
-       public static String getComplexTypePrefix() {\r
-               return "ComplexTypes_";\r
-       }       \r
        \r
-       public static String getAttributeGroupPrefix() {\r
-               return "AttributeGroups_";\r
-       }\r
-       \r
-       private Map<SchemaObject, FileWriter> writers = new HashMap<SchemaObject, ImporterGenerator.FileWriter>();\r
        @Override\r
        protected void handleComplexType(SchemaObject complexTypeObj) {\r
                ComplexType topLevelComplexType = complexTypeObj.getComplexType();\r
@@ -240,7 +154,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                writeIDProvider(fw.writer);\r
        \r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public Resource create(WriteGraph graph, Element element) throws DatabaseException{");\r
+               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
@@ -254,7 +168,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                fw.writer.println();\r
                \r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public boolean connectParent(WriteGraph graph, Element parent, Element element) throws DatabaseException{");\r
+               fw.writer.println("   public boolean connectParent(WriteGraph graph, ParserElement parent, ParserElement element) throws DatabaseException{");\r
                fw.writer.println("      "+getOntologyImport());\r
                fw.writer.println("      graph.claim(parent.getData(), "+this.ontShort+getName(complexTypeObj,"has")+", element.getData());");\r
                fw.writer.println("      return true;");\r
@@ -274,7 +188,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                fw.writer.println("   }");\r
                \r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public boolean connectChild(WriteGraph graph, Element element, Element child) throws DatabaseException{");\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
@@ -298,7 +212,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                fw.delayedWriter2 = null;\r
                \r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public void configure(WriteGraph graph, Deque<Element> parents, Element element) throws DatabaseException {");\r
+               fw.writer.println("   public void configure(WriteGraph graph, Deque<ParserElement> parents, ParserElement element) throws DatabaseException {");\r
                if (inherited) {\r
                fw.writer.println("             super.configure(graph,parents,element);");\r
                }\r
@@ -321,30 +235,6 @@ public class ImporterGenerator extends SchemaConversionBase{
                provider = null;\r
        }\r
        \r
-       @Override\r
-       protected void handle(SchemaObject parent, SchemaElement indicator, List<SchemaElement> elements) {\r
-               if (indicator.getType() == SchemaElement.ElementType.SEQUENCE || (indicator.getType() == SchemaElement.ElementType.CHOICE && indicator.getRestriction().many())) {\r
-                       for (SchemaElement e : elements) {\r
-                               handle(parent, indicator, e);\r
-                       }\r
-               } else if (indicator.getType() == SchemaElement.ElementType.CHOICE) {\r
-                       String name = getChoiceName(elements);\r
-\r
-                       for (SchemaElement e : elements) {\r
-                               Element localElement = e.getElement();\r
-                               if (localElement.getName() != null) {\r
-                                       QName refType = localElement.getType();\r
-                                       if (refType != null)\r
-                                               handleIndicator(parent, indicator, e, false, name, refType);\r
-                               } else if (localElement.getRef() != null) {\r
-                                       QName refType = localElement.getRef();\r
-                                       handleIndicator(parent, indicator, e, true, name, refType);\r
-                               }\r
-                       }\r
-               }\r
-               \r
-       }\r
-       \r
        @Override\r
        protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element,  boolean reference, String ref, QName refType) {\r
                FileWriter fw = getWriter(parent);\r
@@ -352,15 +242,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                if (binding == null) {\r
                        SchemaObject refElement = elementName.get(refType.getLocalPart());\r
                        SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart());\r
-//                     String className = refType.getLocalPart();\r
-//                     if (!isElementRef(refType.getLocalPart())) { \r
-//                             className = "_"+className;\r
-//                     }\r
-//                     \r
-//                     String refClassName = refType.getLocalPart();\r
-//                     if (isComplexTypeRef(refClassName)) {\r
-//                             refClassName = "_"+refClassName;\r
-//                     }\r
+\r
                        String className = null;\r
                        String refClassName = null;\r
                        if (refElement != null)\r
@@ -399,12 +281,10 @@ public class ImporterGenerator extends SchemaConversionBase{
                        if (useOriginalList(parent, indicator,element, reference, ref, refType)) {\r
                        // generic list\r
                        fw.delayedWriter.println("            {");\r
-                       //fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+"XML_hasOriginalElementList);");\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(),"+ontShort+"XML_hasOriginalElementList,list);");\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
@@ -431,18 +311,8 @@ public class ImporterGenerator extends SchemaConversionBase{
                FileWriter fw = getWriter(parent);\r
                SchemaObject obj = getWithObj(parent, attrs);\r
        \r
-//             String className = refType.getLocalPart();\r
-//             if (!isElementRef(refType.getLocalPart())) { \r
-//                     className = "_"+className;\r
-//             }\r
-//             \r
-//             String refClassName = refType.getLocalPart();\r
-//             if (isComplexTypeRef(refClassName)) {\r
-//                     refClassName = "_"+refClassName;\r
-//             }\r
                String className = getName(obj);\r
-               \r
-               \r
+\r
                if (!reference)\r
                fw.writer.println("        addParser(\""+ ref +"\", "+className+".class);");\r
                else\r
@@ -466,12 +336,10 @@ public class ImporterGenerator extends SchemaConversionBase{
                if (useOriginalList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {\r
                // generic list\r
                fw.delayedWriter.println("            {");\r
-               //fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+"XML_hasOriginalElementList);");\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(),"+ontShort+"XML_hasOriginalElementList,list);");\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
@@ -486,9 +354,10 @@ public class ImporterGenerator extends SchemaConversionBase{
        \r
        @Override\r
        protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement any) {               \r
+               // generates overriding method that allows parsing any element\r
                FileWriter fw = getWriter(parent);\r
                fw.delayedWriter2.println("   @Override");\r
-               fw.delayedWriter2.println("   public Class<? extends org.simantics.xml.sax.base.XMLElementParser> getParser(java.util.Map<java.lang.String,org.simantics.xml.sax.base.XMLElementParser> parsers, Element element, Element child) {");\r
+               fw.delayedWriter2.println("   public Class<? extends org.simantics.xml.sax.base.XMLElementParser> getParser(java.util.Map<java.lang.String,org.simantics.xml.sax.base.XMLElementParser> parsers, ParserElement element, ParserElement child) {");\r
                fw.delayedWriter2.println("      Class<? extends org.simantics.xml.sax.base.XMLElementParser> parserClass = super.getParser(parsers, element, child);");\r
                fw.delayedWriter2.println("      if (parserClass != null) return parserClass;");\r
                fw.delayedWriter2.println("      org.simantics.xml.sax.base.XMLElementParser parser = parsers.get(child.getQName());");\r
@@ -496,19 +365,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                fw.delayedWriter2.println("      return null;");\r
                fw.delayedWriter2.println("   }");\r
        }\r
-       \r
-       private FileWriter getWriter(SchemaObject obj) {\r
-               SchemaObject s = obj;\r
-               while (s != null) {\r
-                       FileWriter fw = writers.get(s);\r
-                       if (fw != null)\r
-                               return fw;\r
-                       s = s.getParent();\r
-               }\r
-               return null;\r
-       }\r
-       \r
-       \r
+\r
        @Override       \r
        protected void handle(SchemaObject parent, Attribute attribute) {\r
                String name = attribute.getName();\r
@@ -610,7 +467,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                //String binding = getBindingFromPrimitiveType(base);\r
                TypeEntry binding = getTypeEntry(base);\r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public void configure(WriteGraph graph, Element element, java.lang.String value) throws DatabaseException {");\r
+               fw.writer.println("   public void configure(WriteGraph graph, ParserElement element, java.lang.String value) throws DatabaseException {");\r
                //fw.writer.println("      graph.claimValue(element.getData(),"+getValueGetter(binding)+", Bindings."+binding+");");\r
                fw.writer.println("      graph.claimValue(element.getData(),"+getValueGetter(binding)+", "+binding.binding +");");\r
                fw.writer.println("   }");\r
@@ -700,8 +557,7 @@ public class ImporterGenerator extends SchemaConversionBase{
        protected void handleSimpleType(SchemaObject parent, SchemaObject simpleType) {\r
 \r
        }\r
-       \r
-       \r
+\r
        \r
        IDProvider provider;\r
        @Override\r
@@ -736,7 +592,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                writeClass(fw.writer,false, element.getName(), className, inhertiance.baseClass, intrerfaces);\r
                writeIDProvider(fw.writer);\r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public Resource create(WriteGraph graph, Element element) throws DatabaseException{");\r
+               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
@@ -750,7 +606,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                fw.writer.println();\r
                \r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public boolean connectParent(WriteGraph graph, Element parent, Element element) throws DatabaseException{");\r
+               fw.writer.println("   public boolean connectParent(WriteGraph graph, ParserElement parent, ParserElement element) throws DatabaseException{");\r
                fw.writer.println("      "+getOntologyImport());\r
                fw.writer.println("      graph.claim(parent.getData(), "+this.ontShort+getName(elementObj,"has")+", element.getData());");\r
                fw.writer.println("      return true;");\r
@@ -758,7 +614,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                fw.writer.println();\r
                \r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public void configure(WriteGraph graph, Deque<Element> parents, Element element) throws DatabaseException {");\r
+               fw.writer.println("   public void configure(WriteGraph graph, Deque<ParserElement> parents, ParserElement element) throws DatabaseException {");\r
                if (inhertiance.type == InheritanceType.ComplexType) {\r
                fw.writer.println("             super.configure(graph,parents,element);");\r
                }\r
@@ -776,14 +632,14 @@ public class ImporterGenerator extends SchemaConversionBase{
                if (inhertiance.type == InheritanceType.AtomicType) {\r
                fw.writer.println();\r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public void configure(WriteGraph graph, Element element, java.lang.String string) throws DatabaseException {");\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("   }");\r
                }\r
-               if (simpleType != null) {\r
-                       SchemaObject obj = simpleTypes.get(simpleType);\r
-                       handleElementSimpleTypeAttributes(obj);\r
-               }\r
+//             if (simpleType != null) {\r
+//                     SchemaObject obj = simpleTypes.get(simpleType);\r
+//                     handleElementSimpleTypeAttributes(obj);\r
+//             }\r
                \r
                \r
                StringWriter stringWriter = new StringWriter();\r
@@ -804,7 +660,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                fw.writer.println("   }");\r
                \r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public boolean connectChild(WriteGraph graph, Element element, Element child) throws DatabaseException{");\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
@@ -842,99 +698,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                \r
                ruleClassNames.add(converter.getPluginName()+"."+elementPackageName+"."+name);\r
        }\r
-       \r
-       private enum InheritanceType{ComplexType,AtomicType,None};\r
-       \r
-       private class Inheritance {\r
-               public String baseClass;\r
-               public InheritanceType type;\r
-               public TypeEntry atomicType;\r
-               \r
-               public Inheritance() {\r
-                       baseClass = "org.simantics.xml.sax.base.XMLElementNamedChildParserBase";\r
-                       type = InheritanceType.None;\r
-               }\r
-       }\r
-       \r
-       private Inheritance getElementInheritance(SchemaObject topLevelElementObj) {\r
-               Element topLevelElement = topLevelElementObj.getElement();\r
-               Inheritance inheritance = new Inheritance();\r
-               if (topLevelElement.getType() != null) {\r
-                       QName type = topLevelElement.getType();\r
-                       if (!type.getNamespaceURI().equals(SCHEMA_NS)) {\r
-                               SchemaObject obj = complexTypeName.get(type.getLocalPart());\r
-//                             if (obj == null)\r
-//                                     obj = simpleTypeName.get(type.getLocalPart());\r
-                               if (obj != null) {\r
-                                       inheritance.baseClass = getName(obj);\r
-                                       inheritance.type = InheritanceType.ComplexType;\r
-                               }\r
-                       } else {\r
-                               TypeEntry entry = getTypeEntry(type);\r
-                               if (entry != null) {\r
-                                       inheritance.type = InheritanceType.AtomicType;\r
-                                       inheritance.atomicType = entry;\r
-                               }\r
-                       }\r
-               }\r
-               if (inheritance.type == InheritanceType.None) {\r
-                       QName type = getElementBase(topLevelElement);\r
-                       if (type != null) {\r
-                               if (!type.getNamespaceURI().equals(SCHEMA_NS)) {\r
-                                       SchemaObject obj = getWithName(topLevelElementObj, type.getLocalPart());\r
-                                       inheritance.baseClass = getName(obj);\r
-                                       inheritance.type = InheritanceType.ComplexType;\r
-                               } else {\r
-                                       TypeEntry entry = getTypeEntry(type);\r
-                                       if (entry != null) {\r
-                                               inheritance.type = InheritanceType.AtomicType;\r
-                                               inheritance.atomicType = entry;\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-               if (inheritance.type == InheritanceType.None) {\r
-                       QName type = topLevelElement.getSubstitutionGroup();\r
-                       if (type != null) {\r
-                               if (!type.getNamespaceURI().equals(SCHEMA_NS)) {\r
-                                       SchemaObject obj = getWithName(topLevelElementObj, type.getLocalPart());\r
-                                       inheritance.baseClass = getName(obj);\r
-                                       inheritance.type = InheritanceType.ComplexType;\r
-                               } else {\r
-                                       TypeEntry entry = getTypeEntry(type);\r
-                                       if (entry != null) {\r
-                                               inheritance.type = InheritanceType.AtomicType;\r
-                                               inheritance.atomicType = entry;\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-               \r
-               return inheritance;\r
-       }\r
-       \r
-       private void writeClass(PrintWriter writer,boolean abst, String name, String className, String baseClass, List<String> interfaces) {\r
-               writer.println("@SuppressWarnings(\"unused\")");\r
-               writer.print("public " +(abst ? "abstract " : "") + "class " + className + " extends "+baseClass);\r
-               if (interfaces.size() > 0) {\r
-                       writer.print(" implements ");\r
-                       for (int i = 0; i < interfaces.size(); i++) {\r
-                               writer.print(interfaces.get(i));\r
-                               if (i < interfaces.size() -1 )\r
-                                       writer.print(",");\r
-                       }\r
-               }\r
-               writer.println("{");\r
-               writer.println();\r
-               writer.println("   @Override");\r
-               writer.println("   public java.lang.String getElementId() {");\r
-               if (name != null)\r
-               writer.println("      return \""+name+"\";");\r
-               else // complex types cannot be parsed directly with name/id reference.\r
-               writer.println("      return null;");\r
-               writer.println("   }");\r
-               writer.println();\r
-       }\r
+\r
        \r
        private void writeIDProvider(PrintWriter writer) {\r
                if (provider != null) {\r
@@ -959,14 +723,14 @@ public class ImporterGenerator extends SchemaConversionBase{
        private void writeIDReferences(PrintWriter writer,String name, List<IDReference> references) {\r
                if (references.size() > 0) {\r
                writer.println("   @Override");\r
-               writer.println("   public boolean connectReferences(WriteGraph graph, Element element, java.util.Map<java.lang.String, Element> map) throws DatabaseException {");\r
+               writer.println("   public boolean connectReferences(WriteGraph graph, ParserElement element, java.util.Map<java.lang.String, ParserElement> map) throws DatabaseException {");\r
                writer.println("      "+getOntologyImport());\r
                writer.println("      boolean result = true;");\r
                for (IDReference ref : references) {\r
                writer.println("      {");\r
                writer.println("         Attribute a = element.getAttribute(\"" + ref.getIDSource().getName() +"\");");\r
                writer.println("         if (a != null) {");\r
-               writer.println("            Element refEle = map.get(a.value);");\r
+               writer.println("            ParserElement refEle = map.get(a.value);");\r
                writer.println("            if (refEle != null) {");\r
                writer.println("               Resource ref = refEle.getData();");\r
                writer.println("               graph.claim(element.getData(), "+ontShort+name+"_"+ref.getReference().getName()+", ref);");\r
@@ -987,13 +751,18 @@ public class ImporterGenerator extends SchemaConversionBase{
                        return;\r
                \r
                writer.println("   @Override");\r
-               writer.println("   public void configureChild(WriteGraph graph, Deque<Element> parents, Element element, Element child) throws DatabaseException {");\r
+               writer.println("   public void configureChild(WriteGraph graph, Deque<ParserElement> parents, ParserElement element, ParserElement child) throws DatabaseException {");\r
                writer.println("    " + unknownChildElement.getJavaMethod());\r
                writer.println("   }");\r
                writer.println();\r
                \r
        }\r
        \r
+       @Override\r
+       protected String getBaseClass() {\r
+               return "org.simantics.xml.sax.base.XMLElementNamedChildParserBase";\r
+       }\r
+       \r
        protected void createClassHeader(PrintWriter writer, boolean isList) {\r
                writer.println("package " + converter.getPluginName() +"."+elementPackageName+";");\r
                writer.println();\r
@@ -1003,7 +772,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                writer.println("import org.simantics.db.WriteGraph;");\r
                writer.println("import org.simantics.db.exception.DatabaseException;");\r
                writer.println("import org.simantics.xml.sax.base.Attribute;");\r
-               writer.println("import org.simantics.xml.sax.base.Element;");\r
+               writer.println("import org.simantics.xml.sax.base.ParserElement;");\r
                writer.println("import org.simantics.xml.sax.ontology.XMLResource;");\r
                if (!isList) {\r
                writer.println("import org.simantics.layer0.Layer0;");\r
@@ -1014,93 +783,4 @@ public class ImporterGenerator extends SchemaConversionBase{
                writer.println();\r
        }\r
        \r
-       private String getOntologyImport() {\r
-               return this.ontologyClassName+" " +ontShort.substring(0, 3)+" = "+this.ontologyClassName+".getInstance(graph);";\r
-       }\r
-       \r
-       \r
-       private static class FileWriter {\r
-               public PrintWriter writer;\r
-               \r
-               public PrintWriter delayedWriter;\r
-               public PrintWriter delayedWriter2;\r
-       }\r
-       \r
-       public static String getName(SchemaObject obj) {\r
-               if (obj.getParent() == null) {\r
-                       switch (obj.getType()) {\r
-                       case COMPLEX_TYPE:\r
-                               return getComplexTypePrefix()+obj.getName();\r
-                       case ELEMENT:\r
-                               return obj.getName();\r
-                       case ATTRIBUTE_GROUP:\r
-                               return getAttributeGroupPrefix()+obj.getName();\r
-                       case SIMPLE_TYPE:\r
-                               return obj.getName();\r
-                       }\r
-               } else {\r
-                       SchemaObject o = obj;\r
-                       SchemaObject prev = null;\r
-                       String name = "";\r
-                       while (o != null){\r
-                               if (o.getName() != null)\r
-                                       name = o.getName()+"_"+name;\r
-                               prev = o;\r
-                               o = o.getParent();\r
-                               if (prev.getObj() instanceof AttributeGroupRef)\r
-                                       o = null;\r
-                       }\r
-                       name = name.substring(0, name.length()-1);\r
-                       switch (prev.getType()) {\r
-                       case COMPLEX_TYPE:\r
-                               return getComplexTypePrefix()+name;\r
-                       case ELEMENT:\r
-                               return name;\r
-                       case ATTRIBUTE_GROUP:\r
-                               return getAttributeGroupPrefix()+name;\r
-                       case SIMPLE_TYPE:\r
-                               return name;\r
-                       }\r
-               }\r
-               throw new RuntimeException();\r
-               \r
-       }\r
-       \r
-       public static String getName(SchemaObject obj, String rel) {\r
-               if (obj.getParent() == null) {\r
-                       switch (obj.getType()) {\r
-                       case COMPLEX_TYPE:\r
-                               return getComplexTypePrefix()+rel+obj.getName();\r
-                       case ELEMENT:\r
-                               return rel+obj.getName();\r
-                       case ATTRIBUTE_GROUP:\r
-                               return getAttributeGroupPrefix()+rel+obj.getName();\r
-                       case SIMPLE_TYPE:\r
-                               return rel+obj.getName();\r
-                       }\r
-               } else {\r
-                       SchemaObject o = obj;\r
-                       SchemaObject prev = null;\r
-                       String name = "";\r
-                       while (o != null){\r
-                               if (o.getName() != null)\r
-                                       name = o.getName()+"_"+name;\r
-                               prev = o;\r
-                               o = o.getParent();\r
-                       }\r
-                       name = name.substring(0, name.length()-1);\r
-                       switch (prev.getType()) {\r
-                       case COMPLEX_TYPE:\r
-                               return getComplexTypePrefix()+rel+name;\r
-                       case ELEMENT:\r
-                               return rel+name;\r
-                       case ATTRIBUTE_GROUP:\r
-                               return getAttributeGroupPrefix()+rel+name;\r
-                       case SIMPLE_TYPE:\r
-                               return rel+name;\r
-                       }\r
-               }\r
-               throw new RuntimeException();\r
-               \r
-       }\r
 }\r