[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

loadFromXMI(): Associations are added to the umldoc elsewhere
 (in UMLDoc::loadUMLObjectsFromXMI(), to be precise.)


  M +5 -8      umlobject.cpp   1.37


--- kdesdk/umbrello/umbrello/umlobject.cpp  #1.36:1.37
@@ -475,16 +475,13 @@ bool UMLObject::loadFromXMI( QDomElement
         }
 
-        // Operations, attributes, enum literals, and association role objects
-        // get added and signaled elsewhere.
+        // Operations, attributes, enum literals, associations, and
+        // association role objects get added and signaled elsewhere.
         if (m_BaseType != ot_Operation && m_BaseType != ot_Attribute &&
-            m_BaseType != ot_EnumLiteral && m_BaseType != ot_UMLObject) {
+            m_BaseType != ot_EnumLiteral && m_BaseType != ot_Association &&
+            m_BaseType != ot_UMLObject) {
                 if (m_pUMLPackage)
                         m_pUMLPackage->addObject(this);
                 else
                         umldoc->addUMLObject(this);
-                // Associations and their role objects do not have a listview
-                // representation yet, therefore they do not prompt the
-                // sigObjectCreated.
-                if (m_BaseType != ot_Association)
                         umldoc->signalUMLObjectCreated(this);
         }