X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FExporterGenerator.java;h=243a1c2415b9f3476c270e9be542a8ff5c441f99;hb=5a2849a5e792c9821201d320cb30b3dc41a586bf;hp=1976664fa73b758358a20d98a162379fc5e07381;hpb=404be73748777cdd2d09b2f29308ae6f4a3d730c;p=simantics%2Finterop.git

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 1976664..243a1c2 100644
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java
@@ -11,6 +11,7 @@ import java.util.Map;
 import javax.xml.namespace.QName;
 
 import org.simantics.utils.datastructures.BijectionMap;
+import org.simantics.xml.sax.SchemaObject.ObjectType;
 import org.simantics.xml.sax.configuration.AttributeComposition;
 import org.simantics.xml.sax.configuration.Configuration;
 import org.simantics.xml.sax.configuration.IDProvider;
@@ -122,7 +123,7 @@ public class ExporterGenerator extends JavaGenerator{
 	}
 	
 	@Override
-	protected String getBaseClass() {
+	protected String getBaseClass(ObjectType type) {
 		return "org.simantics.xml.sax.base.XMLElementNamedChildWriterBase";
 	}
 	
@@ -146,20 +147,21 @@ public class ExporterGenerator extends JavaGenerator{
 		}
 		writers.put(complexTypeObj, fw);
 
-		String baseClass = getBaseClass();
-		
-		boolean inherited = false;
-		
-		QName type = getComplexTypeBase(topLevelComplexType);
-		if (type != null && !type.getNamespaceURI().equals("http://www.w3.org/2001/XMLSchema")) {
-			SchemaObject obj = complexTypeName.get(type.getLocalPart());
-//			if (obj == null)
-//				obj = simpleTypeName.get(type.getLocalPart());
-			if (obj != null) {
-				baseClass = getName(obj);
-				inherited = true;
-			}
-		}
+//		String baseClass = getBaseClass(ObjectType.COMPLEX_TYPE);
+//		
+//		boolean inherited = false;
+		
+//		QName type = getComplexTypeBase(topLevelComplexType);
+//		if (type != null && !type.getNamespaceURI().equals("http://www.w3.org/2001/XMLSchema")) {
+//			SchemaObject obj = complexTypeName.get(type.getLocalPart());
+////			if (obj == null)
+////				obj = simpleTypeName.get(type.getLocalPart());
+//			if (obj != null) {
+//				baseClass = getName(obj);
+//				inherited = true;
+//			}
+//		}
+		Inheritance inheritance = getInheritance(complexTypeObj);
 		
 		provider = getIDProvider(topLevelComplexType);
 //		List<IDReference> references = getIDReferences(topLevelComplexType);
@@ -172,7 +174,7 @@ public class ExporterGenerator extends JavaGenerator{
 //			intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");
 		
 		createClassHeader(fw.writer);
-		writeClass(fw.writer,false, topLevelComplexType.getName(), className, baseClass, Collections.EMPTY_LIST);
+		writeClass(fw.writer,false, topLevelComplexType.getName(), className, inheritance.baseClass, Collections.EMPTY_LIST);
 			
 //		writeIDProvider(fw.writer);
 	
@@ -225,7 +227,8 @@ public class ExporterGenerator extends JavaGenerator{
 		if (stringWriter.getBuffer().length() > 0) {
 			fw.writer.write(stringWriter.toString());
 		}
-		
+		if (inheritance.type == InheritanceType.ComplexType)
+		fw.writer.println("      super.children(graph,instance,result);");
 		fw.writer.println("   }");
 		fw.writer.println();
 		
@@ -242,7 +245,7 @@ public class ExporterGenerator extends JavaGenerator{
 		
 		fw.writer.println("   @Override");
 		fw.writer.println("   public void attributes(ReadGraph graph, WriterElement instance, Collection<Statement> attributes, XMLStreamWriter writer) throws XMLStreamException, DatabaseException{");
-		if (inherited) {
+		if (inheritance.type == InheritanceType.ComplexType) {
 		fw.writer.println("   		super.attributes(graph,instance,attributes,writer);");
 		}
 		fw.writer.println("        "+getOntologyImport());
@@ -252,6 +255,14 @@ public class ExporterGenerator extends JavaGenerator{
 		fw.writer.println("        }");
 		fw.writer.println("   }");
 		
+		if (inheritance.type == InheritanceType.AtomicType) {
+		fw.writer.println();
+		fw.writer.println("   @Override");
+		fw.writer.println("   public void characters(ReadGraph graph, WriterElement instance, XMLStreamWriter writer) throws XMLStreamException, DatabaseException {");
+		fw.writer.println("            writer.writeCharacters("+inheritance.atomicType.getToString("graph.getValue(instance.getResource(),"+inheritance.atomicType.binding+")")+");");
+		fw.writer.println("   }");
+		}
+		
 //		writeIDReferences(fw.writer,name, references);
 //		writeUnknownChild(fw.writer,name,unknownChildElement);
 		
@@ -264,137 +275,52 @@ public class ExporterGenerator extends JavaGenerator{
 		provider = null;
 	}
 	
-	
-	
 	@Override
-	//protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element,  boolean reference, String ref, QName refType) {
-	protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType referenceType) {
+	protected void createReferenceIndicator(SchemaObject parent, RefType referenceType, String refName, String objectName,
+			String primaryClassName, String secondaryClassName, boolean useElementList, boolean useOriginalList) {
 		FileWriter fw = getWriter(parent);
-		if (referenceType != RefType.Element) {
-			QName refType;
-			if (referenceType == RefType.Type) {
-				refType = element.getElement().getType();
-				if (refName == null)
-					refName = element.getElement().getName();
-			} else {
-				refType = element.getElement().getRef();
-				if (refName == null)
-					refName = refType.getLocalPart();
-			}
-			
-			String binding = getBindingFromPrimitiveType(refType);
-			if (binding == null) {
-				SchemaObject refElement = elementName.get(refType.getLocalPart());
-				SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart());
-	
-				String className = null;
-				String refClassName = null;
-				if (refElement != null)
-					className = getName(refElement);
-				else
-					className = getName(refComplexType);
-				
-				if (refComplexType != null) {
-					refClassName = getName(refComplexType);
-				} else {
-					refClassName = getName(refElement);
-				}
-				
-				if (referenceType != RefType.Reference)
-				fw.writer.println("        addTypeWriter("+ontShort+ className +", "+className+".class);");
-				else
-				fw.writer.println("        addWriter("+className+".class);");
-				if (!className.equals(refClassName))
-				fw.writer.println("        addWriter("+refClassName+".class);");
-				
-	//			fw.delayedWriter.println("         if (child.getElementParser() instanceof "+refClassName+"){");
-	//			fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");
-				if (useElementList(parent, indicator,element, referenceType == RefType.Reference, refName, refType)) {
-		
-				// element type specific list
-				fw.delayedWriter.println("            {");
-				fw.delayedWriter.println("               org.simantics.db.Resource list = graph.getPossibleObject(instance.getResource(),"+ontShort+getName(parent)+"_has"+refName + "List);");
-				fw.delayedWriter.println("               if (list != null) {");
-				fw.delayedWriter.println("                  java.util.List<org.simantics.db.Resource> l = org.simantics.db.common.utils.ListUtils.toList(graph, list);");
-				fw.delayedWriter.println("                  result.addAll(l);");
-				fw.delayedWriter.println("               } else {");
-				fw.delayedWriter.println("                  result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");
-				fw.delayedWriter.println("               }");
-				fw.delayedWriter.println("            }");
-				} else {
-				fw.delayedWriter.println("         result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");
-				}
-	//			if (useOriginalList(parent, indicator,element, reference, ref, refType)) {
-	//			// generic list
-	//			fw.delayedWriter.println("            {");
-	//			fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");
-	//			fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(), XML.hasOriginalElementList);");
-	//			fw.delayedWriter.println("               if (list == null) {");
-	//			fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");
-	//			fw.delayedWriter.println("                  graph.claim(element.getData(), XML.hasOriginalElementList,list);");
-	//			fw.delayedWriter.println("               } else {");
-	//			fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");
-	//			fw.delayedWriter.println("               }");
-	//			fw.delayedWriter.println("            }");
-	//			}
-				
-	//			fw.delayedWriter.println("            return true;");
-	//			fw.delayedWriter.println("         }");
-			} else {
-				SchemaObject refElement = elementName.get(refType.getLocalPart());
-				//writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");
-				fw.writer.println("        addRelationWriter("+ ontShort +getName(parent) + "_has"+refName+", "+getName(parent) +"_" +refName+".class);");
-				
-				fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +refName+" extends org.simantics.xml.sax.base.ValueElementWriter {");
-				fw.delayedWriter2.println("      public "+ getName(parent) +"_" +refName +"(){");
-				//fw.delayedWriter2.println("           super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", "+binding+");");
-				fw.delayedWriter2.println("           super(\""+refName+"\",null, "+binding+");");
-				fw.delayedWriter2.println("       }");
-				fw.delayedWriter2.println("   }");
-			}
-		} else {
-			Element attrs= element.getElement();
-			SchemaObject obj = getWithObj(parent, attrs);
-			
-			String className = getName(obj);
-			if (refName == null) {
-				refName = obj.getName();//attrs.getName();
-			}
-
-			//if (!reference)
-			fw.writer.println("        addTypeWriter("+ ontShort+getName(obj) +", "+className+".class);");
-//			else
-//			fw.writer.println("        addWriter("+className+".class);");
-			
-//			fw.delayedWriter.println("         if (child.getElementParser() instanceof "+className+"){");
+		if ("TextOrField".equals(refName))
+			System.out.println();
+		if (referenceType == RefType.Type) {
+		// create internal class for handling the element and child attachment
+		secondaryClassName = getName(parent) +"_" +objectName;
+		if (objectName.equals(refName))
+		fw.writer.println("      addRelationWriter("+ontShort+ getName(parent)+"_has"+refName +", "+secondaryClassName+".class);");
+		else // FIXME : type name may not be correct
+		fw.writer.println("      addRelationTypeWriter("+ontShort+ getName(parent)+"_has"+refName +", " +ontShort+primaryClassName +", "+secondaryClassName+".class);");
+		fw.delayedWriter2.println("   public static class " + secondaryClassName +" extends " + primaryClassName +"{");
+		fw.delayedWriter2.println("      public "+ secondaryClassName +"(ReadGraph graph){");
+		fw.delayedWriter2.println("         super(graph);");
+		fw.delayedWriter2.println("      }");
+		fw.delayedWriter2.println("      ");
+		fw.delayedWriter2.println("      @Override");
+		fw.delayedWriter2.println("      public java.lang.String getElementId() {");
+		fw.delayedWriter2.println("         return \"" + refName +"\";");
+		fw.delayedWriter2.println("      }");
+		fw.delayedWriter2.println("   }");
+		} else { //referenceType == RefType.Reference
+		fw.writer.println("        addWriter("+primaryClassName+".class);");
+		if (!primaryClassName.equals(secondaryClassName))
+		fw.writer.println("        addWriter("+secondaryClassName+".class);");
+		}
+//			fw.delayedWriter.println("         if (child.getElementParser() instanceof "+refClassName+"){");
 //			fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");
-			if (useElementList(parent, indicator,element, false, refName, new QName(obj.getName()))) {
-				
-			// element type specific list
-			fw.delayedWriter.println("            {");
-			fw.delayedWriter.println("               org.simantics.db.Resource list = graph.getPossibleObject(instance.getResource(),"+ontShort+getName(parent)+"_has"+refName + "List);");
-			fw.delayedWriter.println("               if (list != null) {");
-			fw.delayedWriter.println("                  java.util.List<org.simantics.db.Resource> l = org.simantics.db.common.utils.ListUtils.toList(graph, list);");
-			fw.delayedWriter.println("                  result.addAll(l);");
-			fw.delayedWriter.println("               } else {");
-			fw.delayedWriter.println("                  result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");
-			fw.delayedWriter.println("               }");
-			fw.delayedWriter.println("            }");
-			} else {
-			fw.delayedWriter.println("         result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");
-			}
-//			// element type specific list
-//			fw.delayedWriter.println("            {");
-//			fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List);");
-//			fw.delayedWriter.println("               if (list == null) {");
-//			fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");
-//			fw.delayedWriter.println("                  graph.claim(element.getData(),"+ontShort+getName(parent)+"_has"+ref + "List,list);");
-//			fw.delayedWriter.println("               } else {");
-//			fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");
-//			fw.delayedWriter.println("               }");
-//			fw.delayedWriter.println("            }");
-//			}
-//			if (useOriginalList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {
+		if (useElementList) {
+
+		// element type specific list
+		fw.delayedWriter.println("      {");
+		fw.delayedWriter.println("         org.simantics.db.Resource list = graph.getPossibleObject(instance.getResource(),"+ontShort+getName(parent)+"_has"+refName + "List);");
+		fw.delayedWriter.println("         if (list != null) {");
+		fw.delayedWriter.println("            java.util.List<org.simantics.db.Resource> l = org.simantics.db.common.utils.ListUtils.toList(graph, list);");
+		fw.delayedWriter.println("            result.addAll(l);");
+		fw.delayedWriter.println("         } else {");
+		fw.delayedWriter.println("            result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");
+		fw.delayedWriter.println("         }");
+		fw.delayedWriter.println("      }");
+		} else {
+		fw.delayedWriter.println("      result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");
+		}
+//			if (useOriginalList(parent, indicator,element, reference, ref, refType)) {
 //			// generic list
 //			fw.delayedWriter.println("            {");
 //			fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");
@@ -407,13 +333,71 @@ public class ExporterGenerator extends JavaGenerator{
 //			fw.delayedWriter.println("               }");
 //			fw.delayedWriter.println("            }");
 //			}
-//			
+		
 //			fw.delayedWriter.println("            return true;");
 //			fw.delayedWriter.println("         }");
-		}
+		
 	}
 	
+	@Override
+	protected void createPrimitiveIndicator(SchemaObject parent, String refName, String binding) {
+		FileWriter fw = getWriter(parent);
+		//SchemaObject refElement = elementName.get(refType.getLocalPart());
+		//writer.println(commentTag+ontShort+"."+parent+".has"+ref + " <R " +  ontShort+".hasElement");
+		fw.writer.println("        addRelationWriter("+ ontShort +getName(parent) + "_has"+refName+", "+getName(parent) +"_" +refName+".class);");
+		
+		fw.delayedWriter2.println("   public static class " + getName(parent) +"_" +refName+" extends org.simantics.xml.sax.base.ValueElementWriter {");
+		fw.delayedWriter2.println("      public "+ getName(parent) +"_" +refName +"(){");
+		//fw.delayedWriter2.println("           super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", "+binding+");");
+		fw.delayedWriter2.println("           super(\""+refName+"\",null, "+binding+");");
+		fw.delayedWriter2.println("       }");
+		fw.delayedWriter2.println("   }");
+	}
 	
+	@Override
+	protected void createElementIndicator(SchemaObject parent, boolean useElementList, String refName, String className,
+			boolean useOriginalList) {
+		FileWriter fw = getWriter(parent);
+		//if (!reference)
+		fw.writer.println("        addTypeWriter("+ ontShort+className +", "+className+".class);");
+//		else
+//		fw.writer.println("        addWriter("+className+".class);");
+		
+//		fw.delayedWriter.println("         if (child.getElementParser() instanceof "+className+"){");
+//		fw.delayedWriter.println("            graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");
+		if (useElementList) {
+			
+		// element type specific list
+		fw.delayedWriter.println("            {");
+		fw.delayedWriter.println("               org.simantics.db.Resource list = graph.getPossibleObject(instance.getResource(),"+ontShort+getName(parent)+"_has"+refName + "List);");
+		fw.delayedWriter.println("               if (list != null) {");
+		fw.delayedWriter.println("                  java.util.List<org.simantics.db.Resource> l = org.simantics.db.common.utils.ListUtils.toList(graph, list);");
+		fw.delayedWriter.println("                  result.addAll(l);");
+		fw.delayedWriter.println("               } else {");
+		fw.delayedWriter.println("                  result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");
+		fw.delayedWriter.println("               }");
+		fw.delayedWriter.println("            }");
+		} else {
+		fw.delayedWriter.println("         result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");
+		}
+//		if (useOriginalList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {
+//		// generic list
+//		fw.delayedWriter.println("            {");
+//		fw.delayedWriter.println("               XMLResource XML = XMLResource.getInstance(graph);");
+//		fw.delayedWriter.println("               Resource list = graph.getPossibleObject(element.getData(), XML.hasOriginalElementList);");
+//		fw.delayedWriter.println("               if (list == null) {");
+//		fw.delayedWriter.println("                  list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");
+//		fw.delayedWriter.println("                  graph.claim(element.getData(), XML.hasOriginalElementList,list);");
+//		fw.delayedWriter.println("               } else {");
+//		fw.delayedWriter.println("                  org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");
+//		fw.delayedWriter.println("               }");
+//		fw.delayedWriter.println("            }");
+//		}
+//		
+//		fw.delayedWriter.println("            return true;");
+//		fw.delayedWriter.println("         }");
+		
+	}
 	
 	@Override
 	protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement any) {		
@@ -643,7 +627,7 @@ public class ExporterGenerator extends JavaGenerator{
 		writers.put(elementObj, fw);
 		boolean isList = false;
 		
-		Inheritance inhertiance = getElementInheritance(elementObj);	
+		Inheritance inheritance = getInheritance(elementObj);	
 		
 		provider = getIDProvider(element);
 		List<IDReference> references = getIDReferences(element);
@@ -656,7 +640,7 @@ public class ExporterGenerator extends JavaGenerator{
 //			intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");
 
 		createClassHeader(fw.writer);
-		writeClass(fw.writer,false, element.getName(), className, inhertiance.baseClass, Collections.EMPTY_LIST);
+		writeClass(fw.writer,false, element.getName(), className, inheritance.baseClass, Collections.EMPTY_LIST);
 //		writeIDProvider(fw.writer);
 		fw.writer.println("   @Override");
 		fw.writer.println("   public Resource getType(ReadGraph graph) throws DatabaseException {");
@@ -684,7 +668,7 @@ public class ExporterGenerator extends JavaGenerator{
 		
 		fw.writer.println("   @Override");
 		fw.writer.println("   public void attributes(ReadGraph graph, WriterElement instance, Collection<Statement> attributes, XMLStreamWriter writer) throws XMLStreamException, DatabaseException{");
-		if (inhertiance.type == InheritanceType.ComplexType) {
+		if (inheritance.type == InheritanceType.ComplexType) {
 		fw.writer.println("   	   super.attributes(graph,instance,attributes,writer);");
 		}
 		fw.writer.println("        "+getOntologyImport());
@@ -713,7 +697,7 @@ public class ExporterGenerator extends JavaGenerator{
 //		} 
 //		fw.writer.println("   }");
 		
-		if (inhertiance.type == InheritanceType.AtomicType) {
+		if (inheritance.type == InheritanceType.AtomicType) {
 		fw.writer.println();
 //		fw.writer.println("   @Override");
 //		fw.writer.println("   public void configure(WriteGraph graph, ParserElement element, java.lang.String string) throws DatabaseException {");
@@ -721,7 +705,7 @@ public class ExporterGenerator extends JavaGenerator{
 //		fw.writer.println("   }");
 		fw.writer.println("   @Override");
 		fw.writer.println("   public void characters(ReadGraph graph, WriterElement instance, XMLStreamWriter writer) throws XMLStreamException, DatabaseException {");
-		fw.writer.println("            writer.writeCharacters("+inhertiance.atomicType.getToString("graph.getValue(instance.getResource(),"+inhertiance.atomicType.binding+")")+");");
+		fw.writer.println("            writer.writeCharacters("+inheritance.atomicType.getToString("graph.getValue(instance.getResource(),"+inheritance.atomicType.binding+")")+");");
 //		fw.writer.println("      graph.claimValue(element.getData(),"+getValueGetter(binding)+", "+binding.binding +");");
 		fw.writer.println("   }");
 		}
@@ -756,7 +740,7 @@ public class ExporterGenerator extends JavaGenerator{
 			fw.writer.write(stringWriter.toString());
 		}
 		
-		if (inhertiance.type == InheritanceType.ComplexType) {
+		if (inheritance.type == InheritanceType.ComplexType) {
 		fw.writer.println("      super.children(graph,instance,result);");
 		}