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
// return "Float.parseFloat(value)";\r
// return "value";\r
// }\r
- protected String getValueGetter(TypeEntry binding,String name) {\r
+ protected String getValueGetterMethod(TypeEntry binding,String name) {\r
if (binding == null)\r
return name+".getValue()";\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
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
}\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
- TypeEntry binding = getTypeEntry(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
// 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(" {");\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")+", "+binding.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
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, "+arrayBinding+");");\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
+ if (topLevelElementObj.getElement() != null && topLevelElementObj.getElement().getName().equals("ByteString"))\r
+ System.out.println();\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
Code Review / simantics / interop.git / blobdiff