[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 487441 by okellogg:

apply commit 487430 from branches/KDE/3.5

 M  +2 -1      umlrole.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlrole.cpp #487440:487441
@@ -298,7 +298,8 @@
         QString aggregation = element.attribute("aggregation", "none");
         if (aggregation == "composite")
             m_pAssoc->setAssocType(Uml::at_Composition);
-        else if (aggregation == "shared")
+        else if (aggregation == "shared"       // UML1.3
+              || aggregation == "aggregate")   // UML1.4
             m_pAssoc->setAssocType(Uml::at_Aggregation);
         /* else
                 m_pAssoc->setAssocType(Uml::at_Association);  */