From 9dbe7c012a5c5a7c7ec83749dc262febb178ddbe Mon Sep 17 00:00:00 2001 From: Shuai Li Date: Thu, 22 Oct 2015 18:23:18 +0200 Subject: Bug 480441 - [Codegen C++] Top-level package name is in namespace of attribute/parameter - Fix qualified name generation for a named element: no longer generates the root element in the name (since we never generate a namespace with the root element elsewhere) Signed-off-by: Shuai Li --- .../src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java index 36043a363ad..226f79ad34b 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java @@ -168,7 +168,7 @@ public class CppGenUtils { for (Namespace ns : ne.allNamespaces()) { // don't add qualified name for specific top-level namespace "root". // TODO: specific workaround for the way Qompass creates its target model. Needs to be removed. - if (!((ns.getOwner() == null) && ns.getName().equals("root"))) { //$NON-NLS-1$ + if (ns.getOwner() != null) { //$NON-NLS-1$ qName = ns.getName() + "::" + qName; //$NON-NLS-1$ } } -- cgit v1.2.3