[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

loadFromXMI(): Check for assocTypeHasUMLRepresentation() before
synthesizing the UMLAssociation. Zaps beastie 66847.


  M +18 -16    associationwidget.cpp   1.66


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.65:1.66
@@ -3290,5 +3290,5 @@ bool AssociationWidget::loadFromXMI( QDo
                 QString type = qElement.attribute( "type", "-1" );
                 Uml::Association_Type aType = (Uml::Association_Type) type.toInt();
-
+                if (UMLAssociation::assocTypeHasUMLRepresentation(aType)) {
                 // lack of an association in our widget AND presence of
                 // both uml objects for each role clearly identifies this
@@ -3299,11 +3299,13 @@ bool AssociationWidget::loadFromXMI( QDo
                 UMLObject* umlRoleA = pWidgetA->getUMLObject();
                 UMLObject* umlRoleB = pWidgetB->getUMLObject();
-                if(!m_pAssociation && umlRoleA && umlRoleB)
+                        if (!m_pAssociation && umlRoleA && umlRoleB)
                 {
-                        oldStyleLoad = true; // will flag code for further special config below
-                        m_pAssociation = m_pView->getDocument()->createUMLAssociation(umlRoleA, umlRoleB, aType);
+                                oldStyleLoad = true; // flag for further special config below
+                                m_pAssociation = m_pView->getDocument()->createUMLAssociation(
+                                                        umlRoleA, umlRoleB, aType);
                         connect(m_pAssociation, SIGNAL(modified()), this,
                                 SLOT(mergeUMLRepresentationIntoAssociationData()));
                 }
+                }
 
                 setDoc( qElement.attribute("documentation", "") );