]> gerrit.simantics Code Review - simantics/interop.git/blobdiff - org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
XML Elements are exported in the original order (if order is stored during import)
[simantics/interop.git] / org.simantics.xml.sax / src / org / simantics / xml / sax / ImporterGenerator.java
index cff6e923c9aa668dc6ae73e467366d9bd0238860..25fc020084cf89c66a2a6f05d55f7e04fbef5363 100644 (file)
@@ -12,6 +12,7 @@ import java.util.Map;
 import javax.xml.namespace.QName;\r
 \r
 import org.simantics.utils.datastructures.BijectionMap;\r
+import org.simantics.xml.sax.SchemaConversionBase.RefType;\r
 import org.simantics.xml.sax.configuration.AttributeComposition;\r
 import org.simantics.xml.sax.configuration.Configuration;\r
 import org.simantics.xml.sax.configuration.IDProvider;\r
@@ -236,49 +237,117 @@ public class ImporterGenerator extends JavaGenerator{
        }\r
        \r
        @Override\r
-       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element,  boolean reference, String ref, QName refType) {\r
+       //protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element,  boolean reference, String ref, QName refType) {\r
+       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType referenceType) {\r
                FileWriter fw = getWriter(parent);\r
-               String binding = getBindingFromPrimitiveType(refType);\r
-               if (binding == null) {\r
-                       SchemaObject refElement = elementName.get(refType.getLocalPart());\r
-                       SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart());\r
-\r
-                       String className = null;\r
-                       String refClassName = null;\r
-                       if (refElement != null)\r
-                               className = getName(refElement);\r
-                       else\r
-                               className = getName(refComplexType);\r
+               if (referenceType != RefType.Element) {\r
+                       QName refType;\r
+                       if (referenceType == RefType.Type) {\r
+                               refType = element.getElement().getType();\r
+                               if (refName == null)\r
+                                       refName = element.getElement().getName();\r
+                       } else {\r
+                               refType = element.getElement().getRef();\r
+                               if (refName == null)\r
+                                       refName = refType.getLocalPart();\r
+                       }\r
                        \r
-                       if (refComplexType != null) {\r
-                               refClassName = getName(refComplexType);\r
+                       String binding = getBindingFromPrimitiveType(refType);\r
+                       if (binding == null) {\r
+                               SchemaObject refElement = elementName.get(refType.getLocalPart());\r
+                               SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart());\r
+       \r
+                               String className = null;\r
+                               String refClassName = null;\r
+                               if (refElement != null)\r
+                                       className = getName(refElement);\r
+                               else\r
+                                       className = getName(refComplexType);\r
+                               \r
+                               if (refComplexType != null) {\r
+                                       refClassName = getName(refComplexType);\r
+                               } else {\r
+                                       refClassName = getName(refElement);\r
+                               }\r
+                               \r
+                               if (referenceType != RefType.Reference)\r
+                               fw.writer.println("        addParser(\""+ refName +"\", "+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.getElementParser() instanceof "+refClassName+"){");\r
+                               fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+refName + ", child.getData());");\r
+                               if (useElementList(parent, indicator,element, referenceType == RefType.Reference, refName, refType)) {\r
+               \r
+                               // element type specific list\r
+                               fw.delayedWriter.println("            {");\r
+                               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
+                               fw.delayedWriter.println("               if (list == null) {");\r
+                               fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
+                               fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List,list);");\r
+                               fw.delayedWriter.println("               } else {");\r
+                               fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
+                               fw.delayedWriter.println("               }");\r
+                               fw.delayedWriter.println("            }");\r
+                               }\r
+                               if (useOriginalList(parent, indicator,element, referenceType == RefType.Reference, refName, refType)) {\r
+                               // generic list\r
+                               fw.delayedWriter.println("            {");\r
+                               fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");\r
+                               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(), XML.hasOriginalElementList);");\r
+                               fw.delayedWriter.println("               if (list == null) {");\r
+                               fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
+                               fw.delayedWriter.println("                  graph.claim(element.getData(), XML.hasOriginalElementList,list);");\r
+                               fw.delayedWriter.println("               } else {");\r
+                               fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
+                               fw.delayedWriter.println("               }");\r
+                               fw.delayedWriter.println("            }");\r
+                               }\r
+                               \r
+                               fw.delayedWriter.println("            return true;");\r
+                               fw.delayedWriter.println("         }");\r
                        } else {\r
-                               refClassName = getName(refElement);\r
+                               //writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");\r
+                               fw.writer.println("        addParser(\""+ refName +"\", "+getName(parent) +"_" +refName+".class);");\r
+                               \r
+                               fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +refName+" extends org.simantics.xml.sax.base.ValueElementParser {");\r
+                               fw.delayedWriter2.println("      public "+ getName(parent) +"_" +refName +"(){");\r
+                               fw.delayedWriter2.println("           super(\""+refName+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+refName+", "+binding+");");\r
+                               fw.delayedWriter2.println("       }");\r
+                               fw.delayedWriter2.println("   }");\r
                        }\r
