From: Reino Ruusu <reino.ruusu@vtt.fi>
Date: Wed, 28 Jun 2017 15:03:14 +0000 (+0300)
Subject: Bug fix to importer and exporter generation for simpleType top level
X-Git-Tag: v1.31.0~14
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=12cd5c3850b4907ca8e40286bf8e386b5440be6d;p=simantics%2Finterop.git

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 8a2785f..cb0f762 100644
--- 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) {