Bug fix to importer and exporter generation for simpleType top level

elements.

Change-Id: I4f8df343ddfcf9c19e24d4d8563be64b3103fa54

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java
index 8a2785f18848b71d9df00e3cd8896ab4aac7ba11..cb0f7629f2ca38f28f16a7d9cc11313f6dc6444c 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/SchemaConversionBase.java
@@ -1393,12 +1393,15 @@ public final class SchemaConversionBase {
                                QName type = topLevelElement.getType();
                                if (!type.getNamespaceURI().equals(SCHEMA_NS)) {
                                        SchemaObject obj = complexTypeName.get(type.getLocalPart());
-       //                              if (obj == null)
-       //                                      obj = simpleTypeName.get(type.getLocalPart());
                                        if (obj != null) {
                                                inheritance.baseClass = getName(obj);
                                                inheritance.type = InheritanceType.ComplexType;
                                        }
+                                       else {
+                                               obj = simpleTypeName.get(type.getLocalPart());
+                                               if (obj != null)
+                                                       getAtomicTypeInheritance(type, inheritance);
+                                       }
                                } else {
                                        TypeEntry entry = getTypeEntry(type);
                                        if (entry != null) {