Mercurial > hg > jdk9-shenandoah > nashorn
changeset 1304:4da1c371efcb
8081809: Missing final modifier in method parameters (nashorn code convention)
Reviewed-by: attila, hannesw
line wrap: on
line diff
--- a/samples/find_nonfinals.js Wed Jun 03 09:36:58 2015 +0200 +++ b/samples/find_nonfinals.js Wed Jun 03 18:44:12 2015 +0530 @@ -39,6 +39,7 @@ var Class = Java.type("java.lang.Class"); var System = Java.type("java.lang.System"); +var Thread = Java.type("java.lang.Thread"); var File = Java.type("java.io.File"); var JarFile = Java.type("java.util.jar.JarFile"); var Modifier = Java.type("java.lang.reflect.Modifier"); @@ -58,6 +59,10 @@ function analyzeClass(cls) { var methods = cls.getDeclaredMethods(); for each (var method in methods) { + var methodModifiers = method.modifiers; + if (Modifier.isAbstract(methodModifiers) || Modifier.isNative(methodModifiers)) { + continue; + } // this requires -parameters option when compiling java sources var params = method.parameters; for each (var p in params) { @@ -73,6 +78,8 @@ } var jarFile = findNashorn(); +var ctxtLoader = Thread.currentThread().contextClassLoader; + // load each class and use reflection to analyze each Class new JarFile(jarFile).stream().forEach( function(entry) { @@ -80,8 +87,15 @@ if (name.endsWith(".class")) { var clsName = name.substring(0, name.lastIndexOf('.class')); clsName = clsName.replace(/\//g, '.'); - var cls = Class.forName(clsName); - analyzeClass(cls); + try { + // don't initialize to avoid for possible initialization errors + var cls = Class.forName(clsName, false, ctxtLoader); + analyzeClass(cls); + } catch (e) { + // print exception and continue analysis for other classes + print("Failed to analyze " + clsName); + e.printStackTrace(); + } } } )
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayAccessTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -53,7 +53,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitArrayAccess(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ArrayLiteralTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -47,7 +47,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitArrayLiteral(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/AssignmentTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -55,7 +55,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitAssignment(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BinaryTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -55,7 +55,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitBinary(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BlockTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -53,7 +53,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitBlock(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/BreakTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -46,7 +46,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitBreak(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CaseTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -56,7 +56,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitCase(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CatchTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -63,7 +63,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitCatch(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompilationUnitTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -67,7 +67,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitCompilationUnit(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/CompoundAssignmentTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -57,7 +57,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitCompoundAssignment(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ConditionalExpressionTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -61,7 +61,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitConditionalExpression(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ContinueTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -46,7 +46,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitContinue(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DebuggerTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -38,7 +38,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitDebugger(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/DoWhileLoopTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -54,7 +54,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitDoWhileLoop(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/EmptyStatementTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -38,7 +38,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitEmptyStatement(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ErroneousTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -38,7 +38,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitErroneous(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ExpressionStatementTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -46,7 +46,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitExpressionStatement(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForInLoopTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -71,7 +71,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitForInLoop(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ForLoopTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -72,7 +72,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitForLoop(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionCallTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -55,7 +55,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitFunctionCall(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionDeclarationTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -74,7 +74,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitFunctionDeclaration(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/FunctionExpressionTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -79,7 +79,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitFunctionExpression(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IdentifierTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -47,7 +47,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitIdentifier(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/IfTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -63,7 +63,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitIf(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/InstanceOfTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -52,7 +52,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitInstanceOf(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LabeledStatementTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -54,7 +54,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitLabeledStatement(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LineMapImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -35,12 +35,12 @@ } @Override - public long getLineNumber(long pos) { + public long getLineNumber(final long pos) { return source.getLine((int)pos); } @Override - public long getColumnNumber(long pos) { + public long getColumnNumber(final long pos) { return source.getColumn((int)pos); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/LiteralTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -61,7 +61,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitLiteral(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/MemberSelectTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -53,7 +53,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitMemberSelect(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/NewTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -47,7 +47,7 @@ } @Override - public <R, D> R accept(TreeVisitor<R, D> visitor, D data) { + public <R, D> R accept(final TreeVisitor<R, D> visitor, final D data) { return visitor.visitNew(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ObjectLiteralTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -47,7 +47,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitObjectLiteral(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/PropertyTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -70,7 +70,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitProperty(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/RegExpLiteralTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -56,7 +56,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitRegExpLiteral(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ReturnTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -46,7 +46,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitReturn(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SimpleTreeVisitorES5_1.java Wed Jun 03 18:44:12 2015 +0530 @@ -48,28 +48,28 @@ */ public class SimpleTreeVisitorES5_1<R, P> implements TreeVisitor<R, P> { @Override - public R visitAssignment(AssignmentTree node, P r) { + public R visitAssignment(final AssignmentTree node, final P r) { node.getVariable().accept(this, r); node.getExpression().accept(this, r); return null; } @Override - public R visitCompoundAssignment(CompoundAssignmentTree node, P r) { + public R visitCompoundAssignment(final CompoundAssignmentTree node, final P r) { node.getVariable().accept(this, r); node.getExpression().accept(this, r); return null; } @Override - public R visitBinary(BinaryTree node, P r) { + public R visitBinary(final BinaryTree node, final P r) { node.getLeftOperand().accept(this, r); node.getRightOperand().accept(this, r); return null; } @Override - public R visitBlock(BlockTree node, P r) { + public R visitBlock(final BlockTree node, final P r) { node.getStatements().forEach((tree) -> { tree.accept(this, r); }); @@ -77,12 +77,12 @@ } @Override - public R visitBreak(BreakTree node, P r) { + public R visitBreak(final BreakTree node, final P r) { return null; } @Override - public R visitCase(CaseTree node, P r) { + public R visitCase(final CaseTree node, final P r) { final Tree caseVal = node.getExpression(); if (caseVal != null) { caseVal.accept(this, r); @@ -95,7 +95,7 @@ } @Override - public R visitCatch(CatchTree node, P r) { + public R visitCatch(final CatchTree node, final P r) { final Tree cond = node.getCondition(); if (cond != null) { cond.accept(this, r); @@ -106,7 +106,7 @@ } @Override - public R visitConditionalExpression(ConditionalExpressionTree node, P r) { + public R visitConditionalExpression(final ConditionalExpressionTree node, final P r) { node.getCondition().accept(this, r); node.getTrueExpression().accept(this, r); node.getFalseExpression().accept(this, r); @@ -114,35 +114,35 @@ } @Override - public R visitContinue(ContinueTree node, P r) { + public R visitContinue(final ContinueTree node, final P r) { return null; } @Override - public R visitDebugger(DebuggerTree node, P r) { + public R visitDebugger(final DebuggerTree node, final P r) { return null; } @Override - public R visitDoWhileLoop(DoWhileLoopTree node, P r) { + public R visitDoWhileLoop(final DoWhileLoopTree node, final P r) { node.getStatement().accept(this, r); node.getCondition().accept(this, r); return null; } @Override - public R visitErroneous(ErroneousTree node, P r) { + public R visitErroneous(final ErroneousTree node, final P r) { return null; } @Override - public R visitExpressionStatement(ExpressionStatementTree node, P r) { + public R visitExpressionStatement(final ExpressionStatementTree node, final P r) { node.getExpression().accept(this, r); return null; } @Override - public R visitForLoop(ForLoopTree node, P r) { + public R visitForLoop(final ForLoopTree node, final P r) { final Tree init = node.getInitializer(); if (init != null) { init.accept(this, r); @@ -163,7 +163,7 @@ } @Override - public R visitForInLoop(ForInLoopTree node, P r) { + public R visitForInLoop(final ForInLoopTree node, final P r) { node.getVariable().accept(this, r); node.getExpression().accept(this, r); final StatementTree stat = node.getStatement(); @@ -174,7 +174,7 @@ } @Override - public R visitFunctionCall(FunctionCallTree node, P r) { + public R visitFunctionCall(final FunctionCallTree node, final P r) { node.getFunctionSelect().accept(this, r); node.getArguments().forEach((tree) -> { tree.accept(this, r); @@ -183,7 +183,7 @@ } @Override - public R visitFunctionDeclaration(FunctionDeclarationTree node, P r) { + public R visitFunctionDeclaration(final FunctionDeclarationTree node, final P r) { node.getParameters().forEach((tree) -> { tree.accept(this, r); }); @@ -192,7 +192,7 @@ } @Override - public R visitFunctionExpression(FunctionExpressionTree node, P r) { + public R visitFunctionExpression(final FunctionExpressionTree node, final P r) { node.getParameters().forEach((tree) -> { tree.accept(this, r); }); @@ -201,12 +201,12 @@ } @Override - public R visitIdentifier(IdentifierTree node, P r) { + public R visitIdentifier(final IdentifierTree node, final P r) { return null; } @Override - public R visitIf(IfTree node, P r) { + public R visitIf(final IfTree node, final P r) { node.getCondition().accept(this, r); node.getThenStatement().accept(this, r); final Tree elseStat = node.getElseStatement(); @@ -217,14 +217,14 @@ } @Override - public R visitArrayAccess(ArrayAccessTree node, P r) { + public R visitArrayAccess(final ArrayAccessTree node, final P r) { node.getExpression().accept(this, r); node.getIndex().accept(this, r); return null; } @Override - public R visitArrayLiteral(ArrayLiteralTree node, P r) { + public R visitArrayLiteral(final ArrayLiteralTree node, final P r) { node.getElements().stream().filter((tree) -> (tree != null)).forEach((tree) -> { tree.accept(this, r); }); @@ -232,24 +232,24 @@ } @Override - public R visitLabeledStatement(LabeledStatementTree node, P r) { + public R visitLabeledStatement(final LabeledStatementTree node, final P r) { node.getStatement().accept(this, r); return null; } @Override - public R visitLiteral(LiteralTree node, P r) { + public R visitLiteral(final LiteralTree node, final P r) { return null; } @Override - public R visitParenthesized(ParenthesizedTree node, P r) { + public R visitParenthesized(final ParenthesizedTree node, final P r) { node.getExpression().accept(this, r); return null; } @Override - public R visitReturn(ReturnTree node, P r) { + public R visitReturn(final ReturnTree node, final P r) { final Tree retExpr = node.getExpression(); if (retExpr != null) { retExpr.accept(this, r); @@ -258,19 +258,19 @@ } @Override - public R visitMemberSelect(MemberSelectTree node, P r) { + public R visitMemberSelect(final MemberSelectTree node, final P r) { node.getExpression().accept(this, r); return null; } @Override - public R visitNew(NewTree node, P r) { + public R visitNew(final NewTree node, final P r) { node.getConstructorExpression().accept(this, r); return null; } @Override - public R visitObjectLiteral(ObjectLiteralTree node, P r) { + public R visitObjectLiteral(final ObjectLiteralTree node, final P r) { node.getProperties().forEach((tree) -> { tree.accept(this, r); }); @@ -278,7 +278,7 @@ } @Override - public R visitProperty(PropertyTree node, P r) { + public R visitProperty(final PropertyTree node, final P r) { FunctionExpressionTree getter = node.getGetter(); if (getter != null) { getter.accept(this, r); @@ -301,17 +301,17 @@ } @Override - public R visitRegExpLiteral(RegExpLiteralTree node, P r) { + public R visitRegExpLiteral(final RegExpLiteralTree node, final P r) { return null; } @Override - public R visitEmptyStatement(EmptyStatementTree node, P r) { + public R visitEmptyStatement(final EmptyStatementTree node, final P r) { return null; } @Override - public R visitSwitch(SwitchTree node, P r) { + public R visitSwitch(final SwitchTree node, final P r) { node.getExpression().accept(this, r); node.getCases().forEach((tree) -> { tree.accept(this, r); @@ -320,13 +320,13 @@ } @Override - public R visitThrow(ThrowTree node, P r) { + public R visitThrow(final ThrowTree node, final P r) { node.getExpression().accept(this, r); return null; } @Override - public R visitCompilationUnit(CompilationUnitTree node, P r) { + public R visitCompilationUnit(final CompilationUnitTree node, final P r) { node.getSourceElements().forEach((tree) -> { tree.accept(this, r); }); @@ -334,7 +334,7 @@ } @Override - public R visitTry(TryTree node, P r) { + public R visitTry(final TryTree node, final P r) { node.getBlock().accept(this, r); node.getCatches().forEach((tree) -> { tree.accept(this, r); @@ -348,20 +348,20 @@ } @Override - public R visitInstanceOf(InstanceOfTree node, P r) { + public R visitInstanceOf(final InstanceOfTree node, final P r) { node.getType().accept(this, r); node.getExpression().accept(this, r); return null; } @Override - public R visitUnary(UnaryTree node, P r) { + public R visitUnary(final UnaryTree node, final P r) { node.getExpression().accept(this, r); return null; } @Override - public R visitVariable(VariableTree node, P r) { + public R visitVariable(final VariableTree node, final P r) { if (node.getInitializer() != null) { node.getInitializer().accept(this, r); } @@ -369,21 +369,21 @@ } @Override - public R visitWhileLoop(WhileLoopTree node, P r) { + public R visitWhileLoop(final WhileLoopTree node, final P r) { node.getCondition().accept(this, r); node.getStatement().accept(this, r); return null; } @Override - public R visitWith(WithTree node, P r) { + public R visitWith(final WithTree node, final P r) { node.getScope().accept(this, r); node.getStatement().accept(this, r); return null; } @Override - public R visitUnknown(Tree node, P r) { + public R visitUnknown(final Tree node, final P r) { // unknown in ECMAScript 5.1 edition throw new UnknownTreeException(node, r); }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/SwitchTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -55,7 +55,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitSwitch(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/ThrowTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -45,7 +45,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitThrow(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -47,7 +47,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitUnknown(this, data); }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/TryTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -63,7 +63,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitTry(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/UnaryTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -47,7 +47,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitUnary(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/VariableTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -53,7 +53,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitVariable(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WhileLoopTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -54,7 +54,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitWhileLoop(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/api/tree/WithTreeImpl.java Wed Jun 03 18:44:12 2015 +0530 @@ -53,7 +53,7 @@ } @Override - public <R,D> R accept(TreeVisitor<R,D> visitor, D data) { + public <R,D> R accept(final TreeVisitor<R,D> visitor, final D data) { return visitor.visitWith(this, data); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CompilationPhase.java Wed Jun 03 18:44:12 2015 +0530 @@ -363,7 +363,7 @@ //partial code generation final FunctionNode newFunctionNode = transformFunction(fn, new ReplaceCompileUnits() { @Override - CompileUnit getReplacement(CompileUnit original) { + CompileUnit getReplacement(final CompileUnit original) { return map.get(original); }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesPersistence.java Wed Jun 03 18:44:12 2015 +0530 @@ -567,7 +567,7 @@ final MessageDigest digest = MessageDigest.getInstance("SHA-1"); Files.walk(nashorn).forEach(new Consumer<Path>() { @Override - public void accept(Path p) { + public void accept(final Path p) { // take only the .class resources. if (Files.isRegularFile(p) && p.toString().endsWith(".class")) { try {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitIntoFunctions.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/SplitIntoFunctions.java Wed Jun 03 18:44:12 2015 +0530 @@ -102,7 +102,7 @@ public SplitIntoFunctions(final Compiler compiler) { super(new BlockLexicalContext() { @Override - protected Block afterSetStatements(Block block) { + protected Block afterSetStatements(final Block block) { for(Statement stmt: block.getStatements()) { assert !(stmt instanceof SplitNode); } @@ -305,7 +305,7 @@ } @Override - public boolean enterVarNode(VarNode varNode) { + public boolean enterVarNode(final VarNode varNode) { if (!inSplitNode()) { return super.enterVarNode(varNode); }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitReturn.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/SplitReturn.java Wed Jun 03 18:44:12 2015 +0530 @@ -54,7 +54,7 @@ } @Override - public void toString(StringBuilder sb, boolean printType) { + public void toString(final StringBuilder sb, final boolean printType) { sb.append(":splitreturn;"); }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/TryNode.java Wed Jun 03 18:44:12 2015 +0530 @@ -122,7 +122,7 @@ * @param visitor IR navigating visitor. */ @Override - public Node accept(final LexicalContext lc, NodeVisitor<? extends LexicalContext> visitor) { + public Node accept(final LexicalContext lc, final NodeVisitor<? extends LexicalContext> visitor) { if (visitor.enterTryNode(this)) { // Need to do finallybody first for termination analysis. TODO still necessary? final Block newFinallyBody = finallyBody == null ? null : (Block)finallyBody.accept(visitor);
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java Wed Jun 03 09:36:58 2015 +0200 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBeansLinker.java Wed Jun 03 18:44:12 2015 +0530 @@ -246,7 +246,7 @@ } @Override - public MethodHandle filterInternalObjects(MethodHandle target) { + public MethodHandle filterInternalObjects(final MethodHandle target) { return linkerServices.filterInternalObjects(target); } }