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

[Oliver Kellogg]

SVN commit 598796 by okellogg:

Attachment 18247 from Achim Spangler restores a check for datatype folder in
 addNewItem() and avoids an endless loop in loadChildrenFromXMI(). Thanks!
CCBUG:135606


 M  +4 -3      umllistview.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umllistview.cpp #598795:598796
@@ -1805,9 +1805,9 @@
     QString name;
 
     //// CHECK: Why?
-    // if (type == Uml::lvt_Datatype) {
-    //     parentItem = m_datatypeFolder;
-    // }
+     if (type == Uml::lvt_Datatype) {
+         parentItem = m_datatypeFolder;
+     }
 
     UMLPackage *parentPkg = dynamic_cast<UMLPackage*>(parentItem->getUMLObject());
     if (parentPkg == NULL)
@@ -2346,6 +2346,7 @@
                 if (parentPkg == NULL) {
                     kdError() << pfx << "umlParent(" << umlParent << ") is not a UMLPackage"
                         << endl;
+                    domElement = node.toElement();
                     continue;
                 }
                 UMLFolder *f = new UMLFolder(label, nID);