[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Fix bug 83417 (can't open association properties dialog.)


  M +7 -13     associationwidget.cpp   1.103


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.102:1.103
@@ -2043,20 +2043,14 @@ void AssociationWidget::mouseReleaseEven
 
 bool AssociationWidget::showDialog() {
-        UMLAssociation *umla = m_pAssociation;
-        if (umla == NULL) {
-                kdError() << "AssociationWidget::showDialog: "
-                          << "Need an underlying UMLAssociation" << endl;
-                return false;
-        }
         AssocPropDlg dlg(static_cast<QWidget*>(m_pView), this );
         if (! dlg.exec())
                 return false;
-        QString name = umla->getName();
-        QString doc = umla->getDoc();
-        QString roleADoc = umla->getRoleDoc(A), roleBDoc = umla->getRoleDoc(B);
-        QString rnA = umla->getRoleName(A), rnB = umla->getRoleName(B);
-        QString ma = umla->getMulti(A), mb = umla->getMulti(B);
-        Scope vA = umla->getVisibility(A), vB = umla->getVisibility(B);
-        Changeability_Type cA = umla->getChangeability(A), cB = umla->getChangeability(B);
+        QString name = getName();
+        QString doc = getDoc();
+        QString roleADoc = getRoleDoc(A), roleBDoc = getRoleDoc(B);
+        QString rnA = getRoleName(A), rnB = getRoleName(B);
+        QString ma = getMulti(A), mb = getMulti(B);
+        Scope vA = getVisibility(A), vB = getVisibility(B);
+        Changeability_Type cA = getChangeability(A), cB = getChangeability(B);
         //rules built into these functions to stop updating incorrect values
         setName(name);