466416 - [QDesigner] Replace Utils.getTop with PackageUtil.getRootPackage

4 files changed, 11 insertions, 7 deletions

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java
index cb897b197a6..e64ca26e575 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java
@@ -21,6 +21,7 @@ import org.eclipse.papyrus.FCM.util.IMappingRule;
 import org.eclipse.papyrus.FCM.util.MapUtil;
 import org.eclipse.papyrus.qompass.designer.core.Log;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
 import org.eclipse.uml2.uml.DataType;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Interface;
@@ -127,7 +128,7 @@ public class PullConsumer implements IMappingRule {
 					parameter.setType(type);
 				}
 			}
-			Package model = Utils.getTop(umlPort);
+			Package model = PackageUtil.getRootPackage(umlPort);
 			Element element = Utils.getQualifiedElement(model, BOOL_QNAME);
 			Type booleanType = null;
 			if (element instanceof Type) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
index 096e6255b29..f1b737d6544 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
 import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FixTemplateSync;
 import org.eclipse.papyrus.qompass.modellibs.core.Activator;
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Interface;
@@ -91,7 +92,7 @@ public class TemplatePort implements ITemplateMappingRule {
 			EList<Namespace> path = TemplateUtils.relativePathWithMerge(extendedPort, pkgTemplate);
 
 			String name = pkgTemplate.getName() + "_" + type.getName(); //$NON-NLS-1$
-			Package model = Utils.getTop(port);
+			Package model = PackageUtil.getRootPackage(port);
 			Package pkg = model.getNestedPackage(name);
 			if (pkg == null) {
 				model = Utils.getFirstLevel(port); // try whether package template exists here
@@ -125,7 +126,7 @@ public class TemplatePort implements ITemplateMappingRule {
 
 		TemplateSignature signature = TemplateUtils.getSignature(extendedPort.getNearestPackage());
 		if (signature != null) {
-			Package model = Utils.getTop(port);
+			Package model = PackageUtil.getRootPackage(port);
 			try {
 				TemplateBinding binding =
 						TemplateUtils.fixedBinding(model, extendedPort, (Classifier) type);
@@ -162,7 +163,7 @@ public class TemplatePort implements ITemplateMappingRule {
 			EList<Namespace> path = TemplateUtils.relativePathWithMerge(extendedPort, pkgTemplate);
 
 			String name = pkgTemplate.getName() + "_" + type.getName(); //$NON-NLS-1$
-			Package model = Utils.getTop(port);
+			Package model = PackageUtil.getRootPackage(port);
 			Package pkg = model.getNestedPackage(name);
 			if (pkg == null) {
 				model = Utils.getFirstLevel(port); // try whether package template exists here
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineGen.xtend b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineGen.xtend
index 3f3feae273d..69656151143 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineGen.xtend
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineGen.xtend
@@ -41,6 +41,7 @@ import static extension org.eclipse.papyrus.qompass.designer.core.UMLTool.*
 import static extension org.eclipse.papyrus.qompass.modellibs.core.xtend.BehaviorUtil.*
 import static extension org.eclipse.papyrus.qompass.modellibs.core.xtend.CppUtils.cppCall
 import static extension org.eclipse.papyrus.qompass.modellibs.core.xtend.StateMachineUtil.*
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil
 
 class StateMachineGen implements IXtend {
 
@@ -68,7 +69,7 @@ class StateMachineGen implements IXtend {
 #endif
 		for (;;) {
 			processEvents();
-		}	
+		}
 	'''
 	
 	def processEvents(Class clazz) {
@@ -96,7 +97,7 @@ class StateMachineGen implements IXtend {
 			«FOR attribute : signal.ownedAttributes»
 				signal->«attribute.name» = «attribute.name»;
 			«ENDFOR»
-			«Utils.getTop(operation).declareDependencyToSignalIDs»
+			«PackageUtil.getRootPackage(operation).declareDependencyToSignalIDs»
 			«UMLTool.declareDependency(TransformationContext.classifier, signal)»
 		«ELSE»
 			// create event with operationID/portID and pass call
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineUtil.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineUtil.java
index 76818d91231..22d28fc2a6a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineUtil.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/xtend/StateMachineUtil.java
@@ -8,6 +8,7 @@ import org.eclipse.papyrus.qompass.designer.core.UMLTool;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
+import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
 import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.PackageableElement;
@@ -213,7 +214,7 @@ public class StateMachineUtil {
 	 * @return
 	 */
 	public static Package boundPackageRef(Type actual) {
-		for (Package nestedPkg : Utils.getTop(actual).getNestedPackages()) {
+		for (Package nestedPkg : PackageUtil.getRootPackage(actual).getNestedPackages()) {
 			if (nestedPkg.getTemplateBindings().size() > 0) {
 				TemplateBinding binding = nestedPkg.getTemplateBindings().get(0);
 				if (actual == TemplateUtils.getFirstActualFromBinding(binding)) {