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=f98a85f5673785e292347149b5865cde0454f392;hb=d788a05e77b983199f0982a0e56629e7fc30c691;hp=0b7aa3c00aefa89263005c0a2fd87bf2fd3f849a;hpb=bcfe73ff5f614ff83f20ce7bf5bfc0fa1b045978;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 0b7aa3c..f98a85f 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,8 +11,11 @@ import java.util.Set;
 import javax.xml.namespace.QName;
 
 import org.simantics.utils.datastructures.BijectionMap;
+import org.simantics.xml.sax.SchemaConversionBase.Inheritance;
+import org.simantics.xml.sax.SchemaConversionBase.InheritanceType;
+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;
 import org.simantics.xml.sax.configuration.IDReference;
 import org.w3._2001.xmlschema.Annotated;
 import org.w3._2001.xmlschema.Attribute;
@@ -21,51 +24,35 @@ import org.w3._2001.xmlschema.Element;
 import org.w3._2001.xmlschema.LocalComplexType;
 import org.w3._2001.xmlschema.LocalSimpleType;
 import org.w3._2001.xmlschema.NamedAttributeGroup;
-import org.w3._2001.xmlschema.OpenAttrs;
+import org.w3._2001.xmlschema.NamedGroup;
 import org.w3._2001.xmlschema.Restriction;
 import org.w3._2001.xmlschema.Schema;
 import org.w3._2001.xmlschema.SimpleType;
-import org.w3._2001.xmlschema.TopLevelAttribute;
 
