[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

createAutoAttributeAssociations(): Consider attribute name (corresponds
 to association role B name) when deciding whether a given association widget
 between two given classes already exists.
BUG:100290 


  M +3 -1      umlview.cpp   1.208


--- kdesdk/umbrello/umbrello/umlview.cpp  #1.207:1.208
@@ -2499,8 +2499,10 @@ void UMLView::createAutoAttributeAssocia
                 Uml::Association_Type assocType = Uml::at_Composition;
                 UMLWidget *w = findWidget( attrType->getID() );
+                AssociationWidget *aw = NULL;
                 // if the attribute type has a widget representation on this view
                 if (w &&
                     // if the AssocWidget does not already exist then
-                    findAssocWidget(assocType, widget, w) == NULL &&
+                    ((aw = findAssocWidget(assocType, widget, w)) == NULL ||
+                      aw->getRoleName(Uml::B) != attr->getName()) &&
                     // if the current diagram type permits compositions
                     AssocRules::allowAssociation(assocType, widget, w, false)) {