[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

saveToXMI(): Deprecate the code that handles (m_View == NULL).


  M +15 -3     umlviewdata.cpp   1.23


--- kdesdk/umbrello/umbrello/umlviewdata.cpp  #1.22:1.23
@@ -237,6 +237,18 @@ bool UMLViewData::saveToXMI( QDomDocumen
                         assocData -> saveToXMI( qDoc, assocElement );
                 }
-        } else {
+        } else if ( m_AssociationList.count() ) {
+                // We guard against ( m_AssociationList.count() == 0 ) because
+                // this else part could be reached as follows:
+                //  ^  UMLView::saveToXMI()
+                //  ^  UMLDoc::saveToXMI()
+                //  ^  UMLDoc::addToUndoStack()
+                //  ^  UMLDoc::setModified()
+                //  ^  UMLDoc::createDiagram()
+                //  ^  UMLDoc::newDocument()
+                //  ^  UMLApp::newDocument()
+                //  ^  main()
+                //
                 // FIXME: This else part should never be entered.
+                kdDebug() << "UMLViewData::saveToXMI() entered deprecated else part." << endl;
                 AssociationWidgetDataListIt a_it( m_AssociationList );
                 AssociationWidgetData * assocData = 0;