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

[Oliver Kellogg]

SVN commit 487430 by okellogg:

load(): In UML 1.4, the aggregation attribute has a value "aggregate"
instead of "shared". Thanks to Tom Morris for pointing this out.
CCBUG:56184


 M  +2 -1      umlrole.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlrole.cpp #487429:487430
@@ -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);  */