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

[Oliver Kellogg]

SVN commit 421077 by okellogg:

Backport fix for bug 106632 from main trunk.


 M  +4 -2      association.cpp  


--- branches/KDE/3.4/kdesdk/umbrello/umbrello/association.cpp #421076:421077
@@ -148,8 +148,10 @@
 	if (successA && successB) {
 		UMLObject *objA = getUMLRole(A)->getObject();
 		UMLObject *objB = getUMLRole(B)->getObject();
-		if (objA && objA->getBaseType() == Uml::ot_Interface ||
-		    objB && objB->getBaseType() == Uml::ot_Interface)
+		// Check if need to change the assoc type to Realization
+		if (m_AssocType == Uml::at_Generalization &&
+		    (objA && objA->getBaseType() == Uml::ot_Interface ||
+		     objB && objB->getBaseType() == Uml::ot_Interface))
 			m_AssocType = Uml::at_Realization;
 		UMLDoc *doc = UMLApp::app()->getDocument();
 		doc->addAssocToConcepts(this);