From fa96519c4cb310f34748c68be0516907015c4983 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Tue, 20 Sep 2016 13:01:57 -0700 Subject: [PATCH] Code streamlining. Change-Id: I00155566d6fd4cb8043ad38201a58181b995c52f --- .../dom/parser/cpp/CPPTemplateDefinition.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java index 9d9841d423e..5713eae2a35 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java @@ -193,19 +193,18 @@ public abstract class CPPTemplateDefinition extends PlatformObject implements IC @Override public ICPPTemplateParameter[] getTemplateParameters() { if (templateParameters == null) { + ICPPTemplateParameter[] result = ICPPTemplateParameter.EMPTY_TEMPLATE_PARAMETER_ARRAY; ICPPASTTemplateDeclaration template = CPPTemplates.getTemplateDeclaration(getTemplateName()); - if (template == null) - return ICPPTemplateParameter.EMPTY_TEMPLATE_PARAMETER_ARRAY; - ICPPASTTemplateParameter[] params = template.getTemplateParameters(); - IBinding p = null; - ICPPTemplateParameter[] result = null; - for (ICPPASTTemplateParameter param : params) { - p= CPPTemplates.getTemplateParameterName(param).resolveBinding(); - if (p instanceof ICPPTemplateParameter) { - result = ArrayUtil.append(ICPPTemplateParameter.class, result, (ICPPTemplateParameter) p); + if (template != null) { + ICPPASTTemplateParameter[] params = template.getTemplateParameters(); + for (ICPPASTTemplateParameter param : params) { + IBinding p= CPPTemplates.getTemplateParameterName(param).resolveBinding(); + if (p instanceof ICPPTemplateParameter) { + result = ArrayUtil.append(result, (ICPPTemplateParameter) p); + } } } - templateParameters = ArrayUtil.trim(ICPPTemplateParameter.class, result); + templateParameters = ArrayUtil.trim(result); } return templateParameters; }