[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello
Oliver Kellogg
okellogg at users.sourceforge.net
Tue Jan 10 11:27:09 UTC 2006
SVN commit 496548 by okellogg:
UMLRole::saveToXMI(): Change aggregation="shared" to "aggregate".
UMLAssociation::saveToXMI(): Save abstraction as <UML:Abstraction>.
Thanks to Tom Morris for clarifying.
CCBUG:56184
CCMAIL:tfmorris at gmail.com
M +8 -2 association.cpp
M +1 -1 umlrole.cpp
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/association.cpp #496547:496548
@@ -161,8 +161,7 @@
}
void UMLAssociation::saveToXMI( QDomDocument & qDoc, QDomElement & qElement ) {
- if (m_AssocType == Uml::at_Generalization ||
- m_AssocType == Uml::at_Realization) {
+ if (m_AssocType == Uml::at_Generalization) {
QDomElement assocElement = UMLObject::save("UML:Generalization", qDoc);
assocElement.setAttribute( "discriminator", "" );
assocElement.setAttribute( "child", ID2STR(getObjectId(A)) );
@@ -170,6 +169,13 @@
qElement.appendChild( assocElement );
return;
}
+ if (m_AssocType == Uml::at_Realization) {
+ QDomElement assocElement = UMLObject::save("UML:Abstraction", qDoc);
+ assocElement.setAttribute( "client", ID2STR(getObjectId(A)) );
+ assocElement.setAttribute( "supplier", ID2STR(getObjectId(B)) );
+ qElement.appendChild( assocElement );
+ return;
+ }
if (m_AssocType == Uml::at_Dependency) {
QDomElement assocElement = UMLObject::save("UML:Dependency", qDoc);
assocElement.setAttribute( "client", ID2STR(getObjectId(A)) );
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlrole.cpp #496547:496548
@@ -118,7 +118,7 @@
roleElement.setAttribute("aggregation", "composite");
break;
case Uml::at_Aggregation:
- roleElement.setAttribute("aggregation", "shared");
+ roleElement.setAttribute("aggregation", "aggregate");
break;
default:
roleElement.setAttribute("aggregation", "none");
More information about the umbrello-devel
mailing list