diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java index 9200df602a1..8793d23c861 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java @@ -24,20 +24,20 @@ import org.eclipse.cdt.core.dom.ast.IASTTypeId; */ public interface ICPPASTTemplateId extends ICPPASTName, IASTNameOwner { /** - * TEMPLATE_NAME is the IASTName. + * The template name in the template ID. */ public static final ASTNodeProperty TEMPLATE_NAME = new ASTNodeProperty( "ICPPASTTemplateId.TEMPLATE_NAME - TemplateId Name"); //$NON-NLS-1$ /** - * Get the name. + * Returns the name. * * @return {@code IASTName} */ public IASTName getTemplateName(); /** - * Set the name. + * Sets the name. * * @param name {@code IASTName} */ @@ -50,9 +50,10 @@ public interface ICPPASTTemplateId extends ICPPASTName, IASTNameOwner { "ICPPASTTemplateId.TEMPLATE_ID_ARGUMENT - TemplateId Argument"); //$NON-NLS-1$ /** - * Constant. + * @deprecated Use IASTNode.EMPTY_NODE_ARRAY instead. */ - public static final IASTNode[] EMPTY_ARG_ARRAY = {}; + @Deprecated + public static final IASTNode[] EMPTY_ARG_ARRAY = IASTNode.EMPTY_NODE_ARRAY; /** * Adds template argument. diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java index 9785956fa2f..78c28f39679 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java @@ -39,7 +39,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; */ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateId, IASTAmbiguityParent { private IASTName templateName; - private IASTNode[] templateArguments; + private IASTNode[] templateArguments = IASTNode.EMPTY_NODE_ARRAY; public CPPASTTemplateId() { } @@ -91,7 +91,7 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI private void internalAddTemplateArgument(IASTNode node) { assertNotFrozen(); - templateArguments = ArrayUtil.append(IASTNode.class, templateArguments, node); + templateArguments = ArrayUtil.append(templateArguments, node); if (node != null) { node.setParent(this); node.setPropertyInParent(TEMPLATE_ID_ARGUMENT); @@ -115,9 +115,7 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI @Override public IASTNode[] getTemplateArguments() { - if (templateArguments == null) - return ICPPASTTemplateId.EMPTY_ARG_ARRAY; - return ArrayUtil.trim(IASTNode.class, templateArguments); + return ArrayUtil.trim(templateArguments); } @Override @@ -196,12 +194,12 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI @Override public boolean isDeclaration() { - return false; //for now this seems to be true + return false; // For now this seems to be true. } @Override public boolean isReference() { - return true; //for now this seems to be true + return true; // For now this seems to be true. } @Override