diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ASTStringUtil.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ASTStringUtil.java index f3e0d476dd0..9c0109b25a5 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ASTStringUtil.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ASTStringUtil.java @@ -149,7 +149,7 @@ public class ASTStringUtil { final boolean takesVarArgs= standardFunctionDecl.takesVarArgs(); final String[] parameterStrings= new String[parameters.length + (takesVarArgs ? 1 : 0)]; int i; - for (i=0; i < parameters.length; ++i) { + for (i = 0; i < parameters.length; ++i) { parameterStrings[i]= getParameterSignatureString(parameters[i]); } if (takesVarArgs) { @@ -160,10 +160,10 @@ public class ASTStringUtil { final ICASTKnRFunctionDeclarator knrDeclarator= (ICASTKnRFunctionDeclarator)functionDeclarator; final IASTName[] names= knrDeclarator.getParameterNames(); final String[] result= new String[names.length]; - for(int i=0; i 0) { buffer.append(COMMA_SPACE); } @@ -413,13 +434,13 @@ public class ASTStringUtil { } else if (functionDeclarator instanceof ICASTKnRFunctionDeclarator) { final ICASTKnRFunctionDeclarator knrDeclarator= (ICASTKnRFunctionDeclarator)functionDeclarator; final IASTName[] names= knrDeclarator.getParameterNames(); - for(int i=0; i 0) { buffer.append(COMMA_SPACE); } if (names[i] != null) { final IASTDeclarator declaratorForParameterName= knrDeclarator.getDeclaratorForParameterName(names[i]); - if(declaratorForParameterName != null) { + if (declaratorForParameterName != null) { appendSignatureString(buffer, declaratorForParameterName); } } @@ -611,7 +632,7 @@ public class ASTStringUtil { final ICPPASTQualifiedName qualifiedName= (ICPPASTQualifiedName)name; if (qualified) { final IASTName[] names= qualifiedName.getNames(); - for (int i= 0; i < names.length; i++) { + for (int i = 0; i < names.length; i++) { if (i > 0) { buffer.append(Keywords.cpCOLONCOLON); } @@ -625,7 +646,7 @@ public class ASTStringUtil { appendQualifiedNameString(buffer, templateId.getTemplateName()); final IASTNode[] templateArguments= templateId.getTemplateArguments(); buffer.append(Keywords.cpLT); - for (int i= 0; i < templateArguments.length; i++) { + for (int i = 0; i < templateArguments.length; i++) { if (i > 0) { buffer.append(Keywords.cpCOMMA); } @@ -652,7 +673,7 @@ public class ASTStringUtil { } else if (expression instanceof IASTExpressionList) { final IASTExpressionList expressionList= (IASTExpressionList)expression; final IASTExpression[] expressions= expressionList.getExpressions(); - for (int i= 0; i < expressions.length; i++) { + for (int i = 0; i < expressions.length; i++) { if (i > 0) { buffer.append(COMMA_SPACE); } @@ -675,7 +696,7 @@ public class ASTStringUtil { return buffer; } - private static StringBuilder appendTemplateParameterString(StringBuilder buffer, ICPPASTTemplateParameter parameter){ + private static StringBuilder appendTemplateParameterString(StringBuilder buffer, ICPPASTTemplateParameter parameter) { if (parameter instanceof ICPPASTParameterDeclaration) { appendParameterDeclarationString(buffer, (ICPPASTParameterDeclaration)parameter); } else if (parameter instanceof ICPPASTSimpleTypeTemplateParameter) { @@ -698,7 +719,7 @@ public class ASTStringUtil { final ICPPASTTemplatedTypeTemplateParameter templatedTypeParameter= (ICPPASTTemplatedTypeTemplateParameter)parameter; final ICPPASTTemplateParameter[] subParameters= templatedTypeParameter.getTemplateParameters(); buffer.append(Keywords.TEMPLATE).append(Keywords.cpLT); - for (int i= 0; i < subParameters.length; i++) { + for (int i = 0; i < subParameters.length; i++) { final ICPPASTTemplateParameter templateParameter= subParameters[i]; if (i > 0) { buffer.append(COMMA_SPACE); @@ -710,5 +731,4 @@ public class ASTStringUtil { } return buffer; } - } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java index 52a808082e1..0044e11d904 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java @@ -40,6 +40,7 @@ import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; +import org.eclipse.cdt.internal.core.model.ASTStringUtil; import org.eclipse.core.runtime.PlatformObject; /** @@ -346,21 +347,13 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI public ILinkage getLinkage() { return Linkage.CPP_LINKAGE; } - + @Override public String toString() { String[] names = getQualifiedName(); if (names.length == 0) { return ""; //$NON-NLS-1$ - } else if (names.length == 1) { - return names[0]; - } else { - StringBuilder buf = new StringBuilder(names[0]); - for (int i = 1; i < names.length; i++) { - buf.append(Keywords.cpCOLONCOLON); - buf.append(names[i]); - } - return buf.toString(); } + return ASTStringUtil.join(names, String.valueOf(Keywords.cpCOLONCOLON)); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java index 247a02ad3de..c462681299c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java @@ -27,10 +27,12 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective; import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.index.IIndexFileSet; import org.eclipse.cdt.core.index.IndexFilter; +import org.eclipse.cdt.core.parser.Keywords; import org.eclipse.cdt.core.parser.util.ArrayUtil; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics; import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants; import org.eclipse.cdt.internal.core.index.IIndexScope; +import org.eclipse.cdt.internal.core.model.ASTStringUtil; import org.eclipse.cdt.internal.core.pdom.PDOM; import org.eclipse.cdt.internal.core.pdom.db.BTree; import org.eclipse.cdt.internal.core.pdom.db.IBTreeVisitor; @@ -41,7 +43,6 @@ import org.eclipse.core.runtime.CoreException; /** * @author Doug Schaefer - * */ class PDOMCPPNamespace extends PDOMCPPBinding implements ICPPNamespace, ICPPNamespaceScope, IIndexScope { @@ -74,12 +75,10 @@ class PDOMCPPNamespace extends PDOMCPPBinding } @Override - @SuppressWarnings("hiding") public void accept(final IPDOMVisitor visitor) throws CoreException { if (visitor instanceof IBTreeVisitor) { getIndex().accept((IBTreeVisitor) visitor); - } - else { + } else { getIndex().accept(new IBTreeVisitor() { public int compare(int record) throws CoreException { return 0; @@ -112,7 +111,8 @@ class PDOMCPPNamespace extends PDOMCPPBinding public IBinding[] find(String name) { try { - BindingCollector visitor = new BindingCollector(getLinkageImpl(), name.toCharArray(), IndexFilter.ALL_DECLARED_OR_IMPLICIT,false, true); + BindingCollector visitor = new BindingCollector(getLinkageImpl(), name.toCharArray(), + IndexFilter.ALL_DECLARED_OR_IMPLICIT,false, true); getIndex().accept(visitor); return visitor.getBindings(); } catch (CoreException e) { @@ -136,13 +136,15 @@ class PDOMCPPNamespace extends PDOMCPPBinding } @Override - public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) throws DOMException { + public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) + throws DOMException { IBinding[] result = null; try { if (!prefixLookup) { return getBindingsViaCache(name.toCharArray()); } - BindingCollector visitor= new BindingCollector(getLinkageImpl(), name.toCharArray(), IndexFilter.ALL_DECLARED_OR_IMPLICIT, prefixLookup, !prefixLookup); + BindingCollector visitor= new BindingCollector(getLinkageImpl(), name.toCharArray(), + IndexFilter.ALL_DECLARED_OR_IMPLICIT, prefixLookup, !prefixLookup); getIndex().accept(visitor); IBinding[] bindings = visitor.getBindings(); if (fileSet != null) { @@ -161,7 +163,8 @@ class PDOMCPPNamespace extends PDOMCPPBinding if (result != null) { return result; } - BindingCollector visitor = new BindingCollector(getLinkageImpl(), name, IndexFilter.ALL_DECLARED_OR_IMPLICIT, false, true); + BindingCollector visitor = new BindingCollector(getLinkageImpl(), name, + IndexFilter.ALL_DECLARED_OR_IMPLICIT, false, true); getIndex().accept(visitor); result = visitor.getBindings(); pdom.putCachedResult(key, result); @@ -177,7 +180,6 @@ class PDOMCPPNamespace extends PDOMCPPBinding return true; } - @SuppressWarnings("hiding") public IBinding[] getMemberBindings() throws DOMException { IBinding[] result = null; final List preresult = new ArrayList(); @@ -192,15 +194,24 @@ class PDOMCPPNamespace extends PDOMCPPBinding } }); result = preresult.toArray(new IBinding[preresult.size()]); - } catch(CoreException ce) { + } catch (CoreException ce) { CCorePlugin.log(ce); } return result; } - public void addUsingDirective(ICPPUsingDirective directive) throws DOMException {fail();} + public void addUsingDirective(ICPPUsingDirective directive) throws DOMException { fail(); } public IIndexBinding getScopeBinding() { return this; } + + @Override + public String toString() { + String[] names = getQualifiedName(); + if (names.length == 0) { + return ""; //$NON-NLS-1$ + } + return ASTStringUtil.join(names, String.valueOf(Keywords.cpCOLONCOLON)); + } }