Index: lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl
diff -u lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.19 lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.20
--- lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.19	Wed Dec 21 20:02:40 2005
+++ lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl	Fri Feb 10 09:37:12 2006
@@ -7,7 +7,7 @@
                 extension-element-prefixes="extensions redirect"
                 xmlns="http://www.codelutin.org/lutingenerator/objectModel"
                 xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator"
-                xmlns:UML="org.omg.xmi.namespace.UML">
+                xmlns:UML="org.omg.xmi.namespace.UML" xmlns:UML2="org.omg.xmi.namespace.UML2">
 
   <xsl:output method="xml" 
               encoding="ISO-8859-1"
@@ -500,11 +500,17 @@
           <xsl:text>true</xsl:text>
         </xsl:attribute>
       </xsl:if>
-      
+
       <xsl:variable name="id">
-        <xsl:value-of select="UML:StructuralFeature.type/*/@xmi.idref"/>
+        <xsl:value-of select="UML2:TypedElement.type/*/@xmi.idref"/>
       </xsl:variable>
 
+      <xsl:if test="concat($id,'none')='none'">
+        <xsl:variable name="id">
+          <xsl:value-of select="UML:StructuralFeature.type/*/@xmi.idref"/>
+        </xsl:variable>
+      </xsl:if>
+
       <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::*[@xmi.id = $id]">
         <xsl:attribute name="type">
           <xsl:call-template name="packagePathOfWithDot"/>