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

[Sharan Rao]

SVN commit 661183 by sharan:

*fixed deletion of widgets
*fixed redoing `creation of umlobjects`



 M  +13 -0     cmds/generic/cmd_create_umlobject.cpp  
 M  +2 -0      umlview.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/cmds/generic/cmd_create_umlobject.cpp #661182:661183
@@ -13,6 +13,7 @@
 
 #include "uml.h"
 #include "umldoc.h"
+#include "package.h"
 
 #include <klocale.h>
 
@@ -32,6 +33,18 @@
     void cmdCreateUMLObject::redo()
     {
         UMLDoc *doc = UMLApp::app()->getDocument();
+
+	// This object was removed from it's package when it was deleted
+        // so add it back to it's package ( if it belonged to one )
+        UMLPackage *pkg = m_obj->getUMLPackage();
+        if (pkg == NULL) {
+          // object does not belong to any package
+
+        } else {
+          // add this object to its parent package
+          pkg->addObject(m_obj);
+        }
+
         doc->signalUMLObjectCreated(m_obj);
     }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #661182:661183
@@ -142,6 +142,8 @@
 
     // Initialize other data
     m_AssociationList.setAutoDelete( true );
+    m_WidgetList.setAutoDelete( true );
+
     //Setup up booleans
     m_bChildDisplayedDoc = false;
     m_bPaste = false;