import javax.xml.namespace.QName;\r
\r
import org.simantics.utils.datastructures.BijectionMap;\r
+import org.simantics.xml.sax.SchemaConversionBase.InheritanceType;\r
+import org.simantics.xml.sax.SchemaConversionBase.RefType;\r
+import org.simantics.xml.sax.SchemaObject.ObjectType;\r
import org.simantics.xml.sax.configuration.AttributeComposition;\r
import org.simantics.xml.sax.configuration.Configuration;\r
import org.simantics.xml.sax.configuration.IDProvider;\r
\r
String name = getName(complexTypeObj);\r
\r
-// if (topLevelComplexType.getName().equals("Reference"))\r
+ //if (topLevelComplexType.getName().equals("LocalizedText"))\r
+ //if (topLevelComplexType.getName().equals("Reference"))\r
+// if (topLevelComplexType.getName().equals("NodeIdAlias"))\r
// System.out.println();\r
\r
String className = name;//"_"+name;\r
throw new RuntimeException(e);\r
}\r
writers.put(complexTypeObj, fw);\r
-\r
- String baseClass = getBaseClass();\r
- \r
- boolean inherited = false;\r
\r
- QName type = getComplexTypeBase(topLevelComplexType);\r
- if (type != null && !type.getNamespaceURI().equals("http://www.w3.org/2001/XMLSchema")) {\r
- SchemaObject obj = complexTypeName.get(type.getLocalPart());\r
- if (obj != null) {\r
- baseClass = getName(obj);\r
- inherited = true;\r
- }\r
- }\r
+ Inheritance inheritance = getInheritance(complexTypeObj);\r
\r
provider = getIDProvider(topLevelComplexType);\r
List<IDReference> references = getIDReferences(topLevelComplexType);\r
intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");\r
\r
createClassHeader(fw.writer, false);\r
- writeClass(fw.writer,false, null, className, baseClass, intrerfaces);\r
+ writeClass(fw.writer,false, null, className, inheritance.baseClass, intrerfaces);\r
\r
writeIDProvider(fw.writer);\r
\r
if (stringWriter.getBuffer().length() > 0) {\r
fw.writer.write(stringWriter.toString());\r
}\r
- \r
- \r
+ if (inheritance.type == InheritanceType.ComplexType) {\r
+ fw.writer.println(" return super.connectChild(graph,element,child);");\r
+ }else{\r
fw.writer.println(" return false;");\r
+ }\r
fw.writer.println(" }");\r
fw.writer.println();\r
\r
\r
fw.writer.println(" @Override");\r
fw.writer.println(" public void configure(WriteGraph graph, Deque<ParserElement> parents, ParserElement element) throws DatabaseException {");\r
- if (inherited) {\r
+ if (inheritance.type == InheritanceType.ComplexType) {\r
fw.writer.println(" super.configure(graph,parents,element);");\r
}\r
fw.writer.println(" "+getOntologyImport());\r
\r
fw.writer.println(" }");\r
\r
+ if (inheritance.type == InheritanceType.AtomicType) {\r
+ fw.writer.println();\r
+ fw.writer.println(" @Override");\r
+ fw.writer.println(" public void configure(WriteGraph graph, ParserElement element, java.lang.String string) throws DatabaseException {");\r
+ fw.writer.println(" graph.claimValue(element.getData(), "+getValueGetter(inheritance.atomicType,"string")+", "+inheritance.atomicType.binding+");");\r
+ fw.writer.println(" }");\r
+ }\r
+ \r
writeIDReferences(fw.writer,name, references);\r
writeUnknownChild(fw.writer,name,unknownChildElement);\r
\r
}\r
\r
@Override\r
- //protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, boolean reference, String ref, QName refType) {\r
protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType referenceType) {\r
FileWriter fw = getWriter(parent);\r
+ String objectName;\r
if (referenceType != RefType.Element) {\r
QName refType;\r
if (referenceType == RefType.Type) {\r
refType = element.getElement().getType();\r
if (refName == null)\r
refName = element.getElement().getName();\r
+ objectName = element.getElement().getName();\r
} else {\r
refType = element.getElement().getRef();\r
if (refName == null)\r
refName = refType.getLocalPart();\r
+ objectName = refType.getLocalPart();\r
}\r
\r
String binding = getBindingFromPrimitiveType(refType);\r
SchemaObject refElement = elementName.get(refType.getLocalPart());\r
SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart());\r
\r
- String className = null;\r
- String refClassName = null;\r
+ // prefer element reference over complex type reference\r
+ String primaryClassName = null;\r
+ String secondaryClassName = null;\r
if (refElement != null)\r
- className = getName(refElement);\r
+ primaryClassName = getName(refElement);\r
else\r
- className = getName(refComplexType);\r
+ primaryClassName = getName(refComplexType);\r
\r
if (refComplexType != null) {\r
- refClassName = getName(refComplexType);\r
+ secondaryClassName = getName(refComplexType);\r
} else {\r
- refClassName = getName(refElement);\r
+ secondaryClassName = getName(refElement);\r
}\r
\r
- if (referenceType != RefType.Reference)\r
- fw.writer.println(" addParser(\""+ refName +"\", "+className+".class);");\r
- else\r
- fw.writer.println(" addParser("+className+".class);");\r
- if (!className.equals(refClassName))\r
- fw.writer.println(" addParser("+refClassName+".class);");\r
+ if (referenceType == RefType.Type) {\r
+ // create internal class for handling the element and child attachment\r
+ secondaryClassName = getName(parent) +"_" +objectName;\r
+ fw.writer.println(" addParser(\""+ objectName +"\", "+secondaryClassName+".class);");\r
+ fw.delayedWriter2.println(" public static class " + secondaryClassName +" extends " + primaryClassName +"{");\r
+ fw.delayedWriter2.println(" public "+ secondaryClassName +"(){");\r
+ fw.delayedWriter2.println(" }");\r
+ fw.delayedWriter2.println(" }");\r
+ } else { // referenceType == RefType.Reference\r
+ fw.writer.println(" addParser("+primaryClassName+".class);");\r
+ if (!primaryClassName.equals(secondaryClassName))\r
+ fw.writer.println(" addParser("+secondaryClassName+".class);");\r
+ }\r
\r
- fw.delayedWriter.println(" if (child.getElementParser() instanceof "+refClassName+"){");\r
+ fw.delayedWriter.println(" if (child.getElementParser() instanceof "+secondaryClassName+"){");\r
fw.delayedWriter.println(" graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+refName + ", child.getData());");\r
if (useElementList(parent, indicator,element, referenceType == RefType.Reference, refName, refType)) {\r
\r
writers.put(elementObj, fw);\r
boolean isList = false;\r
\r
- Inheritance inhertiance = getElementInheritance(elementObj); \r
+ Inheritance inheritance = getInheritance(elementObj); \r
\r
provider = getIDProvider(element);\r
List<IDReference> references = getIDReferences(element);\r
intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");\r
\r
createClassHeader(fw.writer, isList);\r
- writeClass(fw.writer,false, element.getName(), className, inhertiance.baseClass, intrerfaces);\r
+ writeClass(fw.writer,false, element.getName(), className, inheritance.baseClass, intrerfaces);\r
writeIDProvider(fw.writer);\r
fw.writer.println(" @Override");\r
fw.writer.println(" public Resource create(WriteGraph graph, ParserElement element) throws DatabaseException{");\r
\r
fw.writer.println(" @Override");\r
fw.writer.println(" public void configure(WriteGraph graph, Deque<ParserElement> parents, ParserElement element) throws DatabaseException {");\r
- if (inhertiance.type == InheritanceType.ComplexType) {\r
+ if (inheritance.type == InheritanceType.ComplexType) {\r
fw.writer.println(" super.configure(graph,parents,element);");\r
}\r
fw.writer.println(" "+getOntologyImport());\r
} \r
fw.writer.println(" }");\r
\r
- if (inhertiance.type == InheritanceType.AtomicType) {\r
+ if (inheritance.type == InheritanceType.AtomicType) {\r
fw.writer.println();\r
fw.writer.println(" @Override");\r
fw.writer.println(" public void configure(WriteGraph graph, ParserElement element, java.lang.String string) throws DatabaseException {");\r
- fw.writer.println(" graph.claimValue(element.getData(), "+getValueGetter(inhertiance.atomicType,"string")+", "+inhertiance.atomicType.binding+");");\r
+ fw.writer.println(" graph.claimValue(element.getData(), "+getValueGetter(inheritance.atomicType,"string")+", "+inheritance.atomicType.binding+");");\r
fw.writer.println(" }");\r
}\r
// if (simpleType != null) {\r
if (stringWriter.getBuffer().length() > 0) {\r
fw.writer.write(stringWriter.toString());\r
}\r
- if (inhertiance.type == InheritanceType.ComplexType) {\r
+ if (inheritance.type == InheritanceType.ComplexType) {\r
fw.writer.println(" return super.connectChild(graph,element,child);"); \r
} else {\r
fw.writer.println(" return false;");\r
}\r
\r
@Override\r
- protected String getBaseClass() {\r
+ protected String getBaseClass(ObjectType type) {\r
return "org.simantics.xml.sax.base.XMLElementNamedChildParserBase";\r
}\r
\r
Code Review / simantics / interop.git / blobdiff