[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 420991 by okellogg:

resolveRef(): Only consider assoc type change to at_Realization
 if current type is at_Generalization.
BUG:106632


 M  +1 -1      ChangeLog  
 M  +4 -2      umbrello/association.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #420990:420991
@@ -5,7 +5,7 @@
 * Change interface into class and vice versa (if abstract and no attributes)
 
 * Bugs fixed / wishes implemented (see http://bugs.kde.org)
-57588 67719 79433 87252 88117 105564
+57588 67719 79433 87252 88117 105564 106632
 
 Version 1.4.1 (maintenance release)
 
--- trunk/KDE/kdesdk/umbrello/umbrello/association.cpp #420990:420991
@@ -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);