diff options
author | Ansgar Radermacher | 2015-05-05 12:05:22 +0000 |
---|---|---|
committer | Ansgar Radermacher | 2015-05-05 12:06:11 +0000 |
commit | 9b9979a9f7b667511b41a19d09a7c492b21d4604 (patch) | |
tree | adf7f1ee306ad00dc20b82d04af5bc07a122587b /extraplugins/qompass-designer/tracing | |
parent | 9caf1077b7999d55be53197aeb535bbef8060ef0 (diff) | |
download | org.eclipse.papyrus-9b9979a9f7b667511b41a19d09a7c492b21d4604.tar.gz org.eclipse.papyrus-9b9979a9f7b667511b41a19d09a7c492b21d4604.tar.xz org.eclipse.papyrus-9b9979a9f7b667511b41a19d09a7c492b21d4604.zip |
466416 - [QDesigner] Replace Utils.getTop with PackageUtil.getRootPackage
Diffstat (limited to 'extraplugins/qompass-designer/tracing')
2 files changed, 4 insertions, 3 deletions
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java index 796b2440ff8..64cdef2bc3c 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java @@ -1,10 +1,10 @@ package org.eclipse.papyrus.qompass.modellibs.tracing; import org.eclipse.papyrus.qompass.designer.core.PortUtils; -import org.eclipse.papyrus.qompass.designer.core.Utils; import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils; import org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator; import org.eclipse.papyrus.qompass.designer.core.transformations.container.ContainerTrafo; +import org.eclipse.papyrus.uml.tools.utils.PackageUtil; import org.eclipse.uml2.uml.InstanceSpecification; import org.eclipse.uml2.uml.Interface; import org.eclipse.uml2.uml.Operation; @@ -49,7 +49,7 @@ public class IConfiguratorOTF implements IInstanceConfigurator { // since we add instance information to the trace (is that useful??, seems like a hack) // TODO: originally, we used executorIS *in source model* for (Operation op : intf.getOperations()) { - String id = Utils.getTop(instance).getName() + "::Tracing::Trace::ID_" + //$NON-NLS-1$ + String id = PackageUtil.getRootPackage(instance).getName() + "::Tracing::Trace::ID_" + //$NON-NLS-1$ instance.getName().replace(".", "_") + "_" + op.getName(); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ DepPlanUtils.configureProperty(instance, "id_" + op.getName(), id); //$NON-NLS-1$ } diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java index d528c835a6a..8e286a6792e 100644 --- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java +++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java @@ -24,6 +24,7 @@ import org.eclipse.papyrus.infra.services.tracepoints.TracepointConstants; import org.eclipse.papyrus.qompass.designer.core.Description; 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.papyrus.uml.tools.utils.StereotypeUtil; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Element; @@ -152,7 +153,7 @@ public class QompassTraceMechanism implements ITraceMechanism { } return new BasicEList<ContainerRule>(); } else { - Package top = Utils.getTop((Element) eObj); + Package top = PackageUtil.getRootPackage((Element) eObj); return Utils.getAllRules(top); } } |