[Uml-devel] branches/work/soc-umbrello (silent)

[Gopala Krishna A]

SVN commit 896511 by gopala:

Preparing for the new year hacking on soc umbrello code!

SVN_SILENT: svnmerge
----------
Merged revisions 890075,890805 via svnmerge from
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r890075 | sharan | 2008-11-28 18:25:06 +0530 (Fri, 28 Nov 2008) | 5 lines

  Adding a foreign key constraint used to give the wrong roles to the
  owning entity and the referenced entity. Not any more :)

  CCBUG:171280
........
  r890805 | sharan | 2008-11-30 17:04:38 +0530 (Sun, 30 Nov 2008) | 4 lines

  Don't delete the objects directly, but just mark them for deletion. This
  prevents catastrophies while iterating over lists which keep changing
  their state.
........


 _M            . (directory)  
 M  +7 -4      umbrello/umlscene.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #896510:896511
@@ -734,7 +734,7 @@
         removeAssociations(obj);
         //make sure not in selected list
         m_MessageList.removeAll(obj);
-        delete obj;
+        obj->deleteLater();
     }
 }
 
@@ -905,7 +905,7 @@
         m_MessageList.removeAll(static_cast<MessageWidget*>(o));
     } else
         m_WidgetList.removeAll(o);
-    delete o;
+    o->deleteLater();
     m_pDoc->setModified(true);
 }
 
@@ -1968,7 +1968,7 @@
 
     pAssoc->cleanup();
     m_AssociationList.removeAll(pAssoc);
-    delete pAssoc;
+    pAssoc->deleteLater();
     m_pDoc->setModified();
 }
 
@@ -2576,7 +2576,10 @@
             // if the current diagram type permits relationships
             AssocRules::allowAssociation(assocType, widget, w, false)) {
 
-            AssociationWidget *a = new AssociationWidget(this, widget, assocType, w);
+            // for foreign key contstraint, we need to create the association type Uml::at_Relationship.
+            // The referenced entity is the "1" part (Role A) and the entity holding the relationship is the "many" part. ( Role B)
+            AssociationWidget *a = new AssociationWidget(this, w, assocType, widget);
+
             a->setUMLObject(fkConstraint);
             a->calculateEndingPoints();
             //a->setVisibility(attr->getVisibility(), B);