[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

loadFromXMI(): This was the wrong place for being forgiving about bad AssocWidgets.
Moved that to the caller, UMLView::loadAssociationsFromXMI.


  M +2 -6      associationwidget.cpp   1.37


--- kdesdk/umbrello/umbrello/associationwidget.cpp  #1.36:1.37
@@ -3283,7 +3283,5 @@ bool AssociationWidget::loadFromXMI( QDo
                 kdError() << "AssociationWidget::loadFromXMI(): "
                           << "cannot find widget for roleA id " << aId << endl;
-                /* Just returning false here is a little harsh when the rest of the diagram
-                   might load okay.  As a compromise, let's be tolerant if the ID is -1.  */
-                return (aId == -1);
+                return false;
         }
         UMLWidget *pWidgetB = m_pView->findWidget( bId );
@@ -3291,7 +3289,5 @@ bool AssociationWidget::loadFromXMI( QDo
                 kdError() << "AssociationWidget::loadFromXMI(): "
                           << "cannot find widget for roleB id " << bId << endl;
-                /* Just returning false here is a little harsh when the rest of the diagram
-                   might load okay.  As a compromise, let's be tolerant if the ID is -1.  */
-                return (bId == -1);
+                return false;
         }
         setWidgetA(pWidgetA);