diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPAliasTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPAliasTemplate.java index a4a3c3276cf..4d8257a99bf 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPAliasTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPAliasTemplate.java @@ -29,12 +29,13 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.core.runtime.PlatformObject; public class CPPAliasTemplate extends PlatformObject implements ICPPAliasTemplate { - private IASTName aliasName; - private IType aliasedType; + private final IASTName aliasName; + private final IType aliasedType; private ICPPTemplateParameter[] templateParameters; - public CPPAliasTemplate(IASTName aliasName){ + public CPPAliasTemplate(IASTName aliasName, IType aliasedType) { this.aliasName = aliasName; + this.aliasedType = aliasedType; aliasName.setBinding(this); } @@ -43,10 +44,6 @@ public class CPPAliasTemplate extends PlatformObject implements ICPPAliasTemplat return aliasedType; } - public void setType(IType type) { - this.aliasedType = type; - } - @Override public String getName() { return new String(getNameCharArray()); @@ -74,7 +71,7 @@ public class CPPAliasTemplate extends PlatformObject implements ICPPAliasTemplat @Override public boolean isSameType(IType type) { - if(type == null){ + if (type == null) { return false; } IType aliasedType = getType(); @@ -87,7 +84,7 @@ public class CPPAliasTemplate extends PlatformObject implements ICPPAliasTemplat try { t = (IType) super.clone(); } catch (CloneNotSupportedException e) { - //not going to happen + // Not going to happen } return t; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java index c68310ee3d8..5fb3c781c4c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java @@ -673,9 +673,7 @@ public class CPPVisitor extends ASTQueries { } if (type != null) { if (alias.getParent() instanceof ICPPASTTemplateDeclaration) { - CPPAliasTemplate templateAlias = new CPPAliasTemplate(alias.getAlias()); - templateAlias.setType(type); - binding = templateAlias; + binding = new CPPAliasTemplate(alias.getAlias(), type); } else { CPPTypedef typedef = new CPPTypedef(alias.getAlias()); typedef.setType(type);