From cd869eeed68b64eb1cd442b497cb1c1b009cf3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Nytra?= Date: Wed, 22 Jan 2014 15:34:38 +0100 Subject: [PATCH] Bug 423696 - [New Class Wizard] base classes has a fully qualified name, even though the new class is in the same namespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I08c2486686b2db540ba321334976a8d5830a2813 Signed-off-by: Jiří Nytra Reviewed-on: https://git.eclipse.org/r/20900 Tested-by: Hudson CI Reviewed-by: Sergey Prigogin IP-Clean: Sergey Prigogin Tested-by: Sergey Prigogin --- .../ui/wizards/classwizard/NewClassCodeGenerator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java index 047647fff9c..982f07ca193 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java @@ -683,7 +683,12 @@ public class NewClassCodeGenerator { text.append(" : "); //$NON-NLS-1$ for (int i = 0; i < fBaseClasses.length; ++i) { IBaseClassInfo baseClass = fBaseClasses[i]; - String baseClassName = baseClass.getType().getQualifiedTypeName().getFullyQualifiedName(); + IQualifiedTypeName qualifiedTypeName = baseClass.getType().getQualifiedTypeName(); + + if (fNamespace != null) + qualifiedTypeName = qualifiedTypeName.removeFirstSegments(qualifiedTypeName.matchingFirstSegments(fNamespace)); + String baseClassName = qualifiedTypeName.getFullyQualifiedName(); + if (i > 0) text.append(", "); //$NON-NLS-1$ if (baseClass.getAccess() == ASTAccessVisibility.PRIVATE)