X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FOntologyGenerator.java;h=74bafb99758af243ac12f8f0997ad0c5559ca6f8;hb=fad28e2a01ee43b7448cffaef1bc6ba2eed84e39;hp=3e0ffb1d3136327fb703a8421d01af176f384499;hpb=04f3fb6796cd6225be090e1e1feb866ae0d03173;p=simantics%2Finterop.git

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 3e0ffb1..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
@@ -138,9 +138,9 @@ public class OntologyGenerator implements SchemaConversionComponent {
 		writer.println();
 		
 		if (!single) {
-			String elementListType = getName(parent) + "." + name + "List";
+			String elementListType = getName(parent) + "." + name + "_List";
 			writer.println(elementListType + " <T XML.ElementList");
-			writer.println(relationName + "List <R XML.hasElementList : L0.FunctionalRelation");
+			writer.println(relationName + "_List <R XML.hasElementList : L0.FunctionalRelation");
 			writer.println("   --> " + elementListType);
 		}
 		
@@ -182,10 +182,10 @@ public class OntologyGenerator implements SchemaConversionComponent {
 				
 				if (type == null) {
 					writer.println(getName(parent)+"."+refName + "List <T XML.ElementList");
-					writer.println(getName(parent)+".has"+refName + "List <R " +  getName(obj,"has")+"List : L0.FunctionalRelation");
+					writer.println(getName(parent)+".has"+refName + "_List <R " +  getName(obj,"has")+"_List : L0.FunctionalRelation");
 				} else {
-					writer.println(getName(parent)+"."+refName + "List <T XML.ElementList");
-					writer.println(getName(parent)+".has"+refName + "List <R XML.hasElementList : L0.FunctionalRelation");	
+					writer.println(getName(parent)+"."+refName + "_List <T XML.ElementList");
+					writer.println(getName(parent)+".has"+refName + "_List <R XML.hasElementList : L0.FunctionalRelation");	
 				}
 			}
 		} else {
@@ -199,8 +199,8 @@ public class OntologyGenerator implements SchemaConversionComponent {
 			writer.println();
 			writer.println("   --> " + getName(obj));
 			if (base.useElementList(parent, indicator,element, false, refName, new QName(obj.getName()))) {
-				writer.println(getName(parent)+"."+refName + "List <T XML.ElementList");
-				writer.println(getName(parent)+".has"+refName + "List <R " +  getName(obj,"has")+"List : L0.FunctionalRelation");
+				writer.println(getName(parent)+"."+refName + "_List <T XML.ElementList");
+				writer.println(getName(parent)+".has"+refName + "_List <R " +  getName(obj,"has")+"_List : L0.FunctionalRelation");
 			}
 		}
 		
@@ -411,15 +411,21 @@ 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");
+		}
+		writer.println(name + "_List <T XML.ElementList");
 		
 		// Access relations
 		String relationName = getName(topLevelComplexType,"has");
 		writer.println(relationName+ " <R XML.hasComplexType");
 		writer.println("   --> " + name);
-		writer.println(relationName+ "List <R XML.hasElementList");
-		writer.println("   --> " + name + "List");
+		writer.println(relationName+ "_List <R XML.hasElementList");
+		writer.println("   --> " + name + "_List");
 		writer.println();
 		
 		// Attributes 
@@ -474,7 +480,7 @@ public class OntologyGenerator implements SchemaConversionComponent {
 //			relationName = ontRoot+getName(elementObj.getParent()) + "has"+element.getName();
 //		}
 		writer.println(relationName+ " <R XML.hasElement");
-		writer.println(relationName+ "List <R XML.hasElementList");
+		writer.println(relationName+ "_List <R XML.hasElementList");
 		
 		writer.println(name+ " <T "+type);