[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 421347 by okellogg:

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


 M  +6 -1      ChangeLog  
 M  +3 -2      umbrello/association.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #421346:421347
@@ -5,8 +5,13 @@
 * 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 106632
+57588 67719 79433 87252 88117 105564
 
+Version 1.4.2 (maintenance release)
+
+* Bugs fixed from http://bugs.kde.org :
+106632 106673
+
 Version 1.4.1 (maintenance release)
 
 Bugs fixed:
--- trunk/KDE/kdesdk/umbrello/umbrello/association.cpp #421346:421347
@@ -266,8 +266,9 @@
                 // is not complete, so we need to finish the analysis here.
 
 		// its a realization if either endpoint is an interface
-		if (obj[A] && obj[A]->getBaseType() == Uml::ot_Interface ||
-		    obj[B] && obj[B]->getBaseType() == Uml::ot_Interface)
+		if (m_AssocType == Uml::at_Generalization &&
+		    (obj[A] && obj[A]->getBaseType() == Uml::ot_Interface ||
+		     obj[B] && obj[B]->getBaseType() == Uml::ot_Interface))
 			m_AssocType = Uml::at_Realization;
 
 		return true;