[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

loadFromXMI(): Do not add association role objects at the UMLDoc.


  M +4 -4      umlobject.cpp   1.36


--- kdesdk/umbrello/umbrello/umlobject.cpp  #1.35:1.36
@@ -475,8 +475,8 @@ bool UMLObject::loadFromXMI( QDomElement
         }
 
-        // Operations, attributes, and enum literals get added and signaled
-        // elsewhere.
+        // Operations, attributes, enum literals, 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_EnumLiteral && m_BaseType != ot_UMLObject) {
                 if (m_pUMLPackage)
                         m_pUMLPackage->addObject(this);
@@ -486,5 +486,5 @@ bool UMLObject::loadFromXMI( QDomElement
                 // representation yet, therefore they do not prompt the
                 // sigObjectCreated.
-                if (m_BaseType != ot_Association && m_BaseType != ot_UMLObject)
+                if (m_BaseType != ot_Association)
                         umldoc->signalUMLObjectCreated(this);
         }