[Uml-devel] kdesdk/umbrello/umbrello

[Brian Thomas]

CVS commit by thomas: 

minor quibble/bug fix: make sure we disconnect from prior parent UMLAssociation before changing to new one. Also, upgrade messaging to error level for some conditions


  M +5 -1      associationwidget.cpp   1.47


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.46:1.47
@@ -3312,9 +3312,13 @@ bool AssociationWidget::loadFromXMI( QDo
         } else {
 
+                // we should disconnect any prior association (can this happen??)
+                if(m_pAssociation)
+                        m_pAssociation->disconnect(this); 
+
                 // New style: The xmi.id is a reference to the UMLAssociation.
                 UMLDoc* umldoc = m_pView->getDocument();
                 m_pAssociation = (UMLAssociation*)umldoc->findUMLObject(nId);
                 if (m_pAssociation == NULL) {
-                        kdDebug() << " cannot find UML:Association " << nId << endl;
+                        kdError() << " AssociationWidget cannot find UML:Association " << nId << " for loadFromXMI"<< endl;
                         return false;
                 } else