[Uml-devel] kdesdk/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

BUG:67723 Allow role names on dependencies.


  M +7 -7      ChangeLog   1.50
  M +6 -6      umbrello/assocrules.cpp   1.35


--- kdesdk/umbrello/ChangeLog  #1.49:1.50
@@ -16,11 +16,11 @@
         
 * Bugs fixed / wishes implemented (see http://bugs.kde.org)
-53380 53384 54928 57879       62321 63316 71978 74249 77645
-      80405 80559 82342 85377 86083 86828 86952 86958 87111
-87537 87956 87995 88152 88245 88415 88954 89334 89485 89553
-89563 89579 89582 89699 89860 89903       90102 90106 90206
-90755       91298 91433 91494 91869 91922       92116 92123
-92222 92300 92301 92781 92995 93122 93219 93297 93501 93595
-93696 94173 94728 94795 94883 95082 95252 95722
+53380 53384 54928 57879       62321 63316 67723       71978
+74249 74952 77645       80405 80559 82342 85377 86083 86828
+86952 86958 87111 87537 87956 87995 88152 88245 88415 88954
+89334 89485 89553 89563 89579 89582 89699 89860 89903      
+90102 90106 90206 90755 91298 91433 91434 91494 91869 91922
+92116 92123 92222 92300 92301 92781 92995 93122 93219 93297
+93501 93595 93696 94173 94728 94795 94883 95082 95252 95722
 
 Version 1.3

--- kdesdk/umbrello/umbrello/assocrules.cpp  #1.34:1.35
@@ -287,8 +287,8 @@ AssocRules::Assoc_Rule AssocRules::m_Ass
             { at_Aggregation,   wt_Class,       wt_Enum,        true,   true,   false,  false },
             { at_Aggregation,   wt_Class,       wt_Datatype,    true,   true,   false,  false },
-            { at_Dependency,    wt_Class,       wt_Class,       false,  false,  false,  true },
-            { at_Dependency,    wt_UseCase,     wt_UseCase,     false,  false,  false,  false },
-            { at_Dependency,    wt_Actor,       wt_Actor,       false,  false,  false,  false },
-            { at_Dependency,    wt_Actor,       wt_UseCase,     false,  false,  false,  false },
+            { at_Dependency,    wt_Class,       wt_Class,       true,   false,  false,  true },
+            { at_Dependency,    wt_UseCase,     wt_UseCase,     true,   false,  false,  false },
+            { at_Dependency,    wt_Actor,       wt_Actor,       true,   false,  false,  false },
+            { at_Dependency,    wt_Actor,       wt_UseCase,     true,   false,  false,  false },
             { at_Dependency,    wt_Package,     wt_Package,     true,   true,   true,   true  },
             { at_Dependency,    wt_Package,     wt_Class,       true,   true,   true,   true  },
@@ -303,6 +303,6 @@ AssocRules::Assoc_Rule AssocRules::m_Ass
             { at_Dependency,    wt_Component,   wt_Component,   true,   true,   true,   true  },
             { at_Dependency,    wt_Component,   wt_Interface,   true,   true,   true,   true  },
-            { at_Dependency,    wt_Component,   wt_Artifact,    false,  false,  false,  false },
-            { at_Dependency,    wt_Node,        wt_Component,   false,  false,  false,  false },
+            { at_Dependency,    wt_Component,   wt_Artifact,    true,   false,  false,  false },
+            { at_Dependency,    wt_Node,        wt_Component,   true,   false,  false,  false },
             { at_Realization,   wt_Class,       wt_Interface,   false,  false,  false,  false },
             { at_Realization,   wt_Interface,   wt_Package,     false,  false,  false,  false },