370412: ClassCastException in PackageUtil, when Package is contained in a component

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

1 files changed, 12 insertions, 2 deletions

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PackageUtil.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PackageUtil.java
index d740e150704..702c8b21429 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PackageUtil.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils/src/org/eclipse/papyrus/uml/tools/utils/PackageUtil.java
@@ -143,10 +143,20 @@ public class PackageUtil {
 	 * @return the top {@link Package} for the specified element
 	 */
 	public static Package getRootPackage(Package package_) {
-		if(package_.getOwner() == null) {
+		Element owner = package_.getOwner();
+
+		//Bug 370412: The package might not be contained in a Package 
+		//(e.g. it can be contained in a Component). Search for the nearest
+		//package, excluding self (Package#getNearestPackage() returns self)
+		while(owner != null && !(owner instanceof Package)) {
+			owner = owner.getOwner();
+		}
+
+		if(owner == null) {
 			return package_;
 		}
-		return getRootPackage((Package)package_.getOwner());
+
+		return getRootPackage((Package)owner);
 	}
 
 	/**