]> gerrit.simantics Code Review - simantics/interop.git/blobdiff - org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
Refactoring and preparing the conversion code to handle references between XML schemas.
[simantics/interop.git] / org.simantics.xml.sax / src / org / simantics / xml / sax / ImporterGenerator.java
index eb99b5324ab2eb7e5f786bd011564b359c5b8d7f..2e5fb272438b917481ab6fd67fe24d3aa76ea939 100644 (file)
@@ -5,94 +5,85 @@ import java.io.IOException;
 import java.io.PrintWriter;\r
 import java.io.StringWriter;\r
 import java.util.ArrayList;\r
-import java.util.HashMap;\r
 import java.util.List;\r
-import java.util.Map;\r
 \r
 import javax.xml.namespace.QName;\r
 \r
 import org.simantics.utils.datastructures.BijectionMap;\r
-import org.simantics.utils.datastructures.Pair;\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
 import org.w3._2001.xmlschema.Annotated;\r
 import org.w3._2001.xmlschema.Attribute;\r
 import org.w3._2001.xmlschema.AttributeGroup;\r
-import org.w3._2001.xmlschema.AttributeGroupRef;\r
 import org.w3._2001.xmlschema.ComplexType;\r
 import org.w3._2001.xmlschema.Element;\r
 import org.w3._2001.xmlschema.LocalComplexType;\r
 import org.w3._2001.xmlschema.LocalSimpleType;\r
 import org.w3._2001.xmlschema.NamedAttributeGroup;\r
