Bug 466448 - Changed the unit definition mapping to not set visibility

and then to maintain the target visiblility during model merge.

Change-Id: Icef9e1833f432b0e5901af6c44165039d9aeff87
Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/ModelMerge.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/ModelMerge.java
index a5e16eed424..1a1d6a7be53 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/ModelMerge.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/ModelMerge.java
@@ -63,7 +63,9 @@ public class ModelMerge {
 			Package targetPackage = (Package) target;
 			updateStereotypes(targetPackage, sourcePackage);
 			setList(targetPackage.getOwnedComments(), sourcePackage.getOwnedComments());
-			targetPackage.setVisibility(sourcePackage.getVisibility());
+			if (sourcePackage.isSetVisibility()) {
+				targetPackage.setVisibility(sourcePackage.getVisibility());
+			}
 			targetPackage.setName(nameOf(sourcePackage));
 			if (notStub(sourcePackage)) {
 				this.updateCollection(targetPackage.getPackagedElements(), sourcePackage.getPackagedElements());
@@ -241,7 +243,9 @@ public class ModelMerge {
 		setList(target.getGeneralizations(), source.getGeneralizations());
 		setList(target.getTemplateBindings(), source.getTemplateBindings());
 		target.setName(nameOf(source));
-		target.setVisibility(source.getVisibility());
+		if (source.isSetVisibility()) {
+			target.setVisibility(source.getVisibility());
+		}
 		target.setIsAbstract(source.isAbstract());
 		target.setOwnedTemplateSignature(source.getOwnedTemplateSignature());
 		if (notStub(source)) {