[Uml-devel] kdesdk/umbrello/umbrello

[Brian Thomas]

CVS commit by thomas: 

bug fix: when loading AssociationWidget from XMI, not making appropriate connection to UMLAssociation object


  M +9 -3      associationwidget.cpp   1.44


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.43:1.44
@@ -28,5 +28,7 @@
 #include <klocale.h>
 
-// this constructor really is bad..shouldnt be allowed. -b.t. 
+// this constructor really only for loading from XMI, otherwise it
+// is bad..and shouldnt be allowed as it creates an incomplete 
+// associationwidget. 
 AssociationWidget::AssociationWidget(UMLView *view)
         : QObject(view)
@@ -35,5 +37,5 @@ AssociationWidget::AssociationWidget(UML
 }
 
-// preferred constructor
+// the preferred constructor
 AssociationWidget::AssociationWidget(UMLView *view, UMLWidget* WidgetA,
                                      Association_Type Type, UMLWidget* WidgetB )
@@ -3332,5 +3335,8 @@ bool AssociationWidget::loadFromXMI( QDo
                         kdDebug() << " cannot find UML:Association " << nId << endl;
                         return false;
-                }
+                } else 
+                        connect(m_pAssociation, SIGNAL(modified()), this,
+                                SLOT(mergeUMLRepresentationIntoAssociationData()));
+
                 m_LinePath.setAssocType( m_pAssociation->getAssocType() );