Add subsetted property adjustment for single-valued properties

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

1 files changed, 17 insertions, 0 deletions

diff --git a/src/uml/qumlpackagemerge.cpp b/src/uml/qumlpackagemerge.cpp
index 5981eef6..71bd93ea 100644
--- a/src/uml/qumlpackagemerge.cpp
+++ b/src/uml/qumlpackagemerge.cpp
@@ -75,7 +75,15 @@ void QUmlPackageMerge::setMergedPackage(QUmlPackage *mergedPackage)
     // This is a read-write association end
 
     if (_mergedPackage != mergedPackage) {
+        // Adjust subsetted properties
+        removeTarget(_mergedPackage);
+
         _mergedPackage = mergedPackage;
+
+        // Adjust subsetted properties
+        if (mergedPackage) {
+            addTarget(mergedPackage);
+        }
     }
 }
 
@@ -94,7 +102,16 @@ void QUmlPackageMerge::setReceivingPackage(QUmlPackage *receivingPackage)
     // This is a read-write association end
 
     if (_receivingPackage != receivingPackage) {
+        // Adjust subsetted properties
+        removeSource(_receivingPackage);
+
         _receivingPackage = receivingPackage;
+
+        // Adjust subsetted properties
+        setOwner(receivingPackage);
+        if (receivingPackage) {
+            addSource(receivingPackage);
+        }
     }
 }