From: Marko Luukkainen <marko.luukkainen@vtt.fi>
Date: Tue, 9 May 2017 07:19:38 +0000 (+0300)
Subject: Add ComplexTpye inheritance to SimpleType or literal type when necessary
X-Git-Tag: v1.31.0~15
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=8b435de07492852a7ba5f441388c8f9acec83aed;p=simantics%2Finterop.git

Add ComplexTpye inheritance to SimpleType or literal type when necessary

Change-Id: I112f7277b34ce770e63fbd0bdb2bb0d417780f00
---

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
index 64def5d..74bafb9 100644
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
@@ -411,7 +411,13 @@ public class OntologyGenerator implements SchemaConversionComponent {
 //		writer.println(name+ " <T "+baseType);
 		
 		// Type definition
+		if (inheritance.additionalClass != null) {
+		writer.println(name+ " <T " + inheritance.baseClass + " <T " + inheritance.additionalClass);
+	    } else if (inheritance.atomicType != null){
+	    writer.println(name+ " <T " + inheritance.baseClass + " <T " + inheritance.atomicType.l0Type);
+	    } else {
 		writer.println(name+ " <T " + inheritance.baseClass);
+		}
 		writer.println(name + "_List <T XML.ElementList");
 		
 		// Access relations
diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java
index 863162c..8a2785f 100644
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java
@@ -1359,6 +1359,7 @@ public final class SchemaConversionBase {
 	
 	public static class Inheritance {
 		public String baseClass;
+		public String additionalClass;
 		public InheritanceType type;
 		public TypeEntry atomicType;
 		
@@ -1454,6 +1455,9 @@ public final class SchemaConversionBase {
 				ExtensionType extensionType = simpleContent.getExtension();
 				if (extensionType != null) {
 					type = extensionType.getBase();
+					SchemaObject simpleType = getSimpleType(type);
+					if (simpleType != null)
+						inheritance.additionalClass = getName(simpleType);
 					getAtomicTypeInheritance(type, inheritance);
 				}
 			}