X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FOntologyGenerator.java;h=741e197f0e2ff50bf9bb6b41c619fe94fd78471e;hb=09fb8eafbc9046ead17f0529eebad0b0caf55e2b;hp=e64a59bf3f296fb0fae84e84e3341502b406d522;hpb=404be73748777cdd2d09b2f29308ae6f4a3d730c;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 e64a59b..741e197 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
@@ -11,6 +11,7 @@ import java.util.Set;
 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.IDReference;
@@ -140,11 +141,11 @@ public class OntologyGenerator extends SchemaConversionBase {
 	}
 	
 	
-	public static String getComplexTypePrefix() {
+	public String getComplexTypePrefix() {
 		return "ComplexTypes.";
 	}
 	
-	public static String getAttributeGroupPrefix() {
+	public String getAttributeGroupPrefix() {
 		return "AttributeGroups.";
 	}
 	
@@ -163,7 +164,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 					break;
 				}
 			}
-			String relationName = ontRoot+getName(parent)+".has"+name;
+			String relationName = getName(parent)+".has"+name;
 			writer.print(relationName);
 			
 			List<String> types = new ArrayList<String>();
@@ -181,7 +182,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 				}
 				if (type == null) {
 					SchemaObject obj = getWithName(parent, refType.getLocalPart());
-					types.add(ontRoot+getName(obj,"has"));
+					types.add(getName(obj,"has"));
 				} 
 			}
 			if (types.size() > 0) {
@@ -248,21 +249,21 @@ public class OntologyGenerator extends SchemaConversionBase {
 			if (type == null) {
 				obj = getWithName(parent, referenceType.getLocalPart());
 				
-				writer.println(ontRoot+getName(parent)+".has"+refName + " <R " +  ontRoot+ getName(obj,"has"));
-				writer.println("   --> " + ontRoot+getName(obj));
+				writer.println(getName(parent)+".has"+refName + " <R " +  getName(obj,"has"));
+				writer.println("   --> " + getName(obj));
 			} else {
-				writer.println(ontRoot+getName(parent)+".has"+refName + " <R XML.hasElement");
+				writer.println(getName(parent)+".has"+refName + " <R XML.hasElement");
 				writer.println("   --> " + getType(referenceType));
 			}
 			
 			if (useElementList(parent, indicator,element, refType == RefType.Reference, refName, referenceType)) {
 				
 				if (type == null) {
-					writer.println(ontRoot+getName(parent)+"."+refName + "List <T XML.ElementList");
-					writer.println(ontRoot+getName(parent)+".has"+refName + "List <R " +  ontRoot+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");
 				} else {
-					writer.println(ontRoot+getName(parent)+"."+refName + "List <T XML.ElementList");
-					writer.println(ontRoot+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 {
@@ -271,11 +272,11 @@ public class OntologyGenerator extends SchemaConversionBase {
 			if (refName == null)
 				refName = obj.getName();
 			
-			writer.println(ontRoot+getName(parent)+".has"+refName + " <R " +  ontRoot+ getName(obj,"has"));
-			writer.println("   --> " + ontRoot+getName(obj));
+			writer.println(getName(parent)+".has"+refName + " <R " + getName(obj,"has"));
+			writer.println("   --> " + getName(obj));
 			if (useElementList(parent, indicator,element, false, refName, new QName(obj.getName()))) {
-				writer.println(ontRoot+getName(parent)+"."+refName + "List <T XML.ElementList");
-				writer.println(ontRoot+getName(parent)+".has"+refName + "List <R " +  ontRoot+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");
 			}
 		}
 		
@@ -298,11 +299,11 @@ public class OntologyGenerator extends SchemaConversionBase {
 		if (name != null) {
 			relationName = ontRoot+"has"+name;
 			if (parent != null)
-				relationName = ontRoot+getName(parent)+".has"+name;
+				relationName = getName(parent)+".has"+name;
 			relationType = "XML.hasAttribute";
 		}
 		else if (ref != null && parent != null) {
-			relationName = ontRoot+getName(parent)+".has"+ref.getLocalPart();
+			relationName = getName(parent)+".has"+ref.getLocalPart();
 			relationType = ontRoot+"has"+ref.getLocalPart();
 		} else {
 			throw new RuntimeException();
@@ -370,7 +371,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 				}
 			}
 		} else {
-			writer.println(ontRoot+getName(parent) +" L0.Inherits " + ontRoot + getAttributeGroupPrefix() + attributeGroup.getRef().getLocalPart());
+			writer.println(getName(parent) +" L0.Inherits " + ontRoot + getAttributeGroupPrefix() + attributeGroup.getRef().getLocalPart());
 		}
 		
 	}
@@ -394,7 +395,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 			// TODO : process restriction in lists
 			String relationName = ontRoot+"has"+name;
 			if (parent != null)
-				relationName = ontRoot+getName(parent)+".has"+name;
+				relationName = getName(parent)+".has"+name;
 			writer.println(relationName+ " <R XML.hasAttribute : L0.FunctionalRelation");
 			
 			String ontType = getL0Type(new QName(SCHEMA_NS, "string"));
@@ -407,7 +408,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 			
 			String relationName = ontRoot+"has"+name;
 			if (parent != null)
-				relationName = ontRoot+getName(parent)+".has"+name;
+				relationName = getName(parent)+".has"+name;
 			
 			writer.println(relationName+ " <R XML.hasAttribute : L0.FunctionalRelation");
 			
@@ -422,25 +423,34 @@ public class OntologyGenerator extends SchemaConversionBase {
 //		if (topLevelComplexType.getName().equals("Reference"))
 //			System.out.println();
 		
-		String relationName = ontRoot+getName(topLevelComplexType,"has");//ontRoot+"has"+name;
+		String relationName = getName(topLevelComplexType,"has");//ontRoot+"has"+name;
 		
 		writer.println(relationName+ " <R XML.hasComplexType");
 		writer.println(relationName+ "List <R XML.hasElementList");
 		//writer.println("   --> " + ontRoot+getComplexTypePrefix()+name);
-		writer.println("   --> " + ontRoot+name);
+		writer.println("   --> " + name);
 		writer.println();
-		String baseType = "XML.ComplexType";
-
-		QName base = getComplexTypeBase(topLevelComplexType.getComplexType());
-		if (base != null) {
-			baseType = getType(base);
-		}
-		base = getSimpleTypeBase(topLevelComplexType.getSimpleType());
-		if (base != null) {
-			baseType = getType(base);
+//		String baseType = "XML.ComplexType";
+//
+//		QName base = getComplexTypeBase(topLevelComplexType.getComplexType());
+//		if (base != null) {
+//			baseType = getType(base);
+//		}
+//		base = getSimpleTypeBase(topLevelComplexType.getSimpleType());
+//		if (base != null) {
+//			baseType = getType(base);
+//		}
+		Inheritance inheritance = getInheritance(topLevelComplexType);
+		
+//		writer.println(name+ " <T "+baseType);
+		
+		if(inheritance.type == InheritanceType.AtomicType) {
+			writer.println(name+ " <T "+inheritance.baseClass + " <T "+inheritance.atomicType.l0Type);
+		} else {
+			writer.println(name+ " <T "+inheritance.baseClass);
 		}
-		//writer.println(ontRoot+getComplexTypePrefix()+name+ " <T "+baseType);
-		writer.println(ontRoot+name+ " <T "+baseType);
+//		if (!baseType.equals(inheritance.baseClass))
+//			System.out.println();
 		super.handleComplexType(topLevelComplexType);
 		writer.println();
 	}
@@ -481,7 +491,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 			type += " <T " + t;
 		}
 
-		String relationName =  ontRoot+getName(elementObj,"has");//ontRoot+"has"+name;
+		String relationName =  getName(elementObj,"has");//ontRoot+"has"+name;
 //		if (elementObj.getParent() != null) {
 //			//relationName = ontRoot+getComplexTypePrefix()+"has"+name.substring(getComplexTypePrefix().length());
 //			relationName = ontRoot+getName(elementObj.getParent()) + "has"+element.getName();
@@ -489,7 +499,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 		writer.println(relationName+ " <R XML.hasElement");
 		writer.println(relationName+ "List <R XML.hasElementList");
 		
-		writer.println(ontRoot+name+ " <T "+type);
+		writer.println(name+ " <T "+type);
 		
 		LocalComplexType complexType = element.getComplexType();
 		LocalSimpleType simpleType = element.getSimpleType();
@@ -506,23 +516,32 @@ public class OntologyGenerator extends SchemaConversionBase {
 		List<IDReference> references = getIDReferences(element);
 	
 		for (IDReference ref : references) {
-			writer.println(ontRoot+name+"."+ref.getReference().getName()+ " <R XML.hasReference");
+			writer.println(name+"."+ref.getReference().getName()+ " <R XML.hasReference");
 		}
 		
 		writer.println();
 	}
 	
-	public static String getName(SchemaObject obj) {
+	@Override
+	protected String getBaseClass(ObjectType type) {
+		if (type == ObjectType.ELEMENT)
+			return "XML.Element";
+		if (type == ObjectType.COMPLEX_TYPE)
+			return "XML.ComplexType";
+		throw new RuntimeException("ObjectType " + type + " has no base class");
+	}
+	
+	public String getName(SchemaObject obj) {
 		if (obj.getParent() == null) {
 			switch (obj.getType()) {
 			case COMPLEX_TYPE:
-				return getComplexTypePrefix()+obj.getName();
+				return ontRoot+getComplexTypePrefix()+obj.getName();
 			case ELEMENT:
-				return obj.getName();
+				return ontRoot+obj.getName();
 			case ATTRIBUTE_GROUP:
-				return getAttributeGroupPrefix()+obj.getName();
+				return ontRoot+getAttributeGroupPrefix()+obj.getName();
 			case SIMPLE_TYPE:
-				return obj.getName();
+				return ontRoot+obj.getName();
 			}
 		} else {
 			SchemaObject o = obj;
@@ -537,30 +556,30 @@ public class OntologyGenerator extends SchemaConversionBase {
 			name = name.substring(0, name.length()-1);
 			switch (prev.getType()) {
 			case COMPLEX_TYPE:
-				return getComplexTypePrefix()+name;
+				return ontRoot+getComplexTypePrefix()+name;
 			case ELEMENT:
-				return name;
+				return ontRoot+name;
 			case ATTRIBUTE_GROUP:
-				return getAttributeGroupPrefix()+name;
+				return ontRoot+getAttributeGroupPrefix()+name;
 			case SIMPLE_TYPE:
-				return name;
+				return ontRoot+name;
 			}
 		}
 		throw new RuntimeException();
 		
 	}
 	
-	public static String getName(SchemaObject obj, String rel) {
+	public String getName(SchemaObject obj, String rel) {
 		if (obj.getParent() == null) {
 			switch (obj.getType()) {
 			case COMPLEX_TYPE:
-				return getComplexTypePrefix()+rel+obj.getName();
+				return ontRoot+getComplexTypePrefix()+rel+obj.getName();
 			case ELEMENT:
-				return rel+obj.getName();
+				return ontRoot+rel+obj.getName();
 			case ATTRIBUTE_GROUP:
-				return getAttributeGroupPrefix()+rel+obj.getName();
+				return ontRoot+getAttributeGroupPrefix()+rel+obj.getName();
 			case SIMPLE_TYPE:
-				return rel+obj.getName();
+				return ontRoot+rel+obj.getName();
 			}
 		} else {
 			SchemaObject o = obj;
@@ -575,13 +594,13 @@ public class OntologyGenerator extends SchemaConversionBase {
 			name = name.substring(0, name.length()-1);
 			switch (prev.getType()) {
 			case COMPLEX_TYPE:
-				return getComplexTypePrefix()+rel+name;
+				return ontRoot+getComplexTypePrefix()+rel+name;
 			case ELEMENT:
-				return rel+name;
+				return ontRoot+rel+name;
 			case ATTRIBUTE_GROUP:
-				return getAttributeGroupPrefix()+rel+name;
+				return ontRoot+getAttributeGroupPrefix()+rel+name;
 			case SIMPLE_TYPE:
-				return rel+name;
+				return ontRoot+rel+name;
 			}
 		}
 		throw new RuntimeException();