[Uml-devel] branches/work/isi-umbrello/umbrello/umbrello

[Caroline Bourdeu d'Aguerre]

SVN commit 634015 by bourdeu:

Add the possibility to associate a signal with an object in the activity diagram.


 M  +6 -2      assocrules.cpp  


--- branches/work/isi-umbrello/umbrello/umbrello/assocrules.cpp #634014:634015
@@ -354,8 +354,10 @@
     { at_Activity,      wt_Activity,    wt_Activity,    true,   false,  true,   true  },
     { at_Activity,      wt_ForkJoin,    wt_Activity,    true,   false,  true,   true  },
     { at_Activity,      wt_Activity,    wt_ForkJoin,    true,   false,  true,   true  },
-    { at_Activity,      wt_Activity,    wt_Object_Flow,    true,   false,  true,   true  },
-    { at_Activity,      wt_Object_Flow,    wt_Activity,    true,   false,  true,   true  },
+    { at_Activity,      wt_Signal,      wt_Activity,    true,   false,  true,   true  },
+    { at_Activity,      wt_Activity,    wt_Signal,      true,   false,  true,   true  },
+    { at_Activity,      wt_Activity,    wt_Object_Flow, true,   false,  true,   true  },
+    { at_Activity,      wt_Object_Flow, wt_Activity,    true,   false,  true,   true  },
     { at_Anchor,        wt_Class,       wt_Note,        false,  false,  false,  false },
     { at_Anchor,        wt_Package,     wt_Note,        false,  false,  false,  false },
     { at_Anchor,        wt_Interface,   wt_Note,        false,  false,  false,  false },
@@ -369,6 +371,8 @@
     { at_Anchor,        wt_Activity,    wt_Note,        false,  false,  false,  false },
     { at_Relationship,  wt_Entity,      wt_Entity,      true,   false,  true,   false },
     { at_Exception,     wt_Activity,    wt_Activity,    true,   false,  true,   true  },
+    { at_Exception,     wt_Activity,    wt_Signal,      true,   false,  true,   true  },
+    { at_Exception,     wt_Signal,      wt_Signal,      true,   false,  true,   true  },
 };
 
 int AssocRules::m_nNumRules = sizeof( m_AssocRules ) / sizeof( AssocRules::Assoc_Rule );