[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

>From M. Alanen (maalanen_AT_ra.abo.fi):
"AssociationEnds should not have isLeaf, isRoot, isAbstract."


  M +8 -6      umlobject.cpp   1.65


--- kdesdk/umbrello/umbrello/umlobject.cpp  #1.64:1.65
@@ -422,7 +422,13 @@ QDomElement UMLObject::save( const QStri
         */
         QDomElement qElement = qDoc.createElement(tag);
+        qElement.setAttribute( "isSpecification", "false" );
+        if (m_BaseType != Uml::ot_Association) {
         qElement.setAttribute( "isLeaf", "false" );
         qElement.setAttribute( "isRoot", "false" );
-        qElement.setAttribute( "isSpecification", "false" );
+                if (m_bAbstract)
+                        qElement.setAttribute( "isAbstract", "true" );
+                else
+                        qElement.setAttribute( "isAbstract", "false" );
+        }
         qElement.setAttribute( "xmi.id", ID2STR(m_nId) );
         qElement.setAttribute( "name", m_Name );
@@ -437,8 +443,4 @@ QDomElement UMLObject::save( const QStri
         if (m_pStereotype != NULL)
                 qElement.setAttribute( "stereotype", ID2STR(m_pStereotype->getID()) );
-        if (m_bAbstract)
-                qElement.setAttribute( "isAbstract", "true" );
-        else
-                qElement.setAttribute( "isAbstract", "false" );
         if (m_bStatic)
                 qElement.setAttribute( "ownerScope", "classifier" );