Index: lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl
diff -u lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.12 lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.13
--- lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.12	Fri Jul 16 12:22:08 2004
+++ lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl	Mon Dec  6 18:40:04 2004
@@ -41,6 +41,11 @@
       <xsl:attribute name="name">
         <xsl:value-of select="../@name"/>
       </xsl:attribute>
+      
+      <xsl:for-each select="descendant::UML:Namespace.ownedElement/UML:Comment[not(UML:Comment.annotatedElement)]">
+        <xsl:call-template name="comment"/>
+      </xsl:for-each>
+      
       <xsl:apply-templates> 
         <xsl:with-param name="parentLocalPackageName"/>
       </xsl:apply-templates>
@@ -158,21 +163,20 @@
         <xsl:value-of select="$localPackageName"/>
       </xsl:attribute>
 
-      <xsl:call-template name="UMLGeneralizations">
-        <xsl:with-param name="interfaceId">
-          <xsl:value-of select="$interfaceId"/>
-        </xsl:with-param>
-      </xsl:call-template>
-
       <xsl:call-template name="stereotype"/>
 
       <xsl:for-each select="UML:ModelElement.taggedValue/UML:TaggedValue">
         <xsl:call-template name="taggedValue"/>
       </xsl:for-each>
 
-      <!-- class attributes -->
-      <xsl:for-each select="UML:Classifier.feature/UML:Attribute">
-        <xsl:call-template name="UMLAttribute"/>
+      <xsl:call-template name="UMLGeneralizations">
+        <xsl:with-param name="interfaceId">
+          <xsl:value-of select="$interfaceId"/>
+        </xsl:with-param>
+      </xsl:call-template>
+
+      <xsl:for-each select="UML:ModelElement.comment/UML:Comment">
+        <xsl:call-template name="UMLComment"/>
       </xsl:for-each>
 
       <!-- class operations -->
@@ -229,6 +233,10 @@
         </xsl:with-param>
       </xsl:call-template>
 
+      <xsl:for-each select="UML:ModelElement.comment/UML:Comment">
+        <xsl:call-template name="UMLComment"/>
+      </xsl:for-each>
+
       <!-- class attributes -->
       <xsl:for-each select="UML:Classifier.feature/UML:Attribute">
         <xsl:call-template name="UMLAttribute"/>
@@ -294,6 +302,10 @@
         </xsl:with-param>
       </xsl:call-template>
 
+      <xsl:for-each select="UML:ModelElement.comment/UML:Comment">
+        <xsl:call-template name="UMLComment"/>
+      </xsl:for-each>
+
       <xsl:for-each select="UML:Association.connection/UML:AssociationEnd">
         <xsl:variable name="participantId">
           <xsl:value-of select="UML:AssociationEnd.participant/*/@xmi.idref"/>
@@ -543,6 +555,11 @@
       <xsl:for-each select="UML:ModelElement.taggedValue/UML:TaggedValue">
         <xsl:call-template name="taggedValue"/>
       </xsl:for-each>
+
+      <xsl:for-each select="UML:ModelElement.comment/UML:Comment">
+        <xsl:call-template name="UMLComment"/>
+      </xsl:for-each>
+      
     </xsl:element>
   </xsl:template>
 
@@ -579,6 +596,10 @@
         </xsl:choose>
       </xsl:for-each>
 
+      <xsl:for-each select="UML:ModelElement.comment/UML:Comment">
+        <xsl:call-template name="UMLComment"/>
+      </xsl:for-each>
+
     </xsl:element>
   </xsl:template>
 
@@ -621,7 +642,21 @@
     </xsl:element>
   </xsl:template>
 
-  
+
+  <xsl:template name="UMLComment">
+    <xsl:variable name="id">
+      <xsl:value-of select="@xmi.idref"/>
+    </xsl:variable>
+    <xsl:for-each select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/descendant::*[@xmi.id = $id]">
+      <xsl:call-template name="comment"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="comment">
+    <xsl:element name="comment">
+	  <xsl:value-of select="@body"/>  
+    </xsl:element>
+  </xsl:template>
   
   <xsl:template name="extern">
     <xsl:for-each select="UML:ModelElement.stereotype/UML:Stereotype">