[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 484295 by okellogg:

apply commit 484294 from branches/KDE/3.5

 M  +1 -0      THANKS  
 M  +2 -1      umbrello/attribute.cpp  
 M  +1 -1      umbrello/classifier.cpp  
 M  +10 -6     umbrello/umlobject.cpp  


--- trunk/KDE/kdesdk/umbrello/THANKS #484294:484295
@@ -46,6 +46,7 @@
 martin <mv123q3 @hotmail.com>
 Rene Meyer <Rene.Meyer @sturmit.de>
 Laurent Montel <montel @kde.org>
+Tom Morris <tfmorris @gmail.com>
 Lutz Mueller <lutz.mueller @gmx.de>
 Heiko Nardmann <heiko.nardmann @onlinehome.de>
 Dimitri Ognibene <ognibened @yahoo.it>
--- trunk/KDE/kdesdk/umbrello/umbrello/attribute.cpp #484294:484295
@@ -188,7 +188,8 @@
     } else {
         attributeElement.setAttribute( "type", ID2STR(m_pSecondary->getID()) );
     }
-    attributeElement.setAttribute( "initialValue", m_InitialValue );
+    if (! m_InitialValue.isEmpty())
+        attributeElement.setAttribute( "initialValue", m_InitialValue );
     qElement.appendChild( attributeElement );
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/classifier.cpp #484294:484295
@@ -775,7 +775,7 @@
             genElement.appendChild(gElem);
         }
         if (genElement.hasChildNodes())
-            qElement.appendChild( genElement );
+            classifierElement.appendChild( genElement );
     }
 
     // save attributes
--- trunk/KDE/kdesdk/umbrello/umbrello/umlobject.cpp #484294:484295
@@ -471,12 +471,16 @@
     }
     qElement.setAttribute( "xmi.id", ID2STR(m_nId) );
     qElement.setAttribute( "name", m_Name );
-    Uml::IDType nmSpc;
-    if (m_pUMLPackage)
-        nmSpc = m_pUMLPackage->getID();
-    else
-        nmSpc = UMLApp::app()->getDocument()->getModelID();
-    qElement.setAttribute( "namespace", ID2STR(nmSpc) );
+    if (m_BaseType != Uml::ot_Operation &&
+            m_BaseType != Uml::ot_Role &&
+            m_BaseType != Uml::ot_Attribute) {
+        Uml::IDType nmSpc;
+        if (m_pUMLPackage)
+            nmSpc = m_pUMLPackage->getID();
+        else
+            nmSpc = UMLApp::app()->getDocument()->getModelID();
+        qElement.setAttribute( "namespace", ID2STR(nmSpc) );
+    }
     if (! m_Doc.isEmpty())
         qElement.setAttribute( "comment", m_Doc );  //CHECK: uml13.dtd compliance
 #ifdef XMI_FLAT_PACKAGES