X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FExporterGenerator.java;fp=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FExporterGenerator.java;h=243a1c2415b9f3476c270e9be542a8ff5c441f99;hb=5a2849a5e792c9821201d320cb30b3dc41a586bf;hp=74538ea1c7716cc9fca8d2f94aa94d9159b628f3;hpb=90d821c64af7690fe7e108c3f5b89da8fa5395fc;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 74538ea..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,7 +11,6 @@ import java.util.Map;
 import javax.xml.namespace.QName;
 
 import org.simantics.utils.datastructures.BijectionMap;
-import org.simantics.xml.sax.SchemaConversionBase.RefType;
 import org.simantics.xml.sax.SchemaObject.ObjectType;
 import org.simantics.xml.sax.configuration.AttributeComposition;
 import org.simantics.xml.sax.configuration.Configuration;
@@ -280,10 +279,15 @@ public class ExporterGenerator extends JavaGenerator{
 	protected void createReferenceIndicator(SchemaObject parent, RefType referenceType, String refName, String objectName,
 			String primaryClassName, String secondaryClassName, boolean useElementList, boolean useOriginalList) {
 		FileWriter fw = getWriter(parent);
+		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;
-		fw.writer.println("        addRelationWriter("+ontShort+ getName(parent)+"_has"+refName +", "+secondaryClassName+".class);");
+		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);");
@@ -304,17 +308,17 @@ public class ExporterGenerator extends JavaGenerator{
 		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("            }");
+		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 + "));");
+		fw.delayedWriter.println("      result.addAll(graph.getObjects(instance.getResource(), "+ontShort+getName(parent)+"_has"+refName + "));");
 		}
 //			if (useOriginalList(parent, indicator,element, reference, ref, refType)) {
 //			// generic list
@@ -376,17 +380,6 @@ public class ExporterGenerator extends JavaGenerator{
 		} 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()))) {
 //		// generic list
 //		fw.delayedWriter.println("            {");