-import org.w3._2001.xmlschema.OpenAttrs;\r
+import org.w3._2001.xmlschema.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 ImporterGenerator extends SchemaConversionBase{\r
+public class ImporterGenerator extends JavaGenerator{\r
        \r
-       public ImporterGenerator(Configuration configuration) {\r
-               super(configuration);\r
+       public ImporterGenerator(SchemaConverter converter, SchemaConversionBase base) {\r
+               super(converter, base);\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
-               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 = "_elem";\r
                String importerClassPostfix = "Importer";\r
+               String parserClassPostfix = "Parser";\r
                elementPackageName = name+parserPackagePostfix;\r
                \r
                importParserDir= new File(converter.getParserDir().getAbsolutePath()+"/"+elementPackageName);\r
                if (!importParserDir.exists())\r
                        importParserDir.mkdirs();\r
                \r
-               handle(schema);\r
-               \r
-               File importParserFile = new File(converter.getParserDir().getAbsolutePath()+"/"+name+importerClassPostfix+".java");\r
-               PrintWriter mainWriter = createFile(importParserFile);\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
                mainWriter.println("package " + converter.getPluginName() +";");\r
                mainWriter.println();\r
                mainWriter.println("import java.io.File;");\r
                mainWriter.println("import org.simantics.db.Session;");\r
                mainWriter.println("import org.simantics.xml.sax.base.AbstractImporter;");\r
-               mainWriter.println("import org.simantics.xml.sax.base.XMLParser;");\r
                mainWriter.println();\r
                mainWriter.println("public class " + name + importerClassPostfix+" extends AbstractImporter {");\r
                mainWriter.println();\r
                mainWriter.println("   public " + name + importerClassPostfix+"(Session session, File file)  {");\r
-               mainWriter.println("      super(session,file);");\r
+               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
+               mainWriter.println("}");\r
+               \r
+               mainWriter.println();\r
+               mainWriter.flush();\r
+               mainWriter.close();\r
+               \r
+               // Create Parser class\r
+               File parserFile = new File(converter.getParserDir().getAbsolutePath()+"/"+name+parserClassPostfix+".java");\r
+               mainWriter = createFile(parserFile);\r
+               mainWriter.println("package " + converter.getPluginName() +";");\r
+               mainWriter.println();\r
+               mainWriter.println("import org.simantics.xml.sax.base.XMLParser;");\r
+               mainWriter.println();\r
+               mainWriter.println("public class " + name + parserClassPostfix+" extends XMLParser {");\r
+               mainWriter.println();\r
+               mainWriter.println("   public " + name + parserClassPostfix+"()  {");\r
+               if (schema.getTargetNamespace() != null)\r
+               mainWriter.println("      setSchemaURI(\""+schema.getTargetNamespace()+"\");");\r
                for (String s : ruleClassNames) {\r
-               mainWriter.println("      parser.add(new "+s+"());");\r
+               mainWriter.println("      add(new "+s+"());");\r
                }\r
                mainWriter.println("   }");\r
                mainWriter.println("}");\r
@@ -102,69 +93,25 @@ public class ImporterGenerator extends SchemaConversionBase{
                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
-       \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
-       \r
-       protected void handle(TopLevelAttribute topLevelAttribute) {\r
-\r
+       @Override\r
+       public void handleSimpleType(SchemaObject parent, SchemaObject simpleTypeObj) {\r
        }\r
        \r
-\r
-       \r
-       public static String getComplexTypePrefix() {\r
-               return "ComplexTypes_";\r
-       }       \r
-       \r
-       public static String getAttributeGroupPrefix() {\r
-               return "AttributeGroups_";\r
+       @Override\r
+       public void handle(SchemaObject parent, NamedGroup attribute) {\r
+               // TODO Auto-generated method stub\r
        }\r
        \r
-       private Map<SchemaObject, FileWriter> writers = new HashMap<SchemaObject, ImporterGenerator.FileWriter>();\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);//topLevelComplexType.getName();\r
+               String name = getName(complexTypeObj);\r
+               \r
+               //if (topLevelComplexType.getName().equals("LocalizedText"))\r
+               //if (topLevelComplexType.getName().equals("Reference"))\r
+//             if (topLevelComplexType.getName().equals("NodeIdAlias"))\r
+//                     System.out.println();\r
                \r
                String className = name;//"_"+name;\r
                \r
@@ -176,21 +123,11 @@ public class ImporterGenerator extends SchemaConversionBase{
                }\r
                writers.put(complexTypeObj, fw);\r
                \r
-               boolean isList = false;\r
-\r
-               String baseClass = "org.simantics.xml.sax.base.XMLElementNamedChildParserBase";\r
-               \r
-               boolean inherited = false;\r
-               \r
-               QName type = getComplexTypeBase(topLevelComplexType);\r
-               if (type != null && !type.getNamespaceURI().equals("http://www.w3.org/2001/XMLSchema")) {\r
-                       baseClass = getName(complexTypeName.get(type.getLocalPart()));\r
-                       inherited = true;\r
-               }\r
+               Inheritance inheritance = this.base.getInheritance(complexTypeObj);\r
                \r
-               provider = getIDProvider(topLevelComplexType);\r
-               List<IDReference> references = getIDReferences(topLevelComplexType);\r
-               UnrecognizedChildElement unknownChildElement = getUnknown(topLevelComplexType);\r
+               provider = this.base.getIDProvider(topLevelComplexType);\r
+               List<IDReference> references = this.base.getIDReferences(topLevelComplexType);\r
+               UnrecognizedChildElement unknownChildElement = this.base.getUnknown(topLevelComplexType);\r
 \r
                List<String> intrerfaces = new ArrayList<String>();\r
                if (references.size() > 0)\r
@@ -198,27 +135,23 @@ public class ImporterGenerator extends SchemaConversionBase{
                if (unknownChildElement != null)\r
                        intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");\r
                \r
-               createClassHeader(fw.writer, isList);\r
-               writeClass(fw.writer,true, null, className, baseClass, intrerfaces);\r
+               createClassHeader(fw.writer, false);\r
+               writeClass(fw.writer,false, null, className, inheritance.baseClass, intrerfaces);\r
                        \r
                writeIDProvider(fw.writer);\r
        \r
                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
                fw.writer.println("      Resource res = graph.newResource();");\r
                fw.writer.println("      graph.claim(res, L0.InstanceOf, "+ontShort+name+");");\r
-               } else {\r
-               fw.writer.println("      Resource res = ListUtils.create(graph, "+ontShort+name+", Collections.EMPTY_LIST);");\r
-               }\r
                fw.writer.println("      return res;");\r
                fw.writer.println("   }");\r
                fw.writer.println();\r
                \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
@@ -233,20 +166,22 @@ public class ImporterGenerator extends SchemaConversionBase{
                fw.writer.println("   public " + className + "() {");\r
                fw.writer.println("      super();");\r
                \r
-               handleComplexTypeExtension(complexTypeObj);\r
+               this.base.handleComplexTypeExtension(complexTypeObj);\r
                \r
                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
                        fw.writer.write(stringWriter.toString());\r
                }\r
-               \r
-               \r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
+               fw.writer.println("      return super.connectChild(graph,element,child);");\r
+               }else{\r
                fw.writer.println("      return false;");\r
+               }\r
                fw.writer.println("   }");\r
                fw.writer.println();\r
                \r
@@ -262,17 +197,25 @@ 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
-               if (inherited) {\r
+               fw.writer.println("   public void configure(WriteGraph graph, Deque<ParserElement> parents, ParserElement element) throws DatabaseException {");\r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
                fw.writer.println("             super.configure(graph,parents,element);");\r
                }\r
                fw.writer.println("        "+getOntologyImport());\r
                \r
-               handleComplexTypeAttributes(complexTypeObj);\r
-               handleExtensionAttributes(complexTypeObj);\r
+               this.base.handleComplexTypeAttributes(complexTypeObj);\r
+               this.base.handleExtensionAttributes(complexTypeObj);\r
                \r
                fw.writer.println("   }");\r
                \r
+               if (inheritance.type == InheritanceType.AtomicType) {\r
+               fw.writer.println();\r
+               fw.writer.println("   @Override");\r
+               fw.writer.println("   public void configure(WriteGraph graph, ParserElement element, java.lang.String string) throws DatabaseException {");\r
+               fw.writer.println("      graph.claimValue(element.getData(), "+getValueGetter(inheritance.atomicType,"string")+", "+inheritance.atomicType.binding+");");\r
+               fw.writer.println("   }");\r
+               }\r
+               \r
                writeIDReferences(fw.writer,name, references);\r
                writeUnknownChild(fw.writer,name,unknownChildElement);\r
                \r
@@ -286,151 +229,98 @@ public class ImporterGenerator extends SchemaConversionBase{
        }\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
+       public void createReferenceIndicator(SchemaObject parent, RefType referenceType, String refName, String objectName, String primaryClassName, String secondaryClassName, boolean useElementList, boolean useOriginalList) {\r
+               FileWriter fw = getWriter(parent);\r
+               if (referenceType == RefType.Type) {\r
+               // create internal class for handling the element and child attachment\r
+               secondaryClassName = getName(parent) +"_" +objectName;\r
+               fw.writer.println("        addParser(\""+ objectName +"\", "+secondaryClassName+".class);");\r
+               fw.delayedWriter2.println("   public static class " + secondaryClassName +" extends " + primaryClassName +"{");\r
+               fw.delayedWriter2.println("      public "+ secondaryClassName +"(){");\r
+               fw.delayedWriter2.println("      }");\r
+               fw.delayedWriter2.println("   }");\r
+               } else { // referenceType == RefType.Reference\r
+               fw.writer.println("        addParser("+primaryClassName+".class);");\r
+               if (!primaryClassName.equals(secondaryClassName))\r
+               fw.writer.println("        addParser("+secondaryClassName+".class);");\r
+               }\r
+               \r
+               fw.delayedWriter.println("         if (child.getElementParser() instanceof "+secondaryClassName+"){");\r
+               fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+refName + ", child.getData());");\r
+               if (useElementList) {\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
+               // element type specific list\r
+               fw.delayedWriter.println("            {");\r
+               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
+               fw.delayedWriter.println("               if (list == null) {");\r
+               fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
+               fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List,list);");\r
+               fw.delayedWriter.println("               } else {");\r
+               fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
+               fw.delayedWriter.println("               }");\r
+               fw.delayedWriter.println("            }");\r
+               }\r
+               if (useOriginalList) {\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
        @Override\r
-       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element,  boolean reference, String ref, QName refType) {\r
+       protected void createPrimitiveIndicator(SchemaObject parent, String refName, String binding) {\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
-//                     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 = 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 (!reference)\r
-                       fw.writer.println("        addParser(\""+ ref +"\", "+className+".class);");\r
-                       else\r
-                       fw.writer.println("        addParser("+className+".class);");\r
-                       if (!className.equals(refClassName))\r
-                       fw.writer.println("        addParser("+refClassName+".class);");\r
-                       \r
-                       fw.delayedWriter.println("         if (child.getParser() instanceof "+refClassName+"){");\r
-                       fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");\r
-                       if (useElementList(parent, indicator,element, reference, ref, refType)) {\r
-       \r
-                       // 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, 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("               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("               } 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
-                       //writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");\r
-                       fw.writer.println("        addParser(\""+ ref +"\", "+getName(parent) +"_" +ref+".class);");\r
-                       \r
-                       fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +ref+" extends org.simantics.xml.sax.base.ValueElementParser {");\r
-                       fw.delayedWriter2.println("      "+ getName(parent) +"_" +ref +"(){");\r
-                       fw.delayedWriter2.println("           super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", Bindings."+binding+");");\r
-                       fw.delayedWriter2.println("       }");\r
-                       fw.delayedWriter2.println("   }");\r
-               }\r
+               fw.writer.println("        addParser(\""+ refName +"\", "+getName(parent) +"_" +refName+".class);");\r
+               \r
+               fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +refName+" extends org.simantics.xml.sax.base.ValueElementParser {");\r
+               fw.delayedWriter2.println("      public "+ getName(parent) +"_" +refName +"(){");\r
+               fw.delayedWriter2.println("           super(\""+refName+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+refName+", "+binding+");");\r
+               fw.delayedWriter2.println("       }");\r
+               fw.delayedWriter2.println("   }");\r
        }\r
        \r
        @Override\r
-       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element,  boolean reference, String ref, OpenAttrs attrs) {\r
+       protected void createElementIndicator(SchemaObject parent, boolean useElementList, String refName, String className, boolean useOriginalList) {\r
                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
-               if (!reference)\r
-               fw.writer.println("        addParser(\""+ ref +"\", "+className+".class);");\r
-               else\r
-               fw.writer.println("        addParser("+className+".class);");\r
-               \r
-               fw.delayedWriter.println("         if (child.getParser() 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
+               //if (!reference)\r
+               fw.writer.println("        addParser(\""+ refName +"\", "+className+".class);");\r
+//             else\r
+//             fw.writer.println("        addParser("+className+".class);");\r
+               \r
+               fw.delayedWriter.println("         if (child.getElementParser() instanceof "+className+"){");\r
+               fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+refName + ", child.getData());");\r
+               if (useElementList) {\r
 \r
                // element type specific list\r
                fw.delayedWriter.println("            {");\r
-               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List);");\r
+               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
                fw.delayedWriter.println("               if (list == null) {");\r
                fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
-               fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List,list);");\r
+               fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List,list);");\r
                fw.delayedWriter.println("               } else {");\r
                fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
                fw.delayedWriter.println("               }");\r
                fw.delayedWriter.println("            }");\r
                }\r
-               if (useOriginalList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {\r
+               if (useOriginalList) {\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
                fw.delayedWriter.println("               }");\r
@@ -439,14 +329,14 @@ public class ImporterGenerator extends SchemaConversionBase{
                \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 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
@@ -454,21 +344,11 @@ 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
+       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
@@ -486,7 +366,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                        attrName = ref.getLocalPart();\r
                        relationName = ontShort+getName(parent)+"_has"+ref.getLocalPart();\r
                        \r
-                       Attribute referred = getRefAttribute(ref);\r
+                       Attribute referred = this.base.getRefAttribute(ref);\r
                        if (referred != null) {\r
                                primitiveType = referred.getType();\r
                                simpleType = referred.getSimpleType();\r
@@ -502,39 +382,50 @@ public class ImporterGenerator extends SchemaConversionBase{
                FileWriter fw = getWriter(parent);\r
                if (primitiveType != null) {\r
                        \r
-                       String binding = getBindingFromPrimitiveType(primitiveType);\r
+                       //String binding = getBindingFromPrimitiveType(primitiveType);\r
+                       TypeEntry binding = this.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 = this.base.simpleTypeName.get(primitiveType.getLocalPart());\r
                                if (simpleTypeObj != null)\r
                                        simpleType = simpleTypeObj.getSimpleType();\r
                        }       \r
                    }\r
                } \r
                if (simpleType != null) {\r
-                       Restriction restriction = simpleType.getRestriction();\r
-                       if (restriction == null)\r
-                               throw new RuntimeException("Cannot resolve type for Attribute " + attrName + " -> " + primitiveType.getLocalPart()+ ", SimpleType restriction is unset");\r
-                       QName base = restriction.getBase();\r
-                       \r
-                       \r
-                       String binding = getBindingFromPrimitiveType(base);\r
-                       writeAttribute(fw, attrName, relationName, binding, isReference);\r
+                       org.w3._2001.xmlschema.List list = simpleType.getList();\r
+                       if (list != null) {\r
+                               TypeEntry binding = this.base.getTypeEntry(new QName(SchemaConversionBase.SCHEMA_NS, "string"));\r
+                               writeAttribute(fw, attrName, relationName, binding, isReference);\r
+                       } else {\r
+                               Restriction restriction = simpleType.getRestriction();\r
+                               if (restriction == null)\r
+                                       throw new RuntimeException("Cannot resolve type for Attribute " + attrName + " -> " + primitiveType.getLocalPart()+ ", SimpleType restriction is unset");\r
+                               QName base = restriction.getBase();\r
+                               \r
+                               \r
+                               //String binding = getBindingFromPrimitiveType(base);\r
+                               TypeEntry binding = this.base.getTypeEntry(base);\r
+                               writeAttribute(fw, attrName, relationName, binding, isReference);\r
+                       }\r
                } else {\r
+                       // TODO : using default String attribute should be configured with rules.\r
                        //throw new RuntimeException("Cannot resolve type for Attribute " + attrName + " -> " + primitiveType.getLocalPart());\r
-                       //writeAttribute(fw, attrName, relationName, binding, isReference);\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, this.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("         Attribute a = element.getAttribute(\"" +attrName+"\");");\r
                fw.writer.println("         if (a != null) {");\r
-               fw.writer.println("            graph.claimLiteral(element.getData(),"+relationName+","+getValueGetter(binding,"a")+", Bindings."+binding+");");\r
+               fw.writer.println("            graph.claimLiteral(element.getData(),"+relationName+","+getValueGetterMethod(binding,"a")+", "+binding.binding+");");\r
                if (isReference)\r
                fw.writer.println("            idProviderValue = a.getValue();");       \r
                fw.writer.println("         }");\r
@@ -542,7 +433,7 @@ public class ImporterGenerator extends SchemaConversionBase{
        }\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
@@ -553,19 +444,21 @@ public class ImporterGenerator extends SchemaConversionBase{
                QName base = restriction.getBase();\r
                \r
                \r
-               String binding = getBindingFromPrimitiveType(base);\r
+               //String binding = getBindingFromPrimitiveType(base);\r
+               TypeEntry binding = this.base.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("      graph.claimValue(element.getData(),"+getValueGetter(binding)+", Bindings."+binding+");");\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
                \r
        }\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().getLocalPart());\r
                        fw.writer.println(commentTag+"    AttributeGroup " + group.getName());\r
                        SchemaObject obj = new SchemaObject(parent,attribute);\r
                        for (Annotated annotated : group.getAttributeOrAttributeGroup()) {\r
@@ -583,11 +476,11 @@ public class ImporterGenerator extends SchemaConversionBase{
        }\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
-               String arrayBinding = getBindingFromPrimitiveType(type);\r
-               String javaType = getJavaTypeFromPrimitiveType(type);\r
+               QName type = new QName(SchemaConversionBase.CONVERSION_NS, composition.getType());\r
+               String arrayBinding = this.base.getBindingFromPrimitiveType(type);\r
+               String javaType = this.base.getJavaTypeFromPrimitiveType(type);\r
                String name = composition.getName();\r
                \r
                String relationName;\r
@@ -609,46 +502,35 @@ public class ImporterGenerator extends SchemaConversionBase{
                for (org.simantics.xml.sax.configuration.Attribute a : composition.getAttribute()) {\r
                        Attribute attribute = ((Attribute)attributes.getRight(a));\r
                        //QName atype = getBaseType(attribute);\r
-                       QName atype = getPrimitiveType(attribute);\r
+                       QName atype = this.base.getPrimitiveType(attribute);\r
                        String defaultValue = attribute.getDefault();\r
                        if (defaultValue == null)\r
-                           defaultValue = getDefaultValue(atype);\r
+                           defaultValue = this.base.getDefaultValue(atype);\r
                                \r
-                       String binding = getBindingFromPrimitiveType(atype);\r
+                       //String binding = getBindingFromPrimitiveType(atype);\r
+                       TypeEntry binding = this.base.getTypeEntry(atype);\r
                        if (i > 0)\r
                                fw.writer.print(",");\r
                        if (defaultValue != null)\r
-                               fw.writer.print("a"+(i)+"!= null ? "+ getValueGetter(binding,"a"+(i++)) + " : " +defaultValue);\r
+                               fw.writer.print("a"+(i)+"!= null ? "+ getValueGetterMethod(binding,"a"+(i++)) + " : " +defaultValue);\r
                        else\r
-                               fw.writer.print(getValueGetter(binding,"a"+(i++)));\r
+                               fw.writer.print(getValueGetterMethod(binding,"a"+(i++)));\r
                }\r
                fw.writer.println("};");\r
-               fw.writer.println("         graph.claimLiteral(element.getData(),"+relationName+", value, Bindings."+arrayBinding+");");\r
+               fw.writer.println("         graph.claimLiteral(element.getData(),"+relationName+", value, "+arrayBinding+");");\r
                fw.writer.println("      }");\r
                \r
        }\r
        \r
-       protected String getDefaultValue(QName atype) {\r
-               Map<String,TypeEntry> types = typeMap.get(atype.getNamespaceURI());\r
-               if (types == null)\r
-                       return null;\r
-               TypeEntry entry =  types.get(atype.getLocalPart());\r
-               if (entry == null)\r
-                       return null;\r
-               return entry.defaultValue;\r
-       }\r
        \r
        \r
-       @Override\r
-       protected void handleSimpleType(SchemaObject parent, SchemaObject simpleType) {\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
@@ -663,14 +545,11 @@ public class ImporterGenerator extends SchemaConversionBase{
                writers.put(elementObj, fw);\r
                boolean isList = false;\r
                \r
-               Pair<String, Boolean> inhertiance = getElementInheritance(elementObj);\r
-               boolean inherited = inhertiance.second;\r
-               String baseClass = inhertiance.first;//"org.simantics.xml.sax.base.XMLElementParserBase";\r
+               Inheritance inheritance = this.base.getInheritance(elementObj); \r
                \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
@@ -679,10 +558,10 @@ public class ImporterGenerator extends SchemaConversionBase{
                        intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");\r
 \r
                createClassHeader(fw.writer, isList);\r
-               writeClass(fw.writer,false, element.getName(), className, baseClass, intrerfaces);\r
+               writeClass(fw.writer,false, element.getName(), className, inheritance.baseClass, intrerfaces);\r
                writeIDProvider(fw.writer);\r
                fw.writer.println("   @Override");\r
-               fw.writer.println("   public Resource create(WriteGraph graph, 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
@@ -696,7 +575,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
@@ -704,8 +583,8 @@ 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
-               if (inherited) {\r
+               fw.writer.println("   public void configure(WriteGraph graph, Deque<ParserElement> parents, ParserElement element) throws DatabaseException {");\r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
                fw.writer.println("             super.configure(graph,parents,element);");\r
                }\r
                fw.writer.println("        "+getOntologyImport());\r
@@ -714,15 +593,22 @@ public class ImporterGenerator extends SchemaConversionBase{
                LocalSimpleType simpleType = element.getSimpleType();\r
                \r
                if (complexType != null) {\r
-                       SchemaObject obj = complexTypes.get(complexType);\r
-                       handleElementComplexTypeAttributes(obj);\r
+                       SchemaObject obj = this.base.complexTypes.get(complexType);\r
+                       this.base.handleElementComplexTypeAttributes(obj);\r
                } \r
                fw.writer.println("   }");\r
                \r
-               if (simpleType != null) {\r
-                       SchemaObject obj = simpleTypes.get(simpleType);\r
-                       handleElementSimpleTypeAttributes(obj);\r
+               if (inheritance.type == InheritanceType.AtomicType) {\r
+               fw.writer.println();\r
+               fw.writer.println("   @Override");\r
+               fw.writer.println("   public void configure(WriteGraph graph, ParserElement element, java.lang.String string) throws DatabaseException {");\r
+               fw.writer.println("      graph.claimValue(element.getData(), "+getValueGetter(inheritance.atomicType,"string")+", "+inheritance.atomicType.binding+");");\r
+               fw.writer.println("   }");\r
                }\r
+//             if (simpleType != null) {\r
+//                     SchemaObject obj = simpleTypes.get(simpleType);\r
+//                     handleElementSimpleTypeAttributes(obj);\r
+//             }\r
                \r
                \r
                StringWriter stringWriter = new StringWriter();\r
@@ -734,8 +620,8 @@ public class ImporterGenerator extends SchemaConversionBase{
                fw.writer.println("      super();");\r
                \r
                if (complexType != null) {\r
-                       SchemaObject obj = complexTypes.get(complexType);\r
-                       handleComplexTypeExtension(obj);\r
+                       SchemaObject obj = this.base.complexTypes.get(complexType);\r
+                       this.base.handleComplexTypeExtension(obj);\r
                } else if (simpleType != null) {\r
                        \r
                }\r
@@ -743,13 +629,13 @@ 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
                        fw.writer.write(stringWriter.toString());\r
                }\r
-               if (inherited) {\r
+               if (inheritance.type == InheritanceType.ComplexType) {\r
                fw.writer.println("      return super.connectChild(graph,element,child);");     \r
                } else {\r
                fw.writer.println("      return false;");\r
@@ -781,65 +667,7 @@ public class ImporterGenerator extends SchemaConversionBase{
                \r
                ruleClassNames.add(converter.getPluginName()+"."+elementPackageName+"."+name);\r
        }\r
-       \r
-       private Pair<String,Boolean> getElementInheritance(SchemaObject topLevelElementObj) {\r
-               Element topLevelElement = topLevelElementObj.getElement();\r
-               String baseClass = "org.simantics.xml.sax.base.XMLElementNamedChildParserBase";\r
-               boolean inherited = false;\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
-                               baseClass = getName(obj);\r
-                               inherited = true;\r
-                       }       \r
-               }\r
-               if (!inherited) {\r
-                       QName type = getElementBase(topLevelElement);\r
-                       if (type != null) {\r
-                               if (!type.getNamespaceURI().equals(SCHEMA_NS)) {\r
-                                       SchemaObject obj = getWithName(topLevelElementObj, type.getLocalPart());\r
-                                       baseClass = getName(obj);\r
-                                       inherited = true;\r
-                               }       \r
-                       }\r
-               }\r
-               if (!inherited) {\r
-                       QName type = topLevelElement.getSubstitutionGroup();\r
-                       if (type != null) {\r
-                               if (!type.getNamespaceURI().equals(SCHEMA_NS)) {\r
-                                       SchemaObject obj = getWithName(topLevelElementObj, type.getLocalPart());\r
-                                       baseClass = getName(obj);\r
-                                       inherited = true;\r
-                               }       \r
-                       }\r
-               }\r
-               \r
-               return new Pair<String, Boolean>(baseClass, inherited);\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
@@ -864,14 +692,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
@@ -892,13 +720,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
+       public String getBaseClass(ObjectType type) {\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
@@ -908,7 +741,8 @@ 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
            } else {\r
@@ -918,93 +752,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