From e437230f580ff091d8d5f7e487cd870c2133c38b Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 27 Oct 2014 17:34:48 -0700 Subject: [PATCH] Cosmetics. --- .../core/dom/parser/cpp/CPPASTBinaryExpression.java | 9 ++++----- .../core/dom/parser/cpp/CPPASTTemplateIDAmbiguity.java | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java index d53a27e9918..dc282612822 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java @@ -40,7 +40,7 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr private ICPPASTInitializerClause operand2; private ICPPEvaluation evaluation; - private IASTImplicitName[] implicitNames = null; + private IASTImplicitName[] implicitNames; public CPPASTBinaryExpression() { } @@ -58,10 +58,9 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr @Override public CPPASTBinaryExpression copy(CopyStyle style) { - CPPASTBinaryExpression copy = new CPPASTBinaryExpression(); - copy.op = op; - copy.setOperand1(operand1 == null ? null : operand1.copy(style)); - copy.setInitOperand2(operand2 == null ? null : operand2.copy(style)); + CPPASTBinaryExpression copy = new CPPASTBinaryExpression(op, + operand1 == null ? null : operand1.copy(style), + operand2 == null ? null : operand2.copy(style)); return copy(copy, style); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateIDAmbiguity.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateIDAmbiguity.java index 836d44e6463..a6352b9b34c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateIDAmbiguity.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateIDAmbiguity.java @@ -64,7 +64,7 @@ public class CPPASTTemplateIDAmbiguity extends ASTAmbiguousNode for (BranchPoint v= fVariants; v != null; v= v.getNext()) { Variant selected= null; int bestCount= 0; - for (Variant q= v.getFirstVariant(); q != null ; q=q.getNext()) { + for (Variant q= v.getFirstVariant(); q != null ; q= q.getNext()) { final IASTName[] templateNames = q.getTemplateNames(); if (templateNames.length > bestCount) { // Don't check branch-points inside of a selected variant. @@ -72,7 +72,7 @@ public class CPPASTTemplateIDAmbiguity extends ASTAmbiguousNode if (((ASTNode) expression).getOffset() < minOffset) break; - // Setup the ast to use the alternative + // Setup the AST to use the alternative. owner.replace(nodeToReplace, expression); nodeToReplace= resolveNestedAmbiguities(expression, resolver); @@ -84,7 +84,7 @@ public class CPPASTTemplateIDAmbiguity extends ASTAmbiguousNode } } - // Adjust the operator sequence + // Adjust the operator sequence. if (selected != null) { minOffset= selected.getRightOffset(); BinaryOperator targetOp = selected.getTargetOperator(); @@ -141,7 +141,7 @@ public class CPPASTTemplateIDAmbiguity extends ASTAmbiguousNode @Override public IASTNode[] getNodes() { if (fNodes == null) { - List nl= new ArrayList(); + List nl= new ArrayList<>(); BinaryOperator op= fEndOperator; while (op != null) { nl.add(op.getExpression());