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

[Oliver Kellogg]

SVN commit 690383 by okellogg:

apply commits 689657,689658,689706 from branches/KDE/3.5

 M  +2 -1      association.cpp  
 M  +2 -3      umldoc.cpp  
 M  +4 -4      umlrole.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/association.cpp #690382:690383
@@ -591,7 +591,8 @@
     m_Name = "";
     m_bOldLoadMode = false;
     nrof_parent_widgets = -1;
-    m_pUMLPackage = UMLApp::app()->getDocument()->currentRoot();
+    if (!UMLApp::app()->getDocument()->loading())
+        m_pUMLPackage = UMLApp::app()->getDocument()->currentRoot();
     m_pRole[Uml::A] = new UMLRole (this, roleAObj, Uml::A);
     m_pRole[Uml::B] = new UMLRole (this, roleBObj, Uml::B);
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #690382:690383
@@ -1105,9 +1105,8 @@
     if (currentView == NULL) {
         if (m_pCurrentRoot)
             return m_pCurrentRoot;
-        kDebug() << "UMLDoc::currentRoot: currentView is NULL, assuming Logical View"
-            << endl;
-        return m_root[Uml::mt_Logical];
+        kError() << "UMLDoc::currentRoot: m_pCurrentRoot is NULL" << endl;
+        return NULL;
     }
     UMLFolder *f = currentView->getFolder();
     while (f->getUMLPackage()) {
--- trunk/KDE/kdesdk/umbrello/umbrello/umlrole.cpp #690382:690383
@@ -64,9 +64,9 @@
     // parent objects. In fact, there is probably good reason
     // to only take UMLClassifiers here, but I'll leave it more open
     // for the time being. -b.t.
-    if(obj && dynamic_cast<UMLRole*>(obj))
-    {
-        kError()<<"ERROR: UMLRole cant setObject() to another UMLRole!, ignoring"<<endl;
+    if (obj && dynamic_cast<UMLRole*>(obj)) {
+        kError() << "UMLRole(" << ID2STR(m_nId) << ") cannot setObject() to another UMLRole("
+            << ID2STR(obj->getID()) << ")" << endl;
         return;
     }
 
@@ -253,7 +253,7 @@
     if (!m_Multi.isEmpty())
         kDebug() << "UMLRole::load(" << m_Name << "): m_Multi is " << m_Multi << endl;
     if (m_SecondaryId.isEmpty()) {
-        kError() << "UMLRole::load: type not given or illegal" << endl;
+        kError() << "UMLRole::load(" << m_Name << "): type not given or illegal" << endl;
         return false;
     }
     UMLObject * obj;