[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 411022 by okellogg:

setClassAssocWidget(): Support umlclass->setClassAssoc(NULL)

 M  +3 -9      trunk/KDE/kdesdk/umbrello/umbrello/classwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/classwidget.cpp #411021:411022
@@ -328,16 +328,10 @@
 
 void ClassWidget::setClassAssocWidget(AssociationWidget *assocwidget) {
 	m_pAssocWidget = assocwidget;
-	if (m_pAssocWidget == NULL)
-		return;
 	UMLClass *umlclass = static_cast<UMLClass*>(m_pObject);
-	UMLAssociation *umlassoc = assocwidget->getAssociation();
-	if (umlassoc == NULL) {
-		kdError() << "ClassWidget::setClassAssocWidget: "
-			  << "cannot setClassAssoc() because UMLAssociation is NULL"
-			  << endl;
-		return;
-	}
+	UMLAssociation *umlassoc = NULL;
+	if (assocwidget)
+		umlassoc = assocwidget->getAssociation();
 	umlclass->setClassAssoc(umlassoc);
 }