import javax.xml.namespace.QName;\r
\r
import org.simantics.utils.datastructures.BijectionMap;\r
-import org.simantics.utils.datastructures.Pair;\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
ontShort +=".";\r
String parserPackagePostfix = "_elem";\r
String importerClassPostfix = "Importer";\r
+ String parserClassPostfix = "Parser";\r
elementPackageName = name+parserPackagePostfix;\r
\r
importParserDir= new File(converter.getParserDir().getAbsolutePath()+"/"+elementPackageName);\r
importParserDir.mkdirs();\r
\r
handle(schema);\r
- \r
- File importParserFile = new File(converter.getParserDir().getAbsolutePath()+"/"+name+importerClassPostfix+".java");\r
- PrintWriter mainWriter = createFile(importParserFile);\r
+ // Create Importer class\r
+ File importerFile = new File(converter.getParserDir().getAbsolutePath()+"/"+name+importerClassPostfix+".java");\r
+ PrintWriter mainWriter = createFile(importerFile);\r
mainWriter.println("package " + converter.getPluginName() +";");\r
mainWriter.println();\r
mainWriter.println("import java.io.File;");\r
mainWriter.println("import org.simantics.db.Session;");\r
mainWriter.println("import org.simantics.xml.sax.base.AbstractImporter;");\r
- mainWriter.println("import org.simantics.xml.sax.base.XMLParser;");\r
mainWriter.println();\r
mainWriter.println("public class " + name + importerClassPostfix+" extends AbstractImporter {");\r
mainWriter.println();\r
mainWriter.println(" public " + name + importerClassPostfix+"(Session session, File file) {");\r
- mainWriter.println(" super(session,file);");\r
+ mainWriter.println(" super(session, file, new "+name + parserClassPostfix+"());");\r
mainWriter.println(" }");\r
mainWriter.println();\r
- mainWriter.println(" @Override");\r
- mainWriter.println(" public void configure(XMLParser parser) {");\r
+// mainWriter.println(" @Override");\r
+// mainWriter.println(" public void configure(XMLParser parser) {");\r
+// for (String s : ruleClassNames) {\r
+// mainWriter.println(" parser.add(new "+s+"());");\r
+// }\r
+// mainWriter.println(" }");\r
+ mainWriter.println("}");\r
+ \r
+ mainWriter.println();\r
+ mainWriter.flush();\r
+ mainWriter.close();\r
+ \r
+ // Create Parser class\r
+ File parserFile = new File(converter.getParserDir().getAbsolutePath()+"/"+name+parserClassPostfix+".java");\r
+ mainWriter = createFile(parserFile);\r
+ mainWriter.println("package " + converter.getPluginName() +";");\r
+ mainWriter.println();\r
+ mainWriter.println("import org.simantics.xml.sax.base.XMLParser;");\r
+ mainWriter.println();\r
+ mainWriter.println("public class " + name + parserClassPostfix+" extends XMLParser {");\r
+ mainWriter.println();\r
+ mainWriter.println(" public " + name + parserClassPostfix+"() {");\r
+ if (schema.getTargetNamespace() != null)\r
+ mainWriter.println(" setSchemaURI(\""+schema.getTargetNamespace()+"\");");\r
for (String s : ruleClassNames) {\r
- mainWriter.println(" parser.add(new "+s+"());");\r
+ mainWriter.println(" add(new "+s+"());");\r
}\r
mainWriter.println(" }");\r
mainWriter.println("}");\r
return writer;\r
}\r
\r
- protected String getValueGetter(String binding,String name) {\r
+// protected String getValueGetter(String binding,String name) {\r
+// if (binding == null)\r
+// return name+".getValue()";\r
+// if ("STRING".equals(binding))\r
+// return name+".getValue()";\r
+// if ("BOOLEAN".equals(binding))\r
+// return "Boolean.parseBoolean("+name+".getValue())";\r
+// if ("INTEGER".equals(binding))\r
+// return "Integer.parseInt("+name+".getValue())";\r
+// if ("DOUBLE".equals(binding))\r
+// return "Double.parseDouble("+name+".getValue())";\r
+// if ("FLOAT".equals(binding))\r
+// return "Float.parseFloat("+name+".getValue())";\r
+// return name+".getValue()";\r
+// }\r
+// protected String getValueGetter(String binding) {\r
+// if (binding == null)\r
+// return "value";\r
+// if ("STRING".equals(binding))\r
+// return "value";\r
+// if ("BOOLEAN".equals(binding))\r
+// return "Boolean.parseBoolean(value)";\r
+// if ("INTEGER".equals(binding))\r
+// return "Integer.parseInt(value)";\r
+// if ("DOUBLE".equals(binding))\r
+// return "Double.parseDouble(value)";\r
+// if ("FLOAT".equals(binding))\r
+// return "Float.parseFloat(value)";\r
+// return "value";\r
+// }\r
+ protected String getValueGetterMethod(TypeEntry binding,String name) {\r
if (binding == null)\r
return name+".getValue()";\r
- if ("STRING".equals(binding))\r
- return name+".getValue()";\r
- if ("BOOLEAN".equals(binding))\r
- return "Boolean.parseBoolean("+name+".getValue())";\r
- if ("INTEGER".equals(binding))\r
- return "Integer.parseInt("+name+".getValue())";\r
- if ("DOUBLE".equals(binding))\r
- return "Double.parseDouble("+name+".getValue())";\r
- if ("FLOAT".equals(binding))\r
- return "Float.parseFloat("+name+".getValue())";\r
- return name+".getValue()";\r
- }\r
- \r
- protected String getValueGetter(String binding) {\r
+ return binding.getValueGetterMethod(name);\r
+ }\r
+ \r
+ protected String getValueGetter(TypeEntry binding,String name) {\r
+ if (binding == null)\r
+ return name;\r
+ return binding.getValueGetter(name);\r
+ }\r
+ protected String getValueGetter(TypeEntry binding) {\r
if (binding == null)\r
return "value";\r
- if ("STRING".equals(binding))\r
- return "value";\r
- if ("BOOLEAN".equals(binding))\r
- return "Boolean.parseBoolean(value)";\r
- if ("INTEGER".equals(binding))\r
- return "Integer.parseInt(value)";\r
- if ("DOUBLE".equals(binding))\r
- return "Double.parseDouble(value)";\r
- if ("FLOAT".equals(binding))\r
- return "Float.parseFloat(value)";\r
- return "value";\r
+ return binding.getValueGetter();\r
}\r
\r
protected void handle(TopLevelAttribute topLevelAttribute) {\r
intrerfaces.add("org.simantics.xml.sax.base.UnrecognizedElementParser");\r
\r
createClassHeader(fw.writer, isList);\r
- writeClass(fw.writer,true, null, className, baseClass, intrerfaces);\r
+ writeClass(fw.writer,false, null, className, baseClass, intrerfaces);\r
\r
writeIDProvider(fw.writer);\r
\r
if (!className.equals(refClassName))\r
fw.writer.println(" addParser("+refClassName+".class);");\r
\r
- fw.delayedWriter.println(" if (child.getParser() instanceof "+refClassName+"){");\r
+ fw.delayedWriter.println(" if (child.getElementParser() instanceof "+refClassName+"){");\r
fw.delayedWriter.println(" graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");\r
if (useElementList(parent, indicator,element, reference, ref, refType)) {\r
\r
if (useOriginalList(parent, indicator,element, reference, ref, refType)) {\r
// generic list\r
fw.delayedWriter.println(" {");\r
- fw.delayedWriter.println(" Resource list = graph.getPossibleObject(element.getData(),"+ontShort+"XML_hasOriginalElementList);");\r
+ //fw.delayedWriter.println(" Resource list = graph.getPossibleObject(element.getData(),"+ontShort+"XML_hasOriginalElementList);");\r
+ fw.delayedWriter.println(" XMLResource XML = XMLResource.getInstance(graph);");\r
+ fw.delayedWriter.println(" Resource list = graph.getPossibleObject(element.getData(), XML.hasOriginalElementList);");\r
fw.delayedWriter.println(" if (list == null) {");\r
fw.delayedWriter.println(" list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
- fw.delayedWriter.println(" graph.claim(element.getData(),"+ontShort+"XML_hasOriginalElementList,list);");\r
+ //fw.delayedWriter.println(" graph.claim(element.getData(),"+ontShort+"XML_hasOriginalElementList,list);");\r
+ fw.delayedWriter.println(" graph.claim(element.getData(), XML.hasOriginalElementList,list);");\r
fw.delayedWriter.println(" } else {");\r
fw.delayedWriter.println(" org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
fw.delayedWriter.println(" }");\r
fw.writer.println(" addParser(\""+ ref +"\", "+getName(parent) +"_" +ref+".class);");\r
\r
fw.delayedWriter2.println(" public static class " + getName(parent) +"_" +ref+" extends org.simantics.xml.sax.base.ValueElementParser {");\r
- fw.delayedWriter2.println(" "+ getName(parent) +"_" +ref +"(){");\r
- fw.delayedWriter2.println(" super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", Bindings."+binding+");");\r
+ fw.delayedWriter2.println(" public "+ getName(parent) +"_" +ref +"(){");\r
+ fw.delayedWriter2.println(" super(\""+ref+"\"," +this.ontologyClassName+".URIs."+getName(parent) + "_has"+ref+", "+binding+");");\r
fw.delayedWriter2.println(" }");\r
fw.delayedWriter2.println(" }");\r
}\r
else\r
fw.writer.println(" addParser("+className+".class);");\r
\r
- fw.delayedWriter.println(" if (child.getParser() instanceof "+className+"){");\r
+ fw.delayedWriter.println(" if (child.getElementParser() instanceof "+className+"){");\r
fw.delayedWriter.println(" graph.claim(element.getData(), "+ontShort+getName(parent)+"_has"+ref + ", child.getData());");\r
if (useElementList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {\r
\r
if (useOriginalList(parent, indicator,element, reference, ref, new QName(obj.getName()))) {\r
// generic list\r
fw.delayedWriter.println(" {");\r
- fw.delayedWriter.println(" Resource list = graph.getPossibleObject(element.getData(),"+ontShort+"XML_hasOriginalElementList);");\r
+ //fw.delayedWriter.println(" Resource list = graph.getPossibleObject(element.getData(),"+ontShort+"XML_hasOriginalElementList);");\r
+ fw.delayedWriter.println(" XMLResource XML = XMLResource.getInstance(graph);");\r
+ fw.delayedWriter.println(" Resource list = graph.getPossibleObject(element.getData(), XML.hasOriginalElementList);");\r
fw.delayedWriter.println(" if (list == null) {");\r
fw.delayedWriter.println(" list = org.simantics.db.common.utils.ListUtils.create(graph, java.util.Collections.singletonList(child.getData()));");\r
- fw.delayedWriter.println(" graph.claim(element.getData(),"+ontShort+"XML_hasOriginalElementList,list);");\r
+ //fw.delayedWriter.println(" graph.claim(element.getData(),"+ontShort+"XML_hasOriginalElementList,list);");\r
+ fw.delayedWriter.println(" graph.claim(element.getData(), XML.hasOriginalElementList,list);");\r
fw.delayedWriter.println(" } else {");\r
fw.delayedWriter.println(" org.simantics.db.common.utils.ListUtils.insertBack(graph, list, java.util.Collections.singletonList(child.getData()));");\r
fw.delayedWriter.println(" }");\r
FileWriter fw = getWriter(parent);\r
if (primitiveType != null) {\r
\r
- String binding = getBindingFromPrimitiveType(primitiveType);\r
+ //String binding = getBindingFromPrimitiveType(primitiveType);\r
+ TypeEntry binding = getTypeEntry(primitiveType);\r
\r
if (binding != null) {\r
writeAttribute(fw, attrName, relationName, binding, isReference);\r
}\r
} \r
if (simpleType != null) {\r
- Restriction restriction = simpleType.getRestriction();\r
- if (restriction == null)\r
- throw new RuntimeException("Cannot resolve type for Attribute " + attrName + " -> " + primitiveType.getLocalPart()+ ", SimpleType restriction is unset");\r
- QName base = restriction.getBase();\r
- \r
- \r
- String binding = getBindingFromPrimitiveType(base);\r
- writeAttribute(fw, attrName, relationName, binding, isReference);\r
+ org.w3._2001.xmlschema.List list = simpleType.getList();\r
+ if (list != null) {\r
+ TypeEntry binding = getTypeEntry(new QName(SCHEMA_NS, "string"));\r
+ writeAttribute(fw, attrName, relationName, binding, isReference);\r
+ } else {\r
+ Restriction restriction = simpleType.getRestriction();\r
+ if (restriction == null)\r
+ throw new RuntimeException("Cannot resolve type for Attribute " + attrName + " -> " + primitiveType.getLocalPart()+ ", SimpleType restriction is unset");\r
+ QName base = restriction.getBase();\r
+ \r
+ \r
+ //String binding = getBindingFromPrimitiveType(base);\r
+ TypeEntry binding = getTypeEntry(base);\r
+ writeAttribute(fw, attrName, relationName, binding, isReference);\r
+ }\r
} else {\r
- throw new RuntimeException("Cannot resolve type for Attribute " + attrName + " -> " + primitiveType.getLocalPart());\r
+ // TODO : using default String attribute should be configured with rules.\r
+ //throw new RuntimeException("Cannot resolve type for Attribute " + attrName + " -> " + primitiveType.getLocalPart());\r
+ fw.writer.println(" //FIXME: Cannot resolve type for Attribute " + attrName + " Using default type String");\r
+ //writeAttribute(fw, attrName, relationName, "STRING", isReference);\r
+ writeAttribute(fw, attrName, relationName, getTypeEntry("string"), isReference);\r
}\r
}\r
\r
- private void writeAttribute(FileWriter fw, String attrName, String relationName, String binding, boolean isReference) {\r
+ //private void writeAttribute(FileWriter fw, String attrName, String relationName, String binding, boolean isReference) {\r
+ private void writeAttribute(FileWriter fw, String attrName, String relationName, TypeEntry binding, boolean isReference) {\r
fw.writer.println(" {");\r
fw.writer.println(" Attribute a = element.getAttribute(\"" +attrName+"\");");\r
fw.writer.println(" if (a != null) {");\r
- fw.writer.println(" graph.claimLiteral(element.getData(),"+relationName+","+getValueGetter(binding,"a")+", Bindings."+binding+");");\r
+ fw.writer.println(" graph.claimLiteral(element.getData(),"+relationName+","+getValueGetterMethod(binding,"a")+", "+binding.binding+");");\r
if (isReference)\r
fw.writer.println(" idProviderValue = a.getValue();"); \r
fw.writer.println(" }");\r
QName base = restriction.getBase();\r
\r
\r
- String binding = getBindingFromPrimitiveType(base);\r
+ //String binding = getBindingFromPrimitiveType(base);\r
+ TypeEntry binding = getTypeEntry(base);\r
fw.writer.println(" @Override");\r
fw.writer.println(" public void configure(WriteGraph graph, Element element, java.lang.String value) throws DatabaseException {");\r
- fw.writer.println(" graph.claimValue(element.getData(),"+getValueGetter(binding)+", Bindings."+binding+");");\r
+ //fw.writer.println(" graph.claimValue(element.getData(),"+getValueGetter(binding)+", Bindings."+binding+");");\r
+ fw.writer.println(" graph.claimValue(element.getData(),"+getValueGetter(binding)+", "+binding.binding +");");\r
fw.writer.println(" }");\r
\r
}\r
// FIXME : handle optional attributes properly.\r
for (org.simantics.xml.sax.configuration.Attribute a : composition.getAttribute()) {\r
Attribute attribute = ((Attribute)attributes.getRight(a));\r
- QName atype = getBaseType(attribute);\r
+ //QName atype = getBaseType(attribute);\r
+ QName atype = getPrimitiveType(attribute);\r
String defaultValue = attribute.getDefault();\r
if (defaultValue == null)\r
defaultValue = getDefaultValue(atype);\r
\r
- String binding = getBindingFromPrimitiveType(atype);\r
+ //String binding = getBindingFromPrimitiveType(atype);\r
+ TypeEntry binding = getTypeEntry(atype);\r
if (i > 0)\r
fw.writer.print(",");\r
if (defaultValue != null)\r
- fw.writer.print("a"+(i)+"!= null ? "+ getValueGetter(binding,"a"+(i++)) + " : " +defaultValue);\r
+ fw.writer.print("a"+(i)+"!= null ? "+ getValueGetterMethod(binding,"a"+(i++)) + " : " +defaultValue);\r
else\r
- fw.writer.print(getValueGetter(binding,"a"+(i++)));\r
+ fw.writer.print(getValueGetterMethod(binding,"a"+(i++)));\r
}\r
fw.writer.println("};");\r
- fw.writer.println(" graph.claimLiteral(element.getData(),"+relationName+", value, Bindings."+arrayBinding+");");\r
+ fw.writer.println(" graph.claimLiteral(element.getData(),"+relationName+", value, "+arrayBinding+");");\r
fw.writer.println(" }");\r
\r
}\r
writers.put(elementObj, fw);\r
boolean isList = false;\r
\r
- Pair<String, Boolean> inhertiance = getElementInheritance(elementObj);\r
- boolean inherited = inhertiance.second;\r
- String baseClass = inhertiance.first;//"org.simantics.xml.sax.base.XMLElementParserBase";\r
- \r
+ Inheritance inhertiance = getElementInheritance(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, baseClass, intrerfaces);\r
+ writeClass(fw.writer,false, element.getName(), className, inhertiance.baseClass, intrerfaces);\r
writeIDProvider(fw.writer);\r
fw.writer.println(" @Override");\r
fw.writer.println(" public Resource create(WriteGraph graph, Element element) throws DatabaseException{");\r
\r
fw.writer.println(" @Override");\r
fw.writer.println(" public void configure(WriteGraph graph, Deque<Element> parents, Element element) throws DatabaseException {");\r
- if (inherited) {\r
+ if (inhertiance.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
+ fw.writer.println();\r
+ fw.writer.println(" @Override");\r
+ fw.writer.println(" public void configure(WriteGraph graph, Element 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(" }");\r
+ }\r
if (simpleType != null) {\r
SchemaObject obj = simpleTypes.get(simpleType);\r
handleElementSimpleTypeAttributes(obj);\r
if (stringWriter.getBuffer().length() > 0) {\r
fw.writer.write(stringWriter.toString());\r
}\r
- if (inherited) {\r
+ if (inhertiance.type == InheritanceType.ComplexType) {\r
fw.writer.println(" return super.connectChild(graph,element,child);"); \r
} else {\r
fw.writer.println(" return false;");\r
ruleClassNames.add(converter.getPluginName()+"."+elementPackageName+"."+name);\r
}\r
\r
- private Pair<String,Boolean> getElementInheritance(SchemaObject topLevelElementObj) {\r
+ private enum InheritanceType{ComplexType,AtomicType,None};\r
+ \r
+ private class Inheritance {\r
+ public String baseClass;\r
+ public InheritanceType type;\r
+ public TypeEntry atomicType;\r
+ \r
+ public Inheritance() {\r
+ baseClass = "org.simantics.xml.sax.base.XMLElementNamedChildParserBase";\r
+ type = InheritanceType.None;\r
+ }\r
+ }\r
+ \r
+ private Inheritance getElementInheritance(SchemaObject topLevelElementObj) {\r
Element topLevelElement = topLevelElementObj.getElement();\r
- String baseClass = "org.simantics.xml.sax.base.XMLElementNamedChildParserBase";\r
- boolean inherited = false;\r
+ Inheritance inheritance = new Inheritance();\r
if (topLevelElement.getType() != null) {\r
QName type = topLevelElement.getType();\r
if (!type.getNamespaceURI().equals(SCHEMA_NS)) {\r
SchemaObject obj = complexTypeName.get(type.getLocalPart());\r
- baseClass = getName(obj);\r
- inherited = true;\r
- } \r
+// if (obj == null)\r
+// obj = simpleTypeName.get(type.getLocalPart());\r
+ if (obj != null) {\r
+ inheritance.baseClass = getName(obj);\r
+ inheritance.type = InheritanceType.ComplexType;\r
+ }\r
+ } else {\r
+ TypeEntry entry = getTypeEntry(type);\r
+ if (entry != null) {\r
+ inheritance.type = InheritanceType.AtomicType;\r
+ inheritance.atomicType = entry;\r
+ }\r
+ }\r
}\r
- if (!inherited) {\r
+ if (inheritance.type == InheritanceType.None) {\r
QName type = getElementBase(topLevelElement);\r
if (type != null) {\r
if (!type.getNamespaceURI().equals(SCHEMA_NS)) {\r
SchemaObject obj = getWithName(topLevelElementObj, type.getLocalPart());\r
- baseClass = getName(obj);\r
- inherited = true;\r
- } \r
+ inheritance.baseClass = getName(obj);\r
+ inheritance.type = InheritanceType.ComplexType;\r
+ } else {\r
+ TypeEntry entry = getTypeEntry(type);\r
+ if (entry != null) {\r
+ inheritance.type = InheritanceType.AtomicType;\r
+ inheritance.atomicType = entry;\r
+ }\r
+ }\r
}\r
}\r
- if (!inherited) {\r
+ if (inheritance.type == InheritanceType.None) {\r
QName type = topLevelElement.getSubstitutionGroup();\r
if (type != null) {\r
if (!type.getNamespaceURI().equals(SCHEMA_NS)) {\r
SchemaObject obj = getWithName(topLevelElementObj, type.getLocalPart());\r
- baseClass = getName(obj);\r
- inherited = true;\r
- } \r
+ inheritance.baseClass = getName(obj);\r
+ inheritance.type = InheritanceType.ComplexType;\r
+ } else {\r
+ TypeEntry entry = getTypeEntry(type);\r
+ if (entry != null) {\r
+ inheritance.type = InheritanceType.AtomicType;\r
+ inheritance.atomicType = entry;\r
+ }\r
+ }\r
}\r
}\r
\r
- return new Pair<String, Boolean>(baseClass, inherited);\r
+ return inheritance;\r
}\r
\r
private void writeClass(PrintWriter writer,boolean abst, String name, String className, String baseClass, List<String> interfaces) {\r
writer.println("import org.simantics.db.exception.DatabaseException;");\r
writer.println("import org.simantics.xml.sax.base.Attribute;");\r
writer.println("import org.simantics.xml.sax.base.Element;");\r
+ writer.println("import org.simantics.xml.sax.ontology.XMLResource;");\r
if (!isList) {\r
writer.println("import org.simantics.layer0.Layer0;");\r
} else {\r