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

[Caroline Bourdeu d'Aguerre]

SVN commit 634030 by bourdeu:

Add more rules for the assciation widget.


 M  +9 -4      assocrules.cpp  


--- branches/work/isi-umbrello/umbrello/umbrello/assocrules.cpp #634029:634030
@@ -351,13 +351,17 @@
     { at_State,         wt_State,       wt_State,       true,   false,  true,   true  },
     { at_State,         wt_ForkJoin,    wt_State,       true,   false,  true,   true  },
     { at_State,         wt_State,       wt_ForkJoin,    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_Object_Flow, wt_Activity,    true,   false,  true,   true  },
+    { at_Activity,      wt_Activity,    wt_Object_Flow, true,   false,  true,   true  },
     { 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_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_Activity,      wt_Signal,      wt_ForkJoin,    true,   false,  true,   true  },
+    { at_Activity,      wt_ForkJoin,    wt_Signal,      true,   false,  true,   true  },
+    { at_Activity,      wt_ForkJoin,    wt_Object_Flow, true,   false,  true,   true  },
+    { at_Activity,      wt_Object_Flow, wt_ForkJoin,    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 },
@@ -372,6 +376,7 @@
     { 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_Activity,    true,   false,  true,   true  },
     { at_Exception,     wt_Signal,      wt_Signal,      true,   false,  true,   true  },
 };