455248: [Stereotypes Repair] The Stereotypes Repair dialog doesn't properly handle Controlled Packages without their own Profile Application

https://bugs.eclipse.org/bugs/show_bug.cgi?id=455248

Ensure that profile applications inherited from containing package contents (in case of a package unit being loaded) are properly accounted for to avoid spurious zombie reports.

1 files changed, 10 insertions, 1 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeApplicationRepairSnippet.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeApplicationRepairSnippet.java
index a859686ec1e..f3d1bd3cfb7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeApplicationRepairSnippet.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/internal/stereotypes/StereotypeApplicationRepairSnippet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 CEA and others.
+ * Copyright (c) 2014 CEA, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *   Christian W. Damus (CEA) - Initial API and implementation
+ *   Christian W. Damus - bug 455248
  *
  */
 package org.eclipse.papyrus.uml.modelrepair.internal.stereotypes;
@@ -167,6 +168,14 @@ public class StereotypeApplicationRepairSnippet implements IModelSetSnippet {
 			}
 		}
 
+		// We also need to get all profile applications inherited from containing packages in parent model units
+		if (root.eContainer() instanceof Element) {
+			Package containingPackage = ((Element) root.eContainer()).getNearestPackage();
+			if (containingPackage != null) {
+				profileApplications.addAll(containingPackage.getAllProfileApplications());
+			}
+		}
+
 		Set<EPackage> appliedDefinitions = getAppliedDefinitions(profileApplications);
 
 		Function<? super EPackage, Profile> profileSupplier = dynamicProfileSupplier;