+               } else {\r
+                       Element attrs= element.getElement();\r
+                       SchemaObject obj = getWithObj(parent, attrs);\r
                        \r
-                       if (!reference)\r
-                       fw.writer.println("        addParser(\""+ ref +"\", "+className+".class);");\r
-                       else\r
-                       fw.writer.println("        addParser("+className+".class);");\r
-                       if (!className.equals(refClassName))\r
-                       fw.writer.println("        addParser("+refClassName+".class);");\r
+                       String className = getName(obj);\r
+                       if (refName == null)\r
+                               refName = attrs.getName();\r
                        \r
-                       fw.delayedWriter.println("         if (child.getElementParser() instanceof "+refClassName+"){");\r
-                       fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");\r
-                       if (useElementList(parent, indicator,element, reference, ref, refType)) {\r
-       \r
+                       \r
+                       //if (!reference)\r
+                       fw.writer.println("        addParser(\""+ refName +"\", "+className+".class);");\r
+//                     else\r
+//                     fw.writer.println("        addParser("+className+".class);");\r
+                       \r
+                       fw.delayedWriter.println("         if (child.getElementParser() instanceof "+className+"){");\r
+                       fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+refName + ", child.getData());");\r
+                       if (useElementList(parent, indicator,element, false, refName, new QName(obj.getName()))) {\r
+\r
                        // element type specific list\r
                        fw.delayedWriter.println("            {");\r
-                       fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List);");\r
+                       fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
                        fw.delayedWriter.println("               if (list == null) {");\r
                        fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
-                       fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List,list);");\r
+                       fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+refName + "List,list);");\r
                        fw.delayedWriter.println("               } else {");\r
                        fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
                        fw.delayedWriter.println("               }");\r
                        fw.delayedWriter.println("            }");\r
                        }\r
-                       if (useOriginalList(parent, indicator,element, reference, ref, refType)) {\r
+                       if (useOriginalList(parent, indicator,element, false, refName, new QName(obj.getName()))) {\r
                        // generic list\r
                        fw.delayedWriter.println("            {");\r
                        fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");\r
@@ -294,62 +363,7 @@ public class ImporterGenerator extends JavaGenerator{
                        \r
                        fw.delayedWriter.println("            return true;");\r
                        fw.delayedWriter.println("         }");\r
-               } else {\r
-                       //writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");\r
-                       fw.writer.println("        addParser(\""+ ref +"\", "+getName(parent) +"_" +ref+".class);");\r
-                       \r
-                       fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +ref+" extends org.simantics.xml.sax.base.ValueElementParser {");\r
-                       fw.delayedWriter2.println("      public "+ getName(parent) +"_" +ref +"(){");\r
-                       fw.delayedWriter2.println("           super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", "+binding+");");\r
-                       fw.delayedWriter2.println("       }");\r
-                       fw.delayedWriter2.println("   }");\r
-               }\r
-       }\r
-       \r
-       @Override\r
-       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element,  boolean reference, String ref, OpenAttrs attrs) {\r
-               FileWriter fw = getWriter(parent);\r
-               SchemaObject obj = getWithObj(parent, attrs);\r
-       \r
-               String className = getName(obj);\r
-\r
-               if (!reference)\r
-               fw.writer.println("        addParser(\""+ ref +"\", "+className+".class);");\r
-               else\r
-               fw.writer.println("        addParser("+className+".class);");\r
-               \r
-               fw.delayedWriter.println("         if (child.getElementParser() instanceof "+className+"){");\r
-               fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");\r
-               if (useElementList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {\r
-\r
-               // element type specific list\r
-               fw.delayedWriter.println("            {");\r
-               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List);");\r
-               fw.delayedWriter.println("               if (list == null) {");\r
-               fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
-               fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List,list);");\r
-               fw.delayedWriter.println("               } else {");\r
-               fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
-               fw.delayedWriter.println("               }");\r
-               fw.delayedWriter.println("            }");\r
-               }\r
-               if (useOriginalList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {\r
-               // generic list\r
-               fw.delayedWriter.println("            {");\r
-               fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");\r
-               fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(), XML.hasOriginalElementList);");\r
-               fw.delayedWriter.println("               if (list == null) {");\r
-               fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
-               fw.delayedWriter.println("                  graph.claim(element.getData(), XML.hasOriginalElementList,list);");\r
-               fw.delayedWriter.println("               } else {");\r
-               fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
-               fw.delayedWriter.println("               }");\r
-               fw.delayedWriter.println("            }");\r
                }\r
-               \r
-               fw.delayedWriter.println("            return true;");\r
-               fw.delayedWriter.println("         }");\r
-               \r
        }\r
        \r
        @Override\r