Schema conversion updates (necessary for Proteus PID Profile schema)

[simantics/interop.git] / org.simantics.xml.sax / src / org / simantics / xml / sax / ImporterGenerator.java

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
index cff87ed72fcfc43ef3b65ac1d5090eadf687c287..eb99b5324ab2eb7e5f786bd011564b359c5b8d7f 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/ImporterGenerator.java
@@ -525,7 +525,8 @@ public class ImporterGenerator extends SchemaConversionBase{
                        String binding = getBindingFromPrimitiveType(base);\r
                        writeAttribute(fw, attrName, relationName, binding, isReference);\r
                } else {\r
-                       throw new RuntimeException("Cannot resolve type for Attribute " + attrName + " -> " + primitiveType.getLocalPart());\r
+                       //throw new RuntimeException("Cannot resolve type for Attribute " + attrName + " -> " + primitiveType.getLocalPart());\r
+                       //writeAttribute(fw, attrName, relationName, binding, isReference);\r
                }\r
        }\r
        \r
@@ -607,7 +608,8 @@ public class ImporterGenerator extends SchemaConversionBase{
                // 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