[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Implement UML representation for simple (undirected) association.


  M +5 -6      association.cpp   1.62


--- kdesdk/umbrello/umbrello/association.cpp  #1.61:1.62
@@ -27,5 +27,5 @@ using namespace Uml;
 // static members
 const Uml::Association_Type UMLAssociation::atypeFirst = Uml::at_Generalization;
-const Uml::Association_Type UMLAssociation::atypeLast = Uml::at_Activity;
+const Uml::Association_Type UMLAssociation::atypeLast = Uml::at_Relationship;
 const unsigned UMLAssociation::nAssocTypes = (unsigned)atypeLast -
                                              (unsigned)atypeFirst + 1;
@@ -134,4 +134,5 @@ bool UMLAssociation::assocTypeHasUMLRepr
         return (atype == Uml::at_Generalization ||
                 atype == Uml::at_Realization ||
+                atype == Uml::at_Association ||
                 atype == Uml::at_Association_Self ||
                 atype == Uml::at_UniAssociation ||
@@ -340,7 +341,6 @@ bool UMLAssociation::load( QDomElement &
                 {
                         m_AssocType = Uml::at_Association;
-                        // Q: is this truely a warning condition? Do state diagrams store
-                        // stuff this way (for example)?
-                        kdWarning()<<" Warning: load can't determine association type, setting to 'plain' association"<<endl;
+                        kdDebug() << "load can't determine association type, setting to 'plain' association"
+                                  << endl;
                 }
 
@@ -353,5 +353,4 @@ bool UMLAssociation::load( QDomElement &
         if (assocTypeStr[0] >= 'a' && assocTypeStr[0] <= 'z') {
                 // In an earlier version, the natural assoctype names were saved.
-                const unsigned nAssocTypes = 16;
                 const QString assocTypeString[nAssocTypes] = {
                         "generalization",       // at_Generalization
@@ -370,5 +369,5 @@ bool UMLAssociation::load( QDomElement &
                         "anchor",               // at_Anchor
                         "state",                // at_State
-                        "activity"              // at_Activity
+                        "activity",             // at_Activity
                         "relationship"          // at_Relationship
                 };