Refactoring Java generator code

refs #6985

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33438 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/AbstractExporter.java b/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/AbstractExporter.java
index 3464bda5c7865f11a32c7ae9a8f6716377258648..23831a2a2efe1ef1d98a767097a6d783b488bd72 100644 (file)
--- a/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/AbstractExporter.java
+++ b/org.simantics.xml.sax.base/src/org/simantics/xml/sax/base/AbstractExporter.java
@@ -20,6 +20,9 @@ import org.simantics.message.MessageService;
 \r
 public class AbstractExporter {\r
        \r
+       private static String ENCODING = "UTF-8";\r
+       private static String XML_VERSION = "1.0";\r
+       \r
        private Session session;\r
        private File file;\r
        private ILogger logger;\r
@@ -59,13 +62,13 @@ public class AbstractExporter {
        \r
        private static XMLStreamWriter createIdentXMLStreamWriter(OutputStream textWriter) throws XMLStreamException {\r
                XMLOutputFactory output = XMLOutputFactory.newInstance();\r
-               return new IndentingXMLStreamWriter(output.createXMLStreamWriter(textWriter, "UTF-8"));\r
+               return new IndentingXMLStreamWriter(output.createXMLStreamWriter(textWriter, ENCODING));\r
                //return new com.sun.xml.internal.txw2.output.IndentingXMLStreamWriter(output.createXMLStreamWriter(textWriter, "UTF-8"));\r
        }\r
        \r
        private static XMLStreamWriter createXMLStreamWriter(OutputStream textWriter) throws XMLStreamException {\r
                XMLOutputFactory output = XMLOutputFactory.newInstance();\r
-               return output.createXMLStreamWriter(textWriter, "UTF-8");\r
+               return output.createXMLStreamWriter(textWriter, ENCODING);\r
        }\r
        \r
        \r
@@ -80,7 +83,7 @@ public class AbstractExporter {
                                        writer =createIdentXMLStreamWriter(os);\r
                                else\r
                                        writer =createXMLStreamWriter(os);\r
-                               writer.writeStartDocument("UTF-8", "1.1");\r
+                               writer.writeStartDocument(ENCODING, XML_VERSION);\r
                                \r
                                xmlWriter.write(root, writer);\r
                                \r

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
index c5c3f5ec32bfe9ba7fe4191b782eadbccb43c56c..74538ea1c7716cc9fca8d2f94aa94d9159b628f3 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
@@ -276,152 +276,47 @@ public class ExporterGenerator extends JavaGenerator{
                provider = null;\r
        }\r
        \r
-       \r
-       \r
        @Override\r
-       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType referenceType) {\r
+       protected void createReferenceIndicator(SchemaObject parent, RefType referenceType, String refName, String objectName,\r
+                       String primaryClassName, String secondaryClassName, boolean useElementList, boolean useOriginalList) {\r
                FileWriter fw = getWriter(parent);\r
-               String objectName;\r
-               if (referenceType != RefType.Element) {\r
-                       QName refType;\r
-                       if (referenceType == RefType.Type) {\r
-                               refType = element.getElement().getType();\r
-                               if (refName == null)\r
-                                       refName = element.getElement().getName();\r
-                               objectName = element.getElement().getName();\r
-                       } else {\r
-                               refType = element.getElement().getRef();\r
-                               if (refName == null)\r
-                                       refName = refType.getLocalPart();\r
-                               objectName = refType.getLocalPart();\r
-                       }\r
-                       \r
-                       String binding = getBindingFromPrimitiveType(refType);\r
-                       if (binding == null) {\r
-                               SchemaObject refElement = elementName.get(refType.getLocalPart());\r
-                               SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart());\r
-       \r
-                               // prefer element reference over complex type reference\r
-                               String primaryClassName = null;\r
-                               String secondaryClassName = null;\r
-                               if (refElement != null)\r
-                                       primaryClassName = getName(refElement);\r
-                               else\r
-                                       primaryClassName = getName(refComplexType);\r
-                               \r
-                               if (refComplexType != null) {\r
-                                       secondaryClassName = getName(refComplexType);\r
-                               } else {\r
-                                       secondaryClassName = getName(refElement);\r
-                               }\r
-                               \r
-                               if (referenceType == RefType.Type) {\r
-                               // create internal class for handling the element and child attachment\r
-                               secondaryClassName = getName(parent) +"_" +objectName;\r
-                               fw.writer.println("        addRelationWriter("+ontShort+ getName(parent)+"_has"+refName +", "+secondaryClassName+".class);");\r
-                               fw.delayedWriter2.println("   public static class " + secondaryClassName +" extends " + primaryClassName +"{");\r
-                               fw.delayedWriter2.println("      public "+ secondaryClassName +"(ReadGraph graph){");\r
-                               fw.delayedWriter2.println("         super(graph);");\r
-                               fw.delayedWriter2.println("      }");\r
-                               fw.delayedWriter2.println("      ");\r
-                               fw.delayedWriter2.println("      @Override");\r
-                               fw.delayedWriter2.println("      public java.lang.String getElementId() {");\r
-                               fw.delayedWriter2.println("         return \"" + refName +"\";");\r
-                               fw.delayedWriter2.println("      }");\r
-                               fw.delayedWriter2.println("   }");\r
-                               } else { //referenceType == RefType.Reference\r
-                               fw.writer.println("        addWriter("+primaryClassName+".class);");\r
-                               if (!primaryClassName.equals(secondaryClassName))\r
-                               fw.writer.println("        addWriter("+secondaryClassName+".class);");\r
-                               }\r
-       //                      fw.delayedWriter.println("         if (child.getElementParser() instanceof "+refClassName+"){");\r
-       //                      fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");\r
-                               if (useElementList(parent, indicator,element, referenceType == RefType.Reference, refName, refType)) {\r
-               \r
-                               // element type specific list\r
-                               fw.delayedWriter.println("            {");\r
-                               fw.delayedWriter.println("               org.simantics.db.Resource list = graph.getPossibleObject(instance.getResource(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
-                               fw.delayedWriter.println("               if (list != null) {");\r
-                               fw.delayedWriter.println("                  java.util.List<org.simantics.db.Resource> l = org.simantics.db.common.utils.ListUtils.toList(graph, list);");\r
-                               fw.delayedWriter.println("                  result.addAll(l);");\r
-                               fw.delayedWriter.println("               } else {");\r
-                               fw.delayedWriter.println("                  result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
-                               fw.delayedWriter.println("               }");\r
-                               fw.delayedWriter.println("            }");\r
-                               } else {\r
-                               fw.delayedWriter.println("         result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
-                               }\r
-       //                      if (useOriginalList(parent, indicator,element, reference, ref, refType)) {\r
-       //                      // generic list\r
-       //                      fw.delayedWriter.println("            {");\r
-       //                      fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");\r
-       //                      fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(), XML.hasOriginalElementList);");\r
-       //                      fw.delayedWriter.println("               if (list == null) {");\r
-       //                      fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
-       //                      fw.delayedWriter.println("                  graph.claim(element.getData(), XML.hasOriginalElementList,list);");\r
-       //                      fw.delayedWriter.println("               } else {");\r
-       //                      fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
-       //                      fw.delayedWriter.println("               }");\r
-       //                      fw.delayedWriter.println("            }");\r
-       //                      }\r
-                               \r
-       //                      fw.delayedWriter.println("            return true;");\r
-       //                      fw.delayedWriter.println("         }");\r
-                       } else {\r
-                               SchemaObject refElement = elementName.get(refType.getLocalPart());\r
-                               //writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");\r
-                               fw.writer.println("        addRelationWriter("+ ontShort +getName(parent) + "_has"+refName+", "+getName(parent) +"_" +refName+".class);");\r
-                               \r
-                               fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +refName+" extends org.simantics.xml.sax.base.ValueElementWriter {");\r
-                               fw.delayedWriter2.println("      public "+ getName(parent) +"_" +refName +"(){");\r
-                               //fw.delayedWriter2.println("           super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", "+binding+");");\r
-                               fw.delayedWriter2.println("           super(\""+refName+"\",null, "+binding+");");\r
-                               fw.delayedWriter2.println("       }");\r
-                               fw.delayedWriter2.println("   }");\r
-                       }\r
-               } else {\r
-                       Element attrs= element.getElement();\r
-                       SchemaObject obj = getWithObj(parent, attrs);\r
-                       \r
-                       String className = getName(obj);\r
-                       if (refName == null) {\r
-                               refName = obj.getName();//attrs.getName();\r
-                       }\r
-\r
-                       //if (!reference)\r
-                       fw.writer.println("        addTypeWriter("+ ontShort+getName(obj) +", "+className+".class);");\r
-//                     else\r
-//                     fw.writer.println("        addWriter("+className+".class);");\r
-                       \r
-//                     fw.delayedWriter.println("         if (child.getElementParser() instanceof "+className+"){");\r
+               if (referenceType == RefType.Type) {\r
+               // create internal class for handling the element and child attachment\r
+               secondaryClassName = getName(parent) +"_" +objectName;\r
+               fw.writer.println("        addRelationWriter("+ontShort+ getName(parent)+"_has"+refName +", "+secondaryClassName+".class);");\r
+               fw.delayedWriter2.println("   public static class " + secondaryClassName +" extends " + primaryClassName +"{");\r
+               fw.delayedWriter2.println("      public "+ secondaryClassName +"(ReadGraph graph){");\r
+               fw.delayedWriter2.println("         super(graph);");\r
+               fw.delayedWriter2.println("      }");\r
+               fw.delayedWriter2.println("      ");\r
+               fw.delayedWriter2.println("      @Override");\r
+               fw.delayedWriter2.println("      public java.lang.String getElementId() {");\r
+               fw.delayedWriter2.println("         return \"" + refName +"\";");\r
+               fw.delayedWriter2.println("      }");\r
+               fw.delayedWriter2.println("   }");\r
+               } else { //referenceType == RefType.Reference\r
+               fw.writer.println("        addWriter("+primaryClassName+".class);");\r
+               if (!primaryClassName.equals(secondaryClassName))\r
+               fw.writer.println("        addWriter("+secondaryClassName+".class);");\r
+               }\r
+//                     fw.delayedWriter.println("         if (child.getElementParser() instanceof "+refClassName+"){");\r
 //                     fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");\r
-                       if (useElementList(parent, indicator,element, false, refName, new QName(obj.getName()))) {\r
-                               \r
-                       // element type specific list\r
-                       fw.delayedWriter.println("            {");\r
-                       fw.delayedWriter.println("               org.simantics.db.Resource list = graph.getPossibleObject(instance.getResource(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
-                       fw.delayedWriter.println("               if (list != null) {");\r
-                       fw.delayedWriter.println("                  java.util.List<org.simantics.db.Resource> l = org.simantics.db.common.utils.ListUtils.toList(graph, list);");\r
-                       fw.delayedWriter.println("                  result.addAll(l);");\r
-                       fw.delayedWriter.println("               } else {");\r
-                       fw.delayedWriter.println("                  result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
-                       fw.delayedWriter.println("               }");\r
-                       fw.delayedWriter.println("            }");\r
-                       } else {\r
-                       fw.delayedWriter.println("         result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
-                       }\r
-//                     // element type specific list\r
-//                     fw.delayedWriter.println("            {");\r
-//                     fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List);");\r
-//                     fw.delayedWriter.println("               if (list == null) {");\r
-//                     fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
-//                     fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List,list);");\r
-//                     fw.delayedWriter.println("               } else {");\r
-//                     fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
-//                     fw.delayedWriter.println("               }");\r
-//                     fw.delayedWriter.println("            }");\r
-//                     }\r
-//                     if (useOriginalList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {\r
+               if (useElementList) {\r
+\r
+               // element type specific list\r
+               fw.delayedWriter.println("            {");\r
+               fw.delayedWriter.println("               org.simantics.db.Resource list = graph.getPossibleObject(instance.getResource(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
+               fw.delayedWriter.println("               if (list != null) {");\r
+               fw.delayedWriter.println("                  java.util.List<org.simantics.db.Resource> l = org.simantics.db.common.utils.ListUtils.toList(graph, list);");\r
+               fw.delayedWriter.println("                  result.addAll(l);");\r
+               fw.delayedWriter.println("               } else {");\r
+               fw.delayedWriter.println("                  result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
+               fw.delayedWriter.println("               }");\r
+               fw.delayedWriter.println("            }");\r
+               } else {\r
+               fw.delayedWriter.println("         result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
+               }\r
+//                     if (useOriginalList(parent, indicator,element, reference, ref, refType)) {\r
 //                     // generic list\r
 //                     fw.delayedWriter.println("            {");\r
 //                     fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");\r
@@ -434,13 +329,82 @@ public class ExporterGenerator extends JavaGenerator{
 //                     fw.delayedWriter.println("               }");\r
 //                     fw.delayedWriter.println("            }");\r
 //                     }\r
-//                     \r
+               \r
 //                     fw.delayedWriter.println("            return true;");\r
 //                     fw.delayedWriter.println("         }");\r
-               }\r
+               \r
        }\r
        \r
+       @Override\r
+       protected void createPrimitiveIndicator(SchemaObject parent, String refName, String binding) {\r
+               FileWriter fw = getWriter(parent);\r
+               //SchemaObject refElement = elementName.get(refType.getLocalPart());\r
+               //writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");\r
+               fw.writer.println("        addRelationWriter("+ ontShort +getName(parent) + "_has"+refName+", "+getName(parent) +"_" +refName+".class);");\r
+               \r
+               fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +refName+" extends org.simantics.xml.sax.base.ValueElementWriter {");\r
+               fw.delayedWriter2.println("      public "+ getName(parent) +"_" +refName +"(){");\r
+               //fw.delayedWriter2.println("           super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", "+binding+");");\r
+               fw.delayedWriter2.println("           super(\""+refName+"\",null, "+binding+");");\r
+               fw.delayedWriter2.println("       }");\r
+               fw.delayedWriter2.println("   }");\r
+       }\r
        \r
+       @Override\r
+       protected void createElementIndicator(SchemaObject parent, boolean useElementList, String refName, String className,\r
+                       boolean useOriginalList) {\r
+               FileWriter fw = getWriter(parent);\r
+               //if (!reference)\r
+               fw.writer.println("        addTypeWriter("+ ontShort+className +", "+className+".class);");\r
+//             else\r
+//             fw.writer.println("        addWriter("+className+".class);");\r
+               \r
+//             fw.delayedWriter.println("         if (child.getElementParser() instanceof "+className+"){");\r
+//             fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");\r
+               if (useElementList) {\r
+                       \r
+               // element type specific list\r
+               fw.delayedWriter.println("            {");\r
+               fw.delayedWriter.println("               org.simantics.db.Resource list = graph.getPossibleObject(instance.getResource(),"+ontShort+getName(parent)+"_has"+refName + "List);");\r
+               fw.delayedWriter.println("               if (list != null) {");\r
+               fw.delayedWriter.println("                  java.util.List<org.simantics.db.Resource> l = org.simantics.db.common.utils.ListUtils.toList(graph, list);");\r
+               fw.delayedWriter.println("                  result.addAll(l);");\r
+               fw.delayedWriter.println("               } else {");\r
+               fw.delayedWriter.println("                  result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
+               fw.delayedWriter.println("               }");\r
+               fw.delayedWriter.println("            }");\r
+               } else {\r
+               fw.delayedWriter.println("         result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");\r
+               }\r
+//             // element type specific list\r
+//             fw.delayedWriter.println("            {");\r
+//             fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List);");\r
+//             fw.delayedWriter.println("               if (list == null) {");\r
+//             fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
+//             fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List,list);");\r
+//             fw.delayedWriter.println("               } else {");\r
+//             fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
+//             fw.delayedWriter.println("               }");\r
+//             fw.delayedWriter.println("            }");\r
+//             }\r
+//             if (useOriginalList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {\r
+//             // generic list\r
+//             fw.delayedWriter.println("            {");\r
+//             fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");\r
+//             fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(), XML.hasOriginalElementList);");\r
+//             fw.delayedWriter.println("               if (list == null) {");\r
+//             fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
+//             fw.delayedWriter.println("                  graph.claim(element.getData(), XML.hasOriginalElementList,list);");\r
+//             fw.delayedWriter.println("               } else {");\r
+//             fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
+//             fw.delayedWriter.println("               }");\r
+//             fw.delayedWriter.println("            }");\r
+//             }\r
+//             \r
+//             fw.delayedWriter.println("            return true;");\r
+//             fw.delayedWriter.println("         }");\r
+               \r
+       }\r
        \r
        @Override\r
        protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement any) {               \r

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
index 55ff5ef7e52f32ab0b830e9efa5a8b6ad689d2c1..80359ba895c6ea25269785a1907c6f96996141bd 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
@@ -238,143 +238,104 @@ public class ImporterGenerator extends JavaGenerator{
        }\r
        \r
        @Override\r
-       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType referenceType) {\r
+       protected void createReferenceIndicator(SchemaObject parent, RefType referenceType, String refName, String objectName, String primaryClassName, String secondaryClassName, boolean useElementList, boolean useOriginalList) {\r
                FileWriter fw = getWriter(parent);\r
-               String objectName;\r
-               if (referenceType != RefType.Element) {\r
-                       QName refType;\r
-                       if (referenceType == RefType.Type) {\r
-                               refType = element.getElement().getType();\r
-                               if (refName == null)\r
-                                       refName = element.getElement().getName();\r
-                               objectName = element.getElement().getName();\r
-                       } else {\r
-                               refType = element.getElement().getRef();\r
-                               if (refName == null)\r
-                                       refName = refType.getLocalPart();\r
-                               objectName = refType.getLocalPart();\r
-                       }\r
-                       \r
-                       String binding = getBindingFromPrimitiveType(refType);\r
-                       if (binding == null) {\r
-                               SchemaObject refElement = elementName.get(refType.getLocalPart());\r
-                               SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart());\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
+               // 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
-                               // prefer element reference over complex type reference\r
-                               String primaryClassName = null;\r
-                               String secondaryClassName = null;\r
-                               if (refElement != null)\r
-                                       primaryClassName = getName(refElement);\r
-                               else\r
-                                       primaryClassName = getName(refComplexType);\r
-                               \r
-                               if (refComplexType != null) {\r
-                                       secondaryClassName = getName(refComplexType);\r
-                               } else {\r
-                                       secondaryClassName = getName(refElement);\r
-                               }\r
-                               \r
-                               if (referenceType == RefType.Type) {\r
-                               // create internal class for handling the element and child attachment\r
-                               secondaryClassName = getName(parent) +"_" +objectName;\r
-                               fw.writer.println("        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(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
-                               //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
-                       String className = getName(obj);\r
-                       if (refName == null)\r
-                               refName = attrs.getName();\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
+       protected void createPrimitiveIndicator(SchemaObject parent, String refName, String binding) {\r
+               FileWriter fw = getWriter(parent);\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
+       protected void createElementIndicator(SchemaObject parent, boolean useElementList, String refName, String className, boolean useOriginalList) {\r
+               FileWriter fw = getWriter(parent);\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"+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, false, refName, 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
+               // 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

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/JavaGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/JavaGenerator.java
index bf52b9bac6889e608746176e9e14edbb316f92d7..dfcdfd3d7b78e1afbe903dc7e06cb1b969058db8 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/JavaGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/JavaGenerator.java
@@ -224,8 +224,63 @@ public abstract class JavaGenerator extends SchemaConversionBase{
                writer.println();\r
        }\r
        \r
+       protected abstract void createReferenceIndicator(SchemaObject parent, RefType referenceType, String refName, String objectName, String primaryClassName, String secondaryClassName, boolean useElementList, boolean useOriginalList);\r
+       protected abstract void createPrimitiveIndicator(SchemaObject parent, String refName, String binding);\r
+       protected abstract void createElementIndicator(SchemaObject parent, boolean useElementList, String refName, String className, boolean useOriginalList);\r
        \r
+       @Override\r
+       protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType referenceType) {\r
+               String objectName;\r
+               if (referenceType != RefType.Element) {\r
+                       QName refType;\r
+                       if (referenceType == RefType.Type) {\r
+                               refType = element.getElement().getType();\r
+                               if (refName == null)\r
+                                       refName = element.getElement().getName();\r
+                               objectName = element.getElement().getName();\r
+                       } else {\r
+                               refType = element.getElement().getRef();\r
+                               if (refName == null)\r
+                                       refName = refType.getLocalPart();\r
+                               objectName = refType.getLocalPart();\r
+                       }\r
+                       \r
+                       String binding = getBindingFromPrimitiveType(refType);\r
+                       if (binding == null) {\r
+                               SchemaObject refElement = elementName.get(refType.getLocalPart());\r
+                               SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart());\r
        \r
-\r
+                               // prefer element reference over complex type reference\r
+                               String primaryClassName = null;\r
+                               String secondaryClassName = null;\r
+                               if (refElement != null)\r
+                                       primaryClassName = getName(refElement);\r
+                               else\r
+                                       primaryClassName = getName(refComplexType);\r
+                               \r
+                               if (refComplexType != null) {\r
+                                       secondaryClassName = getName(refComplexType);\r
+                               } else {\r
+                                       secondaryClassName = getName(refElement);\r
+                               }\r
+                               boolean useElementList = useElementList(parent, indicator,element, referenceType == RefType.Reference, refName, refType);\r
+                               boolean useOriginalList = useOriginalList(parent, indicator,element, referenceType == RefType.Reference, refName, refType);\r
+                               createReferenceIndicator(parent, referenceType, refName, objectName, primaryClassName, secondaryClassName, useElementList, useOriginalList);\r
+                       } else {\r
+                               createPrimitiveIndicator(parent, refName, binding);\r
+                       }\r
+               } else {\r
+                       Element attrs= element.getElement();\r
+                       SchemaObject obj = getWithObj(parent, attrs);\r
+                       \r
+                       String className = getName(obj);\r
+                       if (refName == null)\r
+                               refName = attrs.getName();\r
+                       \r
+                       boolean useElementList = useElementList(parent, indicator,element, false, refName, new QName(obj.getName()));\r
+                       boolean useOriginalList = useOriginalList(parent, indicator,element, false, refName, new QName(obj.getName()));\r
+                       createElementIndicator(parent, useElementList, refName, className, useOriginalList);\r
+               }\r
+       }\r
 \r
 }\r