Merge "Attribute namespace handling overrides."

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

diff --git a/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java b/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
index aea2ff050d7fa2dceb39e8a84615b3eefe23d8d5..3aea73436367a3ab596f94a5e9854f83c3bb8dc5 100644 (file)
--- a/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
+++ b/org.simantics.xml.sax/src/org/simantics/xml/sax/OntologyGenerator.java
@@ -605,6 +605,8 @@ public class OntologyGenerator implements SchemaConversionComponent {
                                return obj.getLibShortName()+"."+getAttributeGroupPrefix()+rel+obj.getName();
                        case SIMPLE_TYPE:
                                return obj.getLibShortName()+"."+getSimpleTypePrefix()+rel+obj.getName();
+                       case ATTRIBUTE:
+                               return obj.getLibShortName()+"."+rel+obj.getName();
                        }
                } else {
                        SchemaObject o = obj;
@@ -626,6 +628,8 @@ public class OntologyGenerator implements SchemaConversionComponent {
                                return obj.getLibShortName()+"."+getAttributeGroupPrefix()+rel+name;
                        case SIMPLE_TYPE:
                                return obj.getLibShortName()+"."+getSimpleTypePrefix()+rel+name;
+                       case ATTRIBUTE:
+                               return obj.getLibShortName()+"."+rel+obj.getName();
                        }
                }
                throw new RuntimeException();