[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

m_AssocRules[]: Allow composition of class with enum.


  M +1 -0      assocrules.cpp   1.21
  M +3 -1      assocrules.h   1.7


--- kdesdk/umbrello/umbrello/assocrules.cpp  #1.20:1.21
@@ -307,4 +307,5 @@ AssocRules::Assoc_Rule AssocRules::m_Ass
             { at_Composition,   wt_Class,       wt_Class,       true,   true,   false,  true  },
             { at_Composition,   wt_Class,       wt_Interface,   true,   true,   false,  false },
+            { at_Composition,   wt_Class,       wt_Enum,        false,  false,  false,  false },
             { at_Implementation,wt_Class,       wt_Class,       false,  false,  false,  false },
             { at_Coll_Message,  wt_Object,      wt_Object,      true,   false,  true,   true  },

--- kdesdk/umbrello/umbrello/assocrules.h  #1.6:1.7
@@ -49,5 +49,7 @@ public:
          * This method is used to finish an association.
          */
-        static bool allowAssociation( Association_Type assocType, UMLWidget * widgetA, UMLWidget * widgetB, bool extendedCheck = true );
+        static bool allowAssociation( Association_Type assocType,
+                                      UMLWidget * widgetA, UMLWidget * widgetB,
+                                      bool extendedCheck = true );
 
         /**