[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Fix setting of collaboration message from m_pOperation.


  M +13 -2     associationwidget.cpp   1.144


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.143:1.144
@@ -418,5 +418,15 @@ void AssociationWidget::setRoleDoc (cons
 
 void AssociationWidget::setMessageText(FloatingText *ft) {
-        ft->setText( getName() );
+        QString message;
+        if (getAssocType() == at_Coll_Message) {
+                if (m_pOperation != NULL) {
+                        message = getMulti(A) + ": " + getOperationText(m_pView);
+                } else {
+                        message = getMulti(A) + ": " + getName();
+                }
+        } else {
+                message = getName();
+        }
+        ft->setText(message);
 }
 
@@ -2822,4 +2832,5 @@ UMLClassifier *AssociationWidget::getOpe
 
 void AssociationWidget::setSeqNumAndOp(const QString &seqNum, const QString &op) {
+        if (! op.isEmpty())
         setName(op);
         setMulti(seqNum, A);