Add handling of derived properties in artifact generation from xmi

Change-Id: I3764f41fd6a727f1a09daed9fc82c9fedf8ba5af
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

1 files changed, 21 insertions, 5 deletions

diff --git a/src/uml/qumlpackagemerge.cpp b/src/uml/qumlpackagemerge.cpp
index b5570750..ea0dc71c 100644
--- a/src/uml/qumlpackagemerge.cpp
+++ b/src/uml/qumlpackagemerge.cpp
@@ -66,19 +66,27 @@ QUmlPackageMerge::QUmlPackageMerge(bool create_d_ptr) :
         set_d_ptr(new QUmlPackageMergePrivate);
 }
 
-// Owned attributes
+// OWNED ATTRIBUTES
 
 /*!
     References the Package that is to be merged with the receiving package of the PackageMerge.
  */
 QUmlPackage *QUmlPackageMerge::mergedPackage() const
 {
-    return 0;
+    // This is a read-write association end
+
+    QM_D(const QUmlPackageMerge);
+    return d->mergedPackage;
 }
 
 void QUmlPackageMerge::setMergedPackage(QUmlPackage *mergedPackage)
 {
-    Q_UNUSED(mergedPackage);
+    // This is a read-write association end
+
+    QM_D(QUmlPackageMerge);
+    if (d->mergedPackage != mergedPackage) {
+        d->mergedPackage = mergedPackage;
+    }
 }
 
 /*!
@@ -86,12 +94,20 @@ void QUmlPackageMerge::setMergedPackage(QUmlPackage *mergedPackage)
  */
 QUmlPackage *QUmlPackageMerge::receivingPackage() const
 {
-    return 0;
+    // This is a read-write association end
+
+    QM_D(const QUmlPackageMerge);
+    return d->receivingPackage;
 }
 
 void QUmlPackageMerge::setReceivingPackage(QUmlPackage *receivingPackage)
 {
-    Q_UNUSED(receivingPackage);
+    // This is a read-write association end
+
+    QM_D(QUmlPackageMerge);
+    if (d->receivingPackage != receivingPackage) {
+        d->receivingPackage = receivingPackage;
+    }
 }
 
 QT_END_NAMESPACE