Index: lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl
diff -u lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.23 lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.24
--- lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.23	Tue Feb 28 17:20:49 2006
+++ lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl	Fri Mar  3 10:28:35 2006
@@ -19,8 +19,6 @@
   <xsl:param name="fullPackagePath"/>
   <xsl:param name="extraPackages"/>
 
-  
-              
   <!-- 
   .
   .
@@ -147,7 +145,7 @@
       </xsl:for-each>
 
       <xsl:call-template name="UMLGeneralizations">
-        <xsl:with-param name="interfaceId">
+        <xsl:with-param name="classId">
           <xsl:value-of select="$interfaceId"/>
         </xsl:with-param>
       </xsl:call-template>
@@ -348,6 +346,18 @@
         </xsl:attribute>
       </xsl:element>
     </xsl:for-each>
+    <!-- Cas où une classe hérite d'une classe abstraite -->
+    <xsl:variable name="id">
+      <xsl:value-of select="UML:Dependency.supplier/UML:Class/@xmi.idref"/>
+    </xsl:variable>
+    <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::*[@xmi.id = $id]">
+      <xsl:element name="superclass">
+        <xsl:attribute name="name">
+          <xsl:call-template name="packagePathOfWithDot"/>
+          <xsl:value-of select="@name"/>
+        </xsl:attribute>
+      </xsl:element>
+    </xsl:for-each>
   </xsl:template>
 
   
@@ -355,14 +365,18 @@
   <xsl:template name="UMLGeneralizations">
     <xsl:param name="classId"/>
     <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::UML:Generalization[UML:Generalization.child/UML:Class/@xmi.idref=$classId]">
-      <xsl:call-template name="UMLGeneralization"/>
+      <xsl:call-template name="UMLClassGeneralization"/>
     </xsl:for-each>
     <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::UML:Generalization[UML:Generalization.child/UML:AssociationClass/@xmi.idref=$classId]">
-      <xsl:call-template name="UMLGeneralization"/>
+      <xsl:call-template name="UMLClassGeneralization"/>
+    </xsl:for-each>
+    <!-- Une généralisation peut aussi être une interface qui enrichit une autre -->
+    <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::UML:Generalization[UML:Generalization.child/UML:Interface/@xmi.idref=$classId]">
+      <xsl:call-template name="UMLInterfaceGeneralization"/>
     </xsl:for-each>
   </xsl:template>
 
-  <xsl:template name="UMLGeneralization">
+  <xsl:template name="UMLClassGeneralization">
     <xsl:variable name="id">
       <xsl:value-of select="UML:Generalization.parent/UML:Class/@xmi.idref"/>
     </xsl:variable>
@@ -382,7 +396,23 @@
     </xsl:for-each>
   </xsl:template>
 
-  
+  <xsl:template name="UMLInterfaceGeneralization">
+    <xsl:variable name="id">
+      <xsl:value-of select="UML:Generalization.parent/UML:Interface/@xmi.idref"/>
+    </xsl:variable>
+    <xsl:variable name="discriminator">
+      <xsl:value-of select="@discriminator"/>
+    </xsl:variable>
+    <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::*[@xmi.id = $id]">
+      <xsl:element name="interface">
+        <xsl:attribute name="name">
+          <xsl:call-template name="packagePathOfWithDot"/>
+          <xsl:value-of select="@name"/>
+        </xsl:attribute>
+      </xsl:element>
+    </xsl:for-each>
+  </xsl:template>
+
   
   <xsl:template name="UMLAssociations">
     <xsl:param name="classId"/>
@@ -518,15 +548,15 @@
       </xsl:if>
 
       <xsl:variable name="id">
-        <xsl:value-of select="UML2:TypedElement.type/*/@xmi.idref"/>
+        <xsl:value-of select="concat(UML:StructuralFeature.type/*/@xmi.idref,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"/>
@@ -603,6 +633,28 @@
         <xsl:call-template name="UMLComment"/>
       </xsl:for-each>
 
+      <!-- exceptions -->
+      <xsl:variable name="operationId">
+        <xsl:value-of select="@xmi.id"/>
+      </xsl:variable>
+
+      <xsl:for-each select="/XMI/XMI.content/UML:A_context_raisedSignal/UML:Operation[@xmi.idref = $operationId]">
+        <xsl:variable name="exceptionId">
+          <xsl:value-of select="following::UML:Exception/@xmi.idref"/>
+        </xsl:variable>
+        <xsl:element name="exceptionParameter">
+          <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::UML:Exception[@xmi.id = $exceptionId]">
+            <xsl:attribute name="name">
+              <xsl:value-of select="@name"/>
+            </xsl:attribute>
+            <xsl:attribute name="type">
+              <xsl:call-template name="packagePathOfWithDot"/>
+              <xsl:value-of select="parent::UML:Namespace.ownedElement/parent::UML:Class/@name"/>
+            </xsl:attribute>
+          </xsl:for-each>
+        </xsl:element>
+      </xsl:for-each>
+
     </xsl:element>
   </xsl:template>
 
@@ -615,15 +667,15 @@
       </xsl:attribute>
 
       <xsl:variable name="id">
-        <xsl:value-of select="UML2:TypedElement.type/*/@xmi.idref"/>
+        <xsl:value-of select="concat(UML:Parameter.type/*/@xmi.idref,UML2:TypedElement.type/*/@xmi.idref)"/>
       </xsl:variable>
-
+<!--
       <xsl:if test="concat($id,'none')='none'">
         <xsl:variable name="id">
           <xsl:value-of select="UML:Parameter.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"/>
@@ -634,21 +686,20 @@
     </xsl:element>
   </xsl:template>
 
-  
-  
+
   <xsl:template name="UMLReturnParameter">
     <xsl:element name="returnParameter">
 
       <xsl:variable name="id">
-        <xsl:value-of select="UML2:TypedElement.type/*/@xmi.idref"/>
+        <xsl:value-of select="concat(UML:Parameter.type/*/@xmi.idref,UML2:TypedElement.type/*/@xmi.idref)"/>
       </xsl:variable>
-
+<!--
       <xsl:if test="concat($id,'none')='none'">
         <xsl:variable name="id">
           <xsl:value-of select="UML:Parameter.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"/>
@@ -692,7 +743,6 @@
   </xsl:template>
 
 
-
   <xsl:template name="stereotype">
     <xsl:for-each select="UML:ModelElement.stereotype/UML:Stereotype">
       <xsl:variable name="id">
@@ -711,8 +761,7 @@
     </xsl:for-each>
   </xsl:template>
 
-  
-  
+
   <xsl:template name="taggedValue">
     <xsl:variable name="tagId">
       <xsl:value-of select="UML:TaggedValue.type/UML:TagDefinition/@xmi.idref"/>
@@ -730,8 +779,7 @@
     </xsl:element>
   </xsl:template>
 
-  
-  
+
   <xsl:template name="packagePathOfWithDot">
     <xsl:if test="name()!='UML:DataType'">
       <xsl:for-each select="ancestor::UML:Package">
@@ -742,5 +790,3 @@
   </xsl:template>
 
 </xsl:stylesheet>
-
-