Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShuai Li2015-10-22 12:23:18 -0400
committerShuai Li2015-12-09 05:40:34 -0500
commit9dbe7c012a5c5a7c7ec83749dc262febb178ddbe (patch)
treed0a6e289238b0ecc4eecc4a45e43c49ba43b599a
parented1a7e9b9fd1b85b120546f16d75711c55244330 (diff)
downloadorg.eclipse.papyrus-codegen_sync_code_model.tar.gz
org.eclipse.papyrus-codegen_sync_code_model.tar.xz
org.eclipse.papyrus-codegen_sync_code_model.zip
Bug 480441 - [Codegen C++] Top-level package name is in namespace ofcodegen_sync_code_model
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 <shuai.li@cea.fr>
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java2
1 files changed, 1 insertions, 1 deletions
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$
}
}

Back to the top