X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FExporterGenerator.java;fp=org.simantics.xml.sax%2Fsrc%2Forg%2Fsimantics%2Fxml%2Fsax%2FExporterGenerator.java;h=c5c3f5ec32bfe9ba7fe4191b782eadbccb43c56c;hb=09fb8eafbc9046ead17f0529eebad0b0caf55e2b;hp=1976664fa73b758358a20d98a162379fc5e07381;hpb=404be73748777cdd2d09b2f29308ae6f4a3d730c;p=simantics%2Finterop.git diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java index 1976664..c5c3f5e 100644 --- a/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java +++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/ExporterGenerator.java @@ -11,6 +11,8 @@ import java.util.Map; import javax.xml.namespace.QName; import org.simantics.utils.datastructures.BijectionMap; +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.IDProvider; @@ -122,7 +124,7 @@ public class ExporterGenerator extends JavaGenerator{ } @Override - protected String getBaseClass() { + protected String getBaseClass(ObjectType type) { return "org.simantics.xml.sax.base.XMLElementNamedChildWriterBase"; } @@ -146,20 +148,21 @@ public class ExporterGenerator extends JavaGenerator{ } writers.put(complexTypeObj, fw); - String baseClass = getBaseClass(); - - boolean inherited = false; - - QName type = getComplexTypeBase(topLevelComplexType); - if (type != null && !type.getNamespaceURI().equals("http://www.w3.org/2001/XMLSchema")) { - SchemaObject obj = complexTypeName.get(type.getLocalPart()); -// if (obj == null) -// obj = simpleTypeName.get(type.getLocalPart()); - if (obj != null) { - baseClass = getName(obj); - inherited = true; - } - } +// String baseClass = getBaseClass(ObjectType.COMPLEX_TYPE); +// +// boolean inherited = false; + +// QName type = getComplexTypeBase(topLevelComplexType); +// if (type != null && !type.getNamespaceURI().equals("http://www.w3.org/2001/XMLSchema")) { +// SchemaObject obj = complexTypeName.get(type.getLocalPart()); +//// if (obj == null) +//// obj = simpleTypeName.get(type.getLocalPart()); +// if (obj != null) { +// baseClass = getName(obj); +// inherited = true; +// } +// } + Inheritance inheritance = getInheritance(complexTypeObj); provider = getIDProvider(topLevelComplexType); // List references = getIDReferences(topLevelComplexType); @@ -172,7 +175,7 @@ public class ExporterGenerator extends JavaGenerator{ // intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser"); createClassHeader(fw.writer); - writeClass(fw.writer,false, topLevelComplexType.getName(), className, baseClass, Collections.EMPTY_LIST); + writeClass(fw.writer,false, topLevelComplexType.getName(), className, inheritance.baseClass, Collections.EMPTY_LIST); // writeIDProvider(fw.writer); @@ -225,7 +228,8 @@ public class ExporterGenerator extends JavaGenerator{ if (stringWriter.getBuffer().length() > 0) { fw.writer.write(stringWriter.toString()); } - + if (inheritance.type == InheritanceType.ComplexType) + fw.writer.println(" super.children(graph,instance,result);"); fw.writer.println(" }"); fw.writer.println(); @@ -242,7 +246,7 @@ public class ExporterGenerator extends JavaGenerator{ fw.writer.println(" @Override"); fw.writer.println(" public void attributes(ReadGraph graph, WriterElement instance, Collection attributes, XMLStreamWriter writer) throws XMLStreamException, DatabaseException{"); - if (inherited) { + if (inheritance.type == InheritanceType.ComplexType) { fw.writer.println(" super.attributes(graph,instance,attributes,writer);"); } fw.writer.println(" "+getOntologyImport()); @@ -252,6 +256,14 @@ public class ExporterGenerator extends JavaGenerator{ fw.writer.println(" }"); fw.writer.println(" }"); + if (inheritance.type == InheritanceType.AtomicType) { + fw.writer.println(); + fw.writer.println(" @Override"); + fw.writer.println(" public void characters(ReadGraph graph, WriterElement instance, XMLStreamWriter writer) throws XMLStreamException, DatabaseException {"); + fw.writer.println(" writer.writeCharacters("+inheritance.atomicType.getToString("graph.getValue(instance.getResource(),"+inheritance.atomicType.binding+")")+");"); + fw.writer.println(" }"); + } + // writeIDReferences(fw.writer,name, references); // writeUnknownChild(fw.writer,name,unknownChildElement); @@ -267,19 +279,21 @@ public class ExporterGenerator extends JavaGenerator{ @Override - //protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, boolean reference, String ref, QName refType) { protected void handleIndicator(SchemaObject parent, SchemaElement indicator, SchemaElement element, String refName, RefType referenceType) { FileWriter fw = getWriter(parent); + String objectName; if (referenceType != RefType.Element) { QName refType; if (referenceType == RefType.Type) { refType = element.getElement().getType(); if (refName == null) refName = element.getElement().getName(); + objectName = element.getElement().getName(); } else { refType = element.getElement().getRef(); if (refName == null) refName = refType.getLocalPart(); + objectName = refType.getLocalPart(); } String binding = getBindingFromPrimitiveType(refType); @@ -287,26 +301,39 @@ public class ExporterGenerator extends JavaGenerator{ SchemaObject refElement = elementName.get(refType.getLocalPart()); SchemaObject refComplexType = complexTypeName.get(refType.getLocalPart()); - String className = null; - String refClassName = null; + // prefer element reference over complex type reference + String primaryClassName = null; + String secondaryClassName = null; if (refElement != null) - className = getName(refElement); + primaryClassName = getName(refElement); else - className = getName(refComplexType); + primaryClassName = getName(refComplexType); if (refComplexType != null) { - refClassName = getName(refComplexType); + secondaryClassName = getName(refComplexType); } else { - refClassName = getName(refElement); + secondaryClassName = getName(refElement); } - if (referenceType != RefType.Reference) - fw.writer.println(" addTypeWriter("+ontShort+ className +", "+className+".class);"); - else - fw.writer.println(" addWriter("+className+".class);"); - if (!className.equals(refClassName)) - fw.writer.println(" addWriter("+refClassName+".class);"); - + if (referenceType == RefType.Type) { + // create internal class for handling the element and child attachment + secondaryClassName = getName(parent) +"_" +objectName; + fw.writer.println(" addRelationWriter("+ontShort+ getName(parent)+"_has"+refName +", "+secondaryClassName+".class);"); + fw.delayedWriter2.println(" public static class " + secondaryClassName +" extends " + primaryClassName +"{"); + fw.delayedWriter2.println(" public "+ secondaryClassName +"(ReadGraph graph){"); + fw.delayedWriter2.println(" super(graph);"); + fw.delayedWriter2.println(" }"); + fw.delayedWriter2.println(" "); + fw.delayedWriter2.println(" @Override"); + fw.delayedWriter2.println(" public java.lang.String getElementId() {"); + fw.delayedWriter2.println(" return \"" + refName +"\";"); + fw.delayedWriter2.println(" }"); + fw.delayedWriter2.println(" }"); + } else { //referenceType == RefType.Reference + fw.writer.println(" addWriter("+primaryClassName+".class);"); + if (!primaryClassName.equals(secondaryClassName)) + fw.writer.println(" addWriter("+secondaryClassName+".class);"); + } // fw.delayedWriter.println(" if (child.getElementParser() instanceof "+refClassName+"){"); // fw.delayedWriter.println(" graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());"); if (useElementList(parent, indicator,element, referenceType == RefType.Reference, refName, refType)) { @@ -643,7 +670,7 @@ public class ExporterGenerator extends JavaGenerator{ writers.put(elementObj, fw); boolean isList = false; - Inheritance inhertiance = getElementInheritance(elementObj); + Inheritance inheritance = getInheritance(elementObj); provider = getIDProvider(element); List references = getIDReferences(element); @@ -656,7 +683,7 @@ public class ExporterGenerator extends JavaGenerator{ // intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser"); createClassHeader(fw.writer); - writeClass(fw.writer,false, element.getName(), className, inhertiance.baseClass, Collections.EMPTY_LIST); + writeClass(fw.writer,false, element.getName(), className, inheritance.baseClass, Collections.EMPTY_LIST); // writeIDProvider(fw.writer); fw.writer.println(" @Override"); fw.writer.println(" public Resource getType(ReadGraph graph) throws DatabaseException {"); @@ -684,7 +711,7 @@ public class ExporterGenerator extends JavaGenerator{ fw.writer.println(" @Override"); fw.writer.println(" public void attributes(ReadGraph graph, WriterElement instance, Collection attributes, XMLStreamWriter writer) throws XMLStreamException, DatabaseException{"); - if (inhertiance.type == InheritanceType.ComplexType) { + if (inheritance.type == InheritanceType.ComplexType) { fw.writer.println(" super.attributes(graph,instance,attributes,writer);"); } fw.writer.println(" "+getOntologyImport()); @@ -713,7 +740,7 @@ public class ExporterGenerator extends JavaGenerator{ // } // fw.writer.println(" }"); - if (inhertiance.type == InheritanceType.AtomicType) { + if (inheritance.type == InheritanceType.AtomicType) { fw.writer.println(); // fw.writer.println(" @Override"); // fw.writer.println(" public void configure(WriteGraph graph, ParserElement element, java.lang.String string) throws DatabaseException {"); @@ -721,7 +748,7 @@ public class ExporterGenerator extends JavaGenerator{ // fw.writer.println(" }"); fw.writer.println(" @Override"); fw.writer.println(" public void characters(ReadGraph graph, WriterElement instance, XMLStreamWriter writer) throws XMLStreamException, DatabaseException {"); - fw.writer.println(" writer.writeCharacters("+inhertiance.atomicType.getToString("graph.getValue(instance.getResource(),"+inhertiance.atomicType.binding+")")+");"); + fw.writer.println(" writer.writeCharacters("+inheritance.atomicType.getToString("graph.getValue(instance.getResource(),"+inheritance.atomicType.binding+")")+");"); // fw.writer.println(" graph.claimValue(element.getData(),"+getValueGetter(binding)+", "+binding.binding +");"); fw.writer.println(" }"); } @@ -756,7 +783,7 @@ public class ExporterGenerator extends JavaGenerator{ fw.writer.write(stringWriter.toString()); } - if (inhertiance.type == InheritanceType.ComplexType) { + if (inheritance.type == InheritanceType.ComplexType) { fw.writer.println(" super.children(graph,instance,result);"); }