-public class OntologyGenerator extends SchemaConversionBase {
+//public class OntologyGenerator extends SchemaConversionBase {
+public class OntologyGenerator implements SchemaConversionComponent {
+	SchemaConversionBase base;
 	
-	public OntologyGenerator(Configuration configuration) {
-		super(configuration);
+	public OntologyGenerator(SchemaConverter converter, SchemaConversionBase base) {
+		this.base = base;
+		this.converter = converter;
+		this.schema = base.schema;
+		this.ontologyUri = base.ontologyURI;
+		this.className = base.className;		
 	}
 
 	String ontRoot = "ONT.";
 	String commentTag = "//";
 	
 	Schema schema;
-	
+	String ontologyUri;
 	String className;
 	
 	SchemaConverter converter;
 	
 	PrintWriter writer = null;
 	
-	public String getClassName() {
-		return className;
-	}
-	
-	public void createOntology(Schema schema, SchemaConverter converter) throws FileNotFoundException {
-		this.schema = schema;
-		this.converter = converter;
-		
-//		for (OpenAttrs attrs : schema.getIncludeOrImportOrRedefine()) {
-//			if (attrs instanceof Annotation) {
-//				Annotation ann = (Annotation)attrs;
-//				for (Object o : ann.getAppinfoOrDocumentation()) {
-//					if (o instanceof Documentation) {
-//						Documentation doc = (Documentation)o;
-//					} else if (o instanceof Appinfo) {
-//						Appinfo info = (Appinfo)o;
-//					}
-//				}
-//			}
-//		}
-		
-		
+	public void createOntology() throws FileNotFoundException {
 		StringWriter stringWriter = null;
 		if (converter.getOntologyFile() == null) {
 			stringWriter = new StringWriter();
@@ -74,7 +61,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 			writer = new PrintWriter(converter.getOntologyFile());
 		}
 	
-		handle(schema);
+		handle();
 		
 		writer.flush();
 		writer.close();
@@ -82,76 +69,41 @@ public class OntologyGenerator extends SchemaConversionBase {
 			System.out.println(stringWriter.toString());
 	}
 	
-	protected void handle(Schema schema) {
-		String ontologyName = schema.getTargetNamespace();
-		if (ontologyName == null) {
-			ontologyName = converter.getSchemaFile().getName();
-			
-			int index = ontologyName.lastIndexOf(".");
-			if (index > 0)
-				ontologyName = ontologyName.substring(0, index);
-		} 
-		if (!ontologyName.startsWith("http"))
-			ontologyName = "http://" + ontologyName;
-		String parts[] = ontologyName.split("/");
-		String name = parts[parts.length-1];
-		ontRoot = name.substring(0, Math.min(3, name.length())).toUpperCase();
-		String version = schema.getVersion();
-		if (version == null)
-			version = "1.0";
-		
-		name = name.replaceAll("\\.", "_");
-		name = name.replaceAll(" ", "_");
-		className = converter.getPluginName() + "." + name;
-		
+	protected void handle() {
+		ontRoot = converter.shortName;
+
 		for (String s : converter.getHeader()) {
 			writer.println(commentTag + " " + s);	
 		}
 		writer.println();
 		writer.println("L0 = <http://www.simantics.org/Layer0-1.1>");
+		writer.println("XML = <http://www.simantics.org/XML-1.0>");
 		writer.println();
-		writer.println(ontRoot + " = <" + ontologyName +"-"+ version+"> : L0.Ontology");
+		writer.println(ontRoot + " = <" + ontologyUri +"> : L0.Ontology");
 		writer.println("   @L0.new");
 		writer.println("   L0.HasResourceClass \"" + className +"\"");
 		writer.println();
 		writer.println();
 		
 		ontRoot += ".";
-		// TODO : these could be created in separate base ontology.
-		writer.println(commentTag + " Built-in types");
-		writer.println();
-		writer.println(ontRoot+"XML : L0.Library");
-		writer.println(ontRoot+"XML.hasAttribute <R L0.HasProperty");
-		writer.println(ontRoot+"XML.hasID <R "+ontRoot+"XML.hasAttribute : L0.FunctionalRelation");
-		writer.println("  --> L0.String");
-		writer.println(ontRoot+"XML.ComplexType <T L0.Entity");
-		writer.println(ontRoot+"XML.hasComplexType <R L0.IsComposedOf");
-		writer.println(ontRoot+"XML.AttributeGroup  <T L0.Entity");
-		writer.println(ontRoot+"XML.Element <T L0.Entity");
-		writer.println(ontRoot+"XML.hasElement <R L0.IsComposedOf");
-		writer.println(ontRoot+"XML.ElementList <T L0.List");
-		writer.println(ontRoot+"XML.hasElementList <R L0.IsComposedOf");
-		writer.println(ontRoot+"XML.hasOriginalElementList <R " + ontRoot+"XML.hasElementList");
-		writer.println(ontRoot+"XML.hasReference <R L0.IsRelatedTo");
-		writer.println(ontRoot+"XML.hasExternalReference <R L0.IsRelatedTo");
-		writer.println("   L0.InverseOf " + ontRoot+"XML.externalReferenceOf <R L0.IsRelatedTo");
-		writer.println();
 		writer.println(ontRoot+"ComplexTypes : L0.Library");
 		writer.println(ontRoot+"AttributeGroups : L0.Library");
 		writer.println();
 		writer.println(commentTag + " Interpreted from schema");
 		writer.println();
 			
-		super.handle(schema);
+		base.handle(this);
 	}
 		
 	protected String getType(QName qtype) {
-		String ontType = getL0TypeFromPrimitiveType(qtype);
+		String ontType = base.getL0TypeFromPrimitiveType(qtype);
 		if (ontType != null)
 			return ontType;
-		else if (isComplexTypeRef(qtype.getLocalPart()))
+		else if (base.isComplexTypeRef(qtype.getLocalPart()))
 			return ontRoot+getComplexTypePrefix()+qtype.getLocalPart();
-		else if (isElementRef(qtype.getLocalPart()))
+		else if (base.isSimpleTypeRef(qtype.getLocalPart()))
+			return ontRoot+qtype.getLocalPart();
+		else if (base.isElementRef(qtype.getLocalPart()))
 			return ontRoot+qtype.getLocalPart();
 		else if (qtype.getPrefix() != null && qtype.getPrefix().length() > 0) {
 			return ontRoot+qtype.getPrefix()+qtype.getLocalPart();
@@ -159,149 +111,151 @@ public class OntologyGenerator extends SchemaConversionBase {
 		throw new RuntimeException("Reference to unknown type " + qtype.getLocalPart());
 	}
 	
-	@Override
-	protected void handle(TopLevelAttribute topLevelAttribute) {
-		super.handle(topLevelAttribute);
-		writer.println();
-	}
-	
-	@Override
-	protected void handleSimpleType(SchemaObject topLevelSimpleType) {
-		super.handleSimpleType(topLevelSimpleType);
-		writer.println();
-	}
-	
-	
-	public static String getComplexTypePrefix() {
+	public String getComplexTypePrefix() {
 		return "ComplexTypes.";
 	}
 	
-	public static String getAttributeGroupPrefix() {
+	public String getAttributeGroupPrefix() {
 		return "AttributeGroups.";
 	}
 	
-	@Override
-	protected void handle(SchemaObject parent, SchemaElement indicator, List<SchemaElement> elements) {
-		if (indicator.getType() == SchemaElement.ElementType.SEQUENCE || (indicator.getType() == SchemaElement.ElementType.CHOICE && indicator.getRestriction().many())) {
-			for (SchemaElement e : elements) {
-				handle(parent, indicator, e);
+	public void handleChoice(SchemaObject parent, SchemaElement indicator, java.util.List<SchemaElement> elements, String name) {
+		boolean single = true;
+		for (SchemaElement e : elements) {
+			if (e.getRestriction().many()) {
+				single = false;
+				break;
 			}
-		} else if (indicator.getType() == SchemaElement.ElementType.CHOICE) {
-			String name = getChoiceName(elements);
-			boolean single = true;
-			for (SchemaElement e : elements) {
-				if (e.getRestriction().many()) {
-					single = false;
-					break;
-				}
-			}
-			String relationName = ontRoot+getName(parent)+".has"+name;
-			writer.print(relationName);
+		}
+		String relationName = getName(parent)+".has"+name;
+		writer.print(relationName);
+		
+		List<String> types = new ArrayList<String>();
+		for (SchemaElement e : elements) {
+			Element localElement = e.getElement();
+			QName refType = null;
+			String type = null;
 			
-			List<String> types = new ArrayList<String>();
-			for (SchemaElement e : elements) {
-				Element localElement = e.getElement();
-				QName refType = null;
-				String type = null;
-				
-				if (localElement.getName() != null) {
-					refType = localElement.getType();
-					type = getL0TypeFromPrimitiveType(refType);	
-				} else if (localElement.getRef() != null) {
-					refType = localElement.getRef();
-					type = getL0TypeFromPrimitiveType(refType);
-				}
-				if (type == null) {
-					SchemaObject obj = getWithName(parent, refType.getLocalPart());
-					types.add(ontRoot+getName(obj,"has"));
-				} 
+			if (localElement.getName() != null) {
+				refType = localElement.getType();
+				type = base.getL0TypeFromPrimitiveType(refType);	
+			} else if (localElement.getRef() != null) {
+				refType = localElement.getRef();
+				type = base.getL0TypeFromPrimitiveType(refType);
 			}
-			if (types.size() > 0) {
-				for (String type : types) {
-					writer.print(" <R " + type);
-				}
-			} else {
-				writer.print(" <R " +  ontRoot+"XML.hasElement");
+			if (type == null) {
+				SchemaObject obj = base.getWithName(parent, refType.getLocalPart());
+				types.add(getName(obj,"has"));
+			} 
+		}
+		if (types.size() > 0) {
+			for (String type : types) {
+				writer.print(" <R " + type);
 			}
-			
-			writer.println();
-			
-			for (SchemaElement e : elements) {
-				Element localElement = e.getElement();
-				QName refType = null;
-				String type = null;
-				if (localElement.getName() != null) {
-					refType = localElement.getType();
-					type = getType(refType);	
-				} else if (localElement.getRef() != null) {
-					refType = localElement.getRef();
-					type = getType(refType);
-				}
-				if (type != null) {
-					writer.println("   --> " + type);
-				}
+		} else {
+			writer.print(" <R XML.hasElement");
+		}
+		
+		writer.println();
+		
+		for (SchemaElement e : elements) {
+			Element localElement = e.getElement();
+			QName refType = null;
+			String type = null;
+			if (localElement.getName() != null) {
+				refType = localElement.getType();
+				type = getType(refType);	
+			} else if (localElement.getRef() != null) {
+				refType = localElement.getRef();
+				type = getType(refType);
 			}
-			if (!single) {
-				writer.println(ontRoot+name+ "List <T "+ontRoot+"XML.ElementList");
-				if (types.size() == 0) {
-				writer.println(relationName+ "List <R "+ontRoot+"XML.hasElementList : L0.FunctionalRelation");
-				} else {
-					writer.print(relationName+ "List");
-					for (String type : types) {
-						writer.print(" <R " + type+"List");
-					}
-					writer.println(" : L0.FunctionalRelation");
+			if (type != null) {
+				writer.println("   --> " + type);
+			}
+		}
+		if (!single) {
+			writer.println(ontRoot+name+ "List <T XML.ElementList");
+			if (types.size() == 0) {
+			writer.println(relationName+ "List <R XML.hasElementList : L0.FunctionalRelation");
+			} else {
+				writer.print(relationName+ "List");
+				for (String type : types) {
+					writer.print(" <R " + type+"List");
 				}
-				writer.println("   --> " + ontRoot+name+"List");
+				writer.println(" : L0.FunctionalRelation");
 			}
+			writer.println("   --> " + ontRoot+name+"List");
 		}
-		
-	}
+	};
 	
 	
 	
 	@Override
-	protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, boolean reference, String refName, QName refType) {
-		String type = getL0TypeFromPrimitiveType(refType);
-		SchemaObject obj = null;
-		if (type == null) {
-			obj = getWithName(parent, refType.getLocalPart());
+	public void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType refType) {
+		if (refType != refType.Element) {
+			QName referenceType = null;
+			if (refType == RefType.Type) {
+				referenceType = element.getElement().getType();
+				//refName = element.getElement().getName()
+				SchemaObject eObj = base.elements.get(element.getElement());
+				if (refName == null)
+					refName = eObj.getName();
+			} else {
+				referenceType = element.getElement().getRef();
+				if (refName == null)
+					refName = referenceType.getLocalPart();
+			}
+			String type = base.getL0TypeFromPrimitiveType(referenceType);
+			SchemaObject obj = null;
+			if (type == null) {
+				obj = base.getWithName(parent, referenceType.getLocalPart());
+				
+				writer.println(getName(parent)+".has"+refName + " <R " +  getName(obj,"has"));
+				writer.println("   --> " + getName(obj));
+			} else {
+				writer.println(getName(parent)+".has"+refName + " <R XML.hasElement");
+				writer.println("   --> " + getType(referenceType));
+			}
 			
-			writer.println(ontRoot+getName(parent)+".has"+refName + " <R " +  ontRoot+ getName(obj,"has"));
-			writer.println("   --> " + ontRoot+getName(obj));
+			if (base.useElementList(parent, indicator,element, refType == RefType.Reference, refName, referenceType)) {
+				
+				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");
+				} else {
+					writer.println(getName(parent)+"."+refName + "List <T XML.ElementList");
+					writer.println(getName(parent)+".has"+refName + "List <R XML.hasElementList : L0.FunctionalRelation");	
+				}
+			}
 		} else {
-			writer.println(ontRoot+getName(parent)+".has"+refName + " <R " +  ontRoot+"XML.hasElement");
-			writer.println("   --> " + getType(refType));
-		}
-		
-		if (useElementList(parent, indicator,element, reference, refName, refType)) {
+			Element attrs = element.getElement();
+			SchemaObject obj = base.getWithObj(parent, attrs);
+			if (refName == null)
+				refName = obj.getName();
 			
-			if (type == null) {
-				writer.println(ontRoot+getName(parent)+"."+refName + "List <T "  + ontRoot+"XML.ElementList");
-				writer.println(ontRoot+getName(parent)+".has"+refName + "List <R " +  ontRoot+getName(obj,"has")+"List : L0.FunctionalRelation");
-			} else {
-				writer.println(ontRoot+getName(parent)+"."+refName + "List <T "  + ontRoot+"XML.ElementList");
-				writer.println(ontRoot+getName(parent)+".has"+refName + "List <R " +  ontRoot+"XML.hasElementList : L0.FunctionalRelation");	
+			writer.println(getName(parent)+".has"+refName + " <R " + getName(obj,"has"));
+			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");
 			}
 		}
+		
 	}
-	protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, boolean reference, String refName, OpenAttrs attrs) {
-		SchemaObject obj = getWithObj(parent, attrs);
-		writer.println(ontRoot+getName(parent)+".has"+refName + " <R " +  ontRoot+ getName(obj,"has"));
-		writer.println("   --> " + ontRoot+getName(obj));
-		if (useElementList(parent, indicator,element, reference, refName, new QName(obj.getName()))) {
-			writer.println(ontRoot+getName(parent)+"."+refName + "List <T "  + ontRoot+"XML.ElementList");
-			writer.println(ontRoot+getName(parent)+".has"+refName + "List <R " +  ontRoot+getName(obj,"has")+"List : L0.FunctionalRelation");
-		}
+	
+	@Override
+	public void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement any) {
+		
 	}
 	
 	@Override
-	protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement any) {
+	public void handle(SchemaObject parent, NamedGroup attribute) {
+		// TODO Auto-generated method stub
 		
 	}
 		
 	@Override
-	protected void handle(SchemaObject parent, Attribute attribute) {
+	public void handle(SchemaObject parent, Attribute attribute) {
 		String name = attribute.getName();
 		QName primitiveType = attribute.getType();
 		LocalSimpleType simpleType = attribute.getSimpleType();
@@ -312,11 +266,11 @@ public class OntologyGenerator extends SchemaConversionBase {
 		if (name != null) {
 			relationName = ontRoot+"has"+name;
 			if (parent != null)
-				relationName = ontRoot+getName(parent)+".has"+name;
-			relationType = ontRoot+"XML.hasAttribute";
+				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();
@@ -324,11 +278,11 @@ public class OntologyGenerator extends SchemaConversionBase {
 		boolean id = false;
 		String ontType = null;
 		if (primitiveType != null) {
-			ontType = getL0TypeFromPrimitiveType(primitiveType);
+			ontType = base.getL0TypeFromPrimitiveType(primitiveType);
 			if (ontType != null) {
-				id = getTypeEntry(primitiveType).id;
+				id = base.getTypeEntry(primitiveType).id;
 				if (id)
-					relationType = ontRoot+"XML.hasID";
+					relationType = "XML.hasID";
 			} else {
 				
 			}
@@ -339,7 +293,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 			QName base = restriction.getBase();
 			
 			
-			ontType = getL0TypeFromPrimitiveType(base);
+			ontType = this.base.getL0TypeFromPrimitiveType(base);
 			
 //			for (Object facetWrap : restriction.getFacets()) {
 //				JAXBElement<?> element = (JAXBElement<?>)facetWrap;
@@ -361,7 +315,7 @@ public class OntologyGenerator extends SchemaConversionBase {
 	}
 	
 	@Override
-	protected void handleAttributes(SchemaObject simpleTypeObj) {
+	public void handleAttributes(SchemaObject simpleTypeObj) {
 //		SchemaObject parent = simpleTypeObj.getParent();
 //		SimpleType simpleType = simpleTypeObj.getSimpleType();
 //		Restriction restriction = simpleType.getRestriction();
@@ -370,115 +324,184 @@ public class OntologyGenerator extends SchemaConversionBase {
 	}
 	
 	@Override
-	protected void handle(SchemaObject parent, AttributeGroup attributeGroup) {
+	public void handle(SchemaObject parent, AttributeGroup attributeGroup) {
 		if (parent == null) {
 			NamedAttributeGroup group = (NamedAttributeGroup)attributeGroup;
-			writer.println(ontRoot+getAttributeGroupPrefix()+group.getName()+ " <T " + ontRoot +"XML.AttributeGroup");
+			writer.println(ontRoot+getAttributeGroupPrefix()+group.getName()+ " <T XML.AttributeGroup");
 			SchemaObject obj = new SchemaObject(parent,attributeGroup);
 			for (Annotated annotated : group.getAttributeOrAttributeGroup()) {
 				if (annotated instanceof Attribute) {
 					//handle(getAttributeGroupPrefix()+group.getName(),(Attribute)annotated);
 					handle(obj,(Attribute)annotated);
 				} else if (annotated instanceof AttributeGroup) {
-					throw new RuntimeException("Cannot handle nested attribute groups");
+					handle(obj,(AttributeGroup)annotated);
+					//throw new RuntimeException("Cannot handle nested attribute groups");
 				}
 			}
 		} else {
-			writer.println(ontRoot+getName(parent) +" L0.Inherits " + ontRoot + getAttributeGroupPrefix() + attributeGroup.getRef().getLocalPart());
+			writer.println(getName(parent) +" L0.Inherits " + ontRoot + getAttributeGroupPrefix() + attributeGroup.getRef().getLocalPart());
 		}
 		
 	}
 	
 	@Override
-	protected void handleAttributeComposition(SchemaObject parent, AttributeComposition composition, BijectionMap<org.simantics.xml.sax.configuration.Attribute, Annotated> attributes) {
+	public void handleAttributeComposition(SchemaObject parent, AttributeComposition composition, BijectionMap<org.simantics.xml.sax.configuration.Attribute, Annotated> attributes) {
 		Attribute compositionAttribute = new Attribute();
 		compositionAttribute.setName(composition.getName());
-		QName type = new QName(CONVERSION_NS, composition.getType());
+		QName type = new QName(SchemaConversionBase.CONVERSION_NS, composition.getType());
 		compositionAttribute.setType(type);
 		handle(parent, compositionAttribute);
 	}
 	
 	@Override
-	protected void handleSimpleType(SchemaObject parent, SchemaObject simpleTypeObj) {
+	public void handleSimpleType(SchemaObject parent, SchemaObject simpleTypeObj) {
 		SimpleType simpleType = simpleTypeObj.getSimpleType();
 		String name = simpleType.getName();
-		Restriction restriction = simpleType.getRestriction();
-		if (restriction == null || simpleType.getUnion() != null || simpleType.getId() != null)
-			throw new RuntimeException();
-		QName base = restriction.getBase();
 		
-		String relationName = ontRoot+"has"+name;
-		if (parent != null)
-			relationName = ontRoot+getName(parent)+".has"+name;
-		
-		writer.println(relationName+ " <R "+ontRoot+"XML.hasAttribute : L0.FunctionalRelation");
-		
-		String ontType = getL0Type(base);
-		writer.println("   --> " + ontType);
+		org.w3._2001.xmlschema.List list = simpleType.getList();
+		if (list != null) {
+			// TODO : process restriction in lists
+			String relationName = ontRoot+"has"+name;
+			if (parent != null)
+				relationName = getName(parent)+".has"+name;
+			writer.println(relationName+ " <R XML.hasAttribute : L0.FunctionalRelation");
+			
+			String ontType = base.getL0Type(new QName(SchemaConversionBase.SCHEMA_NS, "string"));
+			writer.println("   --> " + ontType);
+		} else {
+			String relationName = ontRoot+"has"+name;
+			if (parent != null)
+				relationName = getName(parent)+".has"+name;
+			
+			writer.println(relationName+ " <R XML.hasAttribute : L0.FunctionalRelation");
+			
+			QName base = this.base.getSimpleTypeBase(simpleType);
+			Inheritance inheritance = new Inheritance("");
+			this.base.getAtomicTypeInheritance(base, inheritance);
+			if (inheritance.atomicType == null)
+				throw new RuntimeException("Could not locate atomic type for SimpleType " + simpleType.getName());
+			writer.println("   --> " + inheritance.atomicType.l0Type);
+			
+//			Restriction restriction = simpleType.getRestriction();
+//			if (restriction != null) {
+//				
+//				QName base = restriction.getBase();
+//				String ontType = getL0Type(base);
+//				writer.println("   --> " + ontType);
+//			} else if (simpleType.getId() != null) {
+//				throw new RuntimeException(simpleType.getName() + " restriction error");
+//			} else if (simpleType.getUnion() != null) {
+//				Union union = simpleType.getUnion();
+//				String ontType = null;
+//				if (union.getMemberTypes().size() > 0) {
+//					for (QName type : union.getMemberTypes()) {
+//						String sType = null;
+//						TypeEntry entry = getTypeEntry(type);
+//						if (entry == null) {
+//							SchemaObject obj = simpleTypeName.get(type.getLocalPart());
+//							Inheritance inheritance = new Inheritance("");
+//							getAtomicTypeInheritance(type, obj, inheritance);
+//							sType = inheritance.atomicType.l0Type;
+//						} else {
+//							sType = entry.l0Type;
+//						}
+//						if (ontType == null)
+//							ontType = sType;
+//						else if (!ontType.equals(sType))
+//							throw new RuntimeException(simpleType.getName() + " union has incompatible member types");
+//					}
+//				} else {
+//					if (union.getSimpleType().size() == 0)
+//						throw new RuntimeException(simpleType.getName() + " union error");
+//					for (SimpleType s : union.getSimpleType()) {
+//						if (restriction == null)
+//							restriction = s.getRestriction();
+//						else  {
+//							Restriction r = s.getRestriction();
+//							if (!r.getBase().equals(restriction.getBase()))
+//								throw new RuntimeException(simpleType.getName() + " union has incompatible restriction bases");
+//						}
+//					}
+//					QName base = restriction.getBase();
+//					ontType = getL0Type(base);
+//				}
+//				writer.println("   --> " + ontType);
+//			} else {
+//				throw new RuntimeException(simpleType.getName() + " restriction error");
+//			}
+			
+		}
 	}
 	
 	@Override
-	protected void handleComplexType(SchemaObject topLevelComplexType) {
+	public void handleComplexType(SchemaObject topLevelComplexType) {
 		String name = getName(topLevelComplexType);
-		if (name.contains("Pcurve"))
-			System.out.println();
-//		if (parent != null)
-//			name = parent +"_"+name;
+//		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 "+ontRoot+"XML.hasComplexType");
-		writer.println(relationName+ "List <R "+ontRoot+"XML.hasElementList");
+		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 = ontRoot+"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 = base.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);
-		super.handleComplexType(topLevelComplexType);
+//		if (!baseType.equals(inheritance.baseClass))
+//			System.out.println();
+		//super.handleComplexType(topLevelComplexType);
+		base.handleComplexTypeAttributes(topLevelComplexType);
+		base.handleComplexTypeExtension(topLevelComplexType);
+		base.handleExtensionAttributes(topLevelComplexType);
 		writer.println();
 	}
 	
 	@Override
-	protected void handleElement(SchemaObject elementObj) {
+	public void handleElement(SchemaObject elementObj) {
 		Element element = elementObj.getElement();
 		String name = getName(elementObj);//element.getName();
 		
-//		if ("Presentation".equals(name))
-//			System.out.println();
-
-//		if (parent != null)
-//			name = parent +"_"+name;
+		if ("Text".equals(name))
+			System.out.println();
 		
-		String type = ontRoot+"XML.Element";
+		String type = "XML.Element";
 		Set<String> types = new LinkedHashSet<String>();
 		if (element.getType() != null) {
 			types.add(getType(element.getType()));
 		}
-		QName base = getElementBase(element);
+		QName base = this.base.getElementBase(element);
 		if (base != null) {
-			if (base.getNamespaceURI().equals(SCHEMA_NS)) {
-				String l0Type = getL0Type(base);
+			if (base.getNamespaceURI().equals(SchemaConversionBase.SCHEMA_NS)) {
+				String l0Type = this.base.getL0Type(base);
 				if (l0Type == null)
 					throw new RuntimeException("Cannot get L0 type for " + base.getLocalPart());
 				types.add(l0Type);
-			} else if (isElementRef(base.getLocalPart()))
+			} else if (this.base.isElementRef(base.getLocalPart()))
 				types.add(ontRoot+base.getLocalPart());
 			else
 				types.add(ontRoot+getComplexTypePrefix()+base.getLocalPart());
 		}
 		QName substitution = element.getSubstitutionGroup();
 		if (substitution != null) {
-			if (isElementRef(substitution.getLocalPart()))
+			if (this.base.isElementRef(substitution.getLocalPart()))
 				types.add(ontRoot+substitution.getLocalPart());
 			else
 				types.add( ontRoot+getComplexTypePrefix()+substitution.getLocalPart());
@@ -487,48 +510,58 @@ 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();
 //		}
-		writer.println(relationName+ " <R "+ontRoot+"XML.hasElement");
-		writer.println(relationName+ "List <R "+ontRoot+"XML.hasElementList");
+		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();
 		
 		if (complexType != null) {
-			SchemaObject complexTypeObj = complexTypes.get(complexType);
-			handleElementComplexTypeAttributes(complexTypeObj);
-			handleComplexTypeExtension(complexTypeObj);
+			SchemaObject complexTypeObj = this.base.complexTypes.get(complexType);
+			this.base.handleElementComplexTypeAttributes(complexTypeObj);
+			this.base.handleComplexTypeExtension(complexTypeObj);
 		} else if (simpleType != null) {
-			SchemaObject simpleTypeObj = simpleTypes.get(simpleType);
-			handleElementSimpleTypeAttributes(simpleTypeObj);
+			SchemaObject simpleTypeObj = this.base.simpleTypes.get(simpleType);
+			this.base.handleElementSimpleTypeAttributes(simpleTypeObj);
 		}
 		
-		List<IDReference> references = getIDReferences(element);
+		List<IDReference> references = this.base.getIDReferences(element);
 	
 		for (IDReference ref : references) {
-			writer.println(ontRoot+name+"."+ref.getReference().getName()+ " <R " +ontRoot+"XML.hasReference");
+			writer.println(name+"."+ref.getReference().getName()+ " <R XML.hasReference");
 		}
 		
 		writer.println();
 	}
 	
-	public static String getName(SchemaObject obj) {
+	@Override
+	public 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");
+	}
+	
+	@Override
+	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;
@@ -543,30 +576,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;
@@ -581,13 +614,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();