diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/cpd/ApexLanguage.java b/pmd-apex/src/main/java/net/sourceforge/pmd/cpd/ApexLanguage.java
index ef6f6ce790..0bb7bd7014 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/cpd/ApexLanguage.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/cpd/ApexLanguage.java
@@ -17,6 +17,7 @@ public class ApexLanguage extends AbstractLanguage {
         setProperties(properties);
     }
 
+    @Override
     public final void setProperties(Properties properties) {
         ApexTokenizer tokenizer = (ApexTokenizer) getTokenizer();
         tokenizer.setProperties(properties);
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/cpd/ApexTokenizer.java b/pmd-apex/src/main/java/net/sourceforge/pmd/cpd/ApexTokenizer.java
index f83cb65cfa..c872489c02 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/cpd/ApexTokenizer.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/cpd/ApexTokenizer.java
@@ -40,6 +40,7 @@ public class ApexTokenizer implements Tokenizer {
 
         ANTLRStringStream ass = new ANTLRStringStream(code.toString());
         ApexLexer lexer = new ApexLexer(ass) {
+            @Override
             public void emitErrorMessage(String msg) {
                 throw new TokenMgrError(msg, TokenMgrError.LEXICAL_ERROR);
             }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexHandler.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexHandler.java
index c71627bb43..6984ff1a36 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexHandler.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexHandler.java
@@ -31,6 +31,7 @@ public class ApexHandler extends AbstractLanguageVersionHandler {
         return new DefaultASTXPathHandler();
     }
 
+    @Override
     public RuleViolationFactory getRuleViolationFactory() {
         return ApexRuleViolationFactory.INSTANCE;
     }
@@ -40,6 +41,7 @@ public class ApexHandler extends AbstractLanguageVersionHandler {
         return new ApexParserOptions();
     }
 
+    @Override
     public Parser getParser(ParserOptions parserOptions) {
         return new ApexParser(parserOptions);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexParser.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexParser.java
index 63e0d529a7..f18cb518f4 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexParser.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexParser.java
@@ -29,14 +29,17 @@ public class ApexParser extends AbstractParser {
         return null;
     }
 
+    @Override
     public boolean canParse() {
         return true;
     }
 
+    @Override
     public Node parse(String fileName, Reader source) throws ParseException {
         return apexParser.parse(source);
     }
 
+    @Override
     public Map<Integer, String> getSuppressMap() {
         return apexParser.getSuppressMap();
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotation.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotation.java
index 59cf9357f1..1ba073df4b 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotation.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotation.java
@@ -18,6 +18,7 @@ public class ASTAnnotation extends AbstractApexNode<Annotation> {
         super(annotation);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java
index bbf6bc6ecf..be17773e78 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnnotationParameter.java
@@ -12,6 +12,7 @@ public class ASTAnnotationParameter extends AbstractApexNode<AnnotationParameter
         super(annotationParameter);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnonymousClass.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnonymousClass.java
index f75ed7e14a..4f63c004b1 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnonymousClass.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAnonymousClass.java
@@ -12,6 +12,7 @@ public class ASTAnonymousClass extends ApexRootNode<AnonymousClass> {
         super(anonymousClass);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayLoadExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayLoadExpression.java
index ad6686daa8..d5f938bb6e 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayLoadExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayLoadExpression.java
@@ -12,6 +12,7 @@ public class ASTArrayLoadExpression extends AbstractApexNode<ArrayLoadExpression
         super(arrayLoadExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayStoreExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayStoreExpression.java
index c35a7adc4c..0585b121f2 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayStoreExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTArrayStoreExpression.java
@@ -12,6 +12,7 @@ public class ASTArrayStoreExpression extends AbstractApexNode<ArrayStoreExpressi
         super(arrayStoreExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAssignmentExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAssignmentExpression.java
index 7d6d2bc00f..29f466692b 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAssignmentExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTAssignmentExpression.java
@@ -12,6 +12,7 @@ public class ASTAssignmentExpression extends AbstractApexNode<AssignmentExpressi
         super(assignmentExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBinaryExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBinaryExpression.java
index 577140ef48..3d7e85027f 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBinaryExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBinaryExpression.java
@@ -12,6 +12,7 @@ public class ASTBinaryExpression extends AbstractApexNode<BinaryExpression> {
         super(binaryExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBindExpressions.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBindExpressions.java
index 3357b3409d..7501f3ab8f 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBindExpressions.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBindExpressions.java
@@ -12,6 +12,7 @@ public class ASTBindExpressions extends AbstractApexNode<BindExpressions> {
         super(bindExpressions);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBlockStatement.java
index 387d8e9743..ab16315554 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBlockStatement.java
@@ -13,6 +13,7 @@ public class ASTBlockStatement extends AbstractApexNode<BlockStatement> {
         super(blockStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBooleanExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBooleanExpression.java
index b60935098b..f2e44dbc4a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBooleanExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBooleanExpression.java
@@ -12,6 +12,7 @@ public class ASTBooleanExpression extends AbstractApexNode<BooleanExpression> {
         super(booleanExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBreakStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBreakStatement.java
index 66f38758da..90b947d51b 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBreakStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBreakStatement.java
@@ -12,6 +12,7 @@ public class ASTBreakStatement extends AbstractApexNode<BreakStatement> {
         super(breakStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBridgeMethodCreator.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBridgeMethodCreator.java
index 32f5d80641..29be1c20c0 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBridgeMethodCreator.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTBridgeMethodCreator.java
@@ -12,6 +12,7 @@ public class ASTBridgeMethodCreator extends AbstractApexNode<BridgeMethodCreator
         super(bridgeMethodCreator);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCastExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCastExpression.java
index 74f52d243b..1a534a6eac 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCastExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCastExpression.java
@@ -12,6 +12,7 @@ public class ASTCastExpression extends AbstractApexNode<CastExpression> {
         super(node);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCatchBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCatchBlockStatement.java
index c00239bc0a..14f4929dee 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCatchBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTCatchBlockStatement.java
@@ -12,6 +12,7 @@ public class ASTCatchBlockStatement extends AbstractApexNode<CatchBlockStatement
         super(catchBlockStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTClassRefExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTClassRefExpression.java
index bc0669637e..92f4c5a51b 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTClassRefExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTClassRefExpression.java
@@ -12,6 +12,7 @@ public class ASTClassRefExpression extends AbstractApexNode<ClassRefExpression>
         super(classRefExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreamble.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreamble.java
index 41163d8384..3f532db8d6 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreamble.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreamble.java
@@ -12,6 +12,7 @@ public class ASTConstructorPreamble extends AbstractApexNode<ConstructorPreamble
         super(node);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreambleStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreambleStatement.java
index 89e9ec8d66..e8613c2844 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreambleStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTConstructorPreambleStatement.java
@@ -12,6 +12,7 @@ public class ASTConstructorPreambleStatement extends AbstractApexNode<Constructo
         super(constructorPreambleStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTContinueStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTContinueStatement.java
index 36138e8412..9a5a80aeab 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTContinueStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTContinueStatement.java
@@ -12,6 +12,7 @@ public class ASTContinueStatement extends AbstractApexNode<ContinueStatement> {
         super(continueStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlDeleteStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlDeleteStatement.java
index 3ff1a195a7..d876498594 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlDeleteStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlDeleteStatement.java
@@ -12,6 +12,7 @@ public class ASTDmlDeleteStatement extends AbstractApexNode<DmlDeleteStatement>
         super(dmlDeleteStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlInsertStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlInsertStatement.java
index 2589985cb2..2b818a94f4 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlInsertStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlInsertStatement.java
@@ -12,6 +12,7 @@ public class ASTDmlInsertStatement extends AbstractApexNode<DmlInsertStatement>
         super(dmlInsertStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlMergeStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlMergeStatement.java
index 41de98a930..7e1bebb433 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlMergeStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlMergeStatement.java
@@ -12,6 +12,7 @@ public class ASTDmlMergeStatement extends AbstractApexNode<DmlMergeStatement> {
         super(dmlMergeStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUndeleteStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUndeleteStatement.java
index 94396689e1..6e91324bd7 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUndeleteStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUndeleteStatement.java
@@ -12,6 +12,7 @@ public class ASTDmlUndeleteStatement extends AbstractApexNode<DmlUndeleteStateme
         super(dmlUndeleteStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpdateStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpdateStatement.java
index 9f6b11bf1d..587a536542 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpdateStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpdateStatement.java
@@ -12,6 +12,7 @@ public class ASTDmlUpdateStatement extends AbstractApexNode<DmlUpdateStatement>
         super(dmlUpdateStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpsertStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpsertStatement.java
index 4496376d8c..8f7512ec31 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpsertStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDmlUpsertStatement.java
@@ -12,6 +12,7 @@ public class ASTDmlUpsertStatement extends AbstractApexNode<DmlUpsertStatement>
         super(dmlUpsertStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDoLoopStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDoLoopStatement.java
index a6cdc9aeb8..6ac37c8bbe 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDoLoopStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTDoLoopStatement.java
@@ -12,6 +12,7 @@ public class ASTDoLoopStatement extends AbstractApexNode<DoLoopStatement> {
         super(doLoopStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpression.java
index 8914bcdf14..690ae31f5a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpression.java
@@ -12,6 +12,7 @@ public class ASTExpression extends AbstractApexNode<Expression> {
         super(expression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpressionStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpressionStatement.java
index 43be0a3ad7..b23a76b050 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpressionStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTExpressionStatement.java
@@ -12,6 +12,7 @@ public class ASTExpressionStatement extends AbstractApexNode<ExpressionStatement
         super(expressionStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java
index 2ab6bf0f32..e362a6d3af 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTField.java
@@ -14,6 +14,7 @@ public class ASTField extends AbstractApexNode<Field> implements CanSuppressWarn
         super(field);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -23,6 +24,7 @@ public class ASTField extends AbstractApexNode<Field> implements CanSuppressWarn
         return node.getFieldInfo().getName();
     }
 
+    @Override
     public boolean hasSuppressWarningsAnnotationFor(Rule rule) {
         for (ASTModifierNode modifier : findChildrenOfType(ASTModifierNode.class)) {
             for (ASTAnnotation a : modifier.findChildrenOfType(ASTAnnotation.class)) {
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclaration.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclaration.java
index 298e337dc0..9b84e46512 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclaration.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclaration.java
@@ -12,6 +12,7 @@ public class ASTFieldDeclaration extends AbstractApexNode<FieldDeclaration> {
         super(fieldDeclaration);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclarationStatements.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclarationStatements.java
index c8d8b7be2a..56ff04c40a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclarationStatements.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldDeclarationStatements.java
@@ -15,10 +15,12 @@ public class ASTFieldDeclarationStatements extends AbstractApexNode<FieldDeclara
         super(fieldDeclarationStatements);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
 
+    @Override
     public boolean hasSuppressWarningsAnnotationFor(Rule rule) {
         for (ASTModifierNode modifier : findChildrenOfType(ASTModifierNode.class)) {
             for (ASTAnnotation a : modifier.findChildrenOfType(ASTAnnotation.class)) {
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForEachStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForEachStatement.java
index d45bd310c8..5036d368db 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForEachStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForEachStatement.java
@@ -12,6 +12,7 @@ public class ASTForEachStatement extends AbstractApexNode<ForEachStatement> {
         super(forEachStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForLoopStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForLoopStatement.java
index 8f9ed06512..8fb8b9610f 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForLoopStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTForLoopStatement.java
@@ -12,6 +12,7 @@ public class ASTForLoopStatement extends AbstractApexNode<ForLoopStatement> {
         super(forLoopStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfBlockStatement.java
index 2198f30329..e2f633e6d2 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfBlockStatement.java
@@ -12,6 +12,7 @@ public class ASTIfBlockStatement extends AbstractApexNode<IfBlockStatement> {
         super(ifBlockStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfElseBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfElseBlockStatement.java
index 88a4143c9c..92571c5cad 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfElseBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIfElseBlockStatement.java
@@ -12,6 +12,7 @@ public class ASTIfElseBlockStatement extends AbstractApexNode<IfElseBlockStateme
         super(ifElseBlockStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIllegalStoreExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIllegalStoreExpression.java
index be7d283a1c..29f7017037 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIllegalStoreExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTIllegalStoreExpression.java
@@ -12,6 +12,7 @@ public class ASTIllegalStoreExpression extends AbstractApexNode<IllegalStoreExpr
         super(node);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInstanceOfExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInstanceOfExpression.java
index 4ddf741133..f1e94593cd 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInstanceOfExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTInstanceOfExpression.java
@@ -12,6 +12,7 @@ public class ASTInstanceOfExpression extends AbstractApexNode<InstanceOfExpressi
         super(instanceOfExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaMethodCallExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaMethodCallExpression.java
index 679ec6eb07..ba8c2b56f0 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaMethodCallExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaMethodCallExpression.java
@@ -12,6 +12,7 @@ public class ASTJavaMethodCallExpression extends AbstractApexNode<JavaMethodCall
         super(javaMethodCallExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaVariableExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaVariableExpression.java
index 84f91da4f1..78c3f14e2d 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaVariableExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTJavaVariableExpression.java
@@ -12,6 +12,7 @@ public class ASTJavaVariableExpression extends AbstractApexNode<JavaVariableExpr
         super(javaVariableExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java
index 7d19485275..19e7440fac 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTLiteralExpression.java
@@ -12,6 +12,7 @@ public class ASTLiteralExpression extends AbstractApexNode<LiteralExpression> {
         super(literalExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMapEntryNode.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMapEntryNode.java
index 1f29b0b3aa..e5518792af 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMapEntryNode.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMapEntryNode.java
@@ -12,6 +12,7 @@ public class ASTMapEntryNode extends AbstractApexNode<MapEntryNode> {
         super(mapEntryNode);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethod.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethod.java
index 16562b6fb4..6aa1980261 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethod.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethod.java
@@ -17,6 +17,7 @@ public class ASTMethod extends AbstractApexNode<Method> implements ApexQualifiab
         super(method);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodBlockStatement.java
index 0890667eba..98459d4634 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodBlockStatement.java
@@ -12,6 +12,7 @@ public class ASTMethodBlockStatement extends AbstractApexNode<MethodBlockStateme
         super(node);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodCallExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodCallExpression.java
index d54b52fe85..b15ccfd1ec 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodCallExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodCallExpression.java
@@ -15,6 +15,7 @@ public class ASTMethodCallExpression extends AbstractApexNode<MethodCallExpressi
         super(methodCallExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifier.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifier.java
index 58a788c446..bed065951a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifier.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifier.java
@@ -12,6 +12,7 @@ public class ASTModifier extends AbstractApexNode<Modifier> {
         super(node);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierNode.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierNode.java
index 1dee4943de..811cd33f66 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierNode.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierNode.java
@@ -12,6 +12,7 @@ public class ASTModifierNode extends AbstractApexNode<ModifierNode> implements A
         super(modifierNode);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierOrAnnotation.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierOrAnnotation.java
index c374dec55b..56e200334d 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierOrAnnotation.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTModifierOrAnnotation.java
@@ -12,6 +12,7 @@ public class ASTModifierOrAnnotation extends AbstractApexNode<ModifierOrAnnotati
         super(modifierOrAnnotation);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMultiStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMultiStatement.java
index b4632dcc52..2b5f7e1d0e 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMultiStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTMultiStatement.java
@@ -12,6 +12,7 @@ public class ASTMultiStatement extends AbstractApexNode<MultiStatement> {
         super(node);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedExpression.java
index 2d07059de2..9042880702 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedExpression.java
@@ -12,6 +12,7 @@ public class ASTNestedExpression extends AbstractApexNode<NestedExpression> {
         super(node);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedStoreExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedStoreExpression.java
index acdaab383b..22fc1c9f96 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedStoreExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNestedStoreExpression.java
@@ -12,6 +12,7 @@ public class ASTNestedStoreExpression extends AbstractApexNode<NestedStoreExpres
         super(node);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpression.java
index 6b7c51295d..60269d4510 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpression.java
@@ -12,6 +12,7 @@ public class ASTNewKeyValueObjectExpression extends AbstractApexNode<NewKeyValue
         super(node);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListInitExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListInitExpression.java
index d8e63732d2..7ee5f8ef5b 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListInitExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListInitExpression.java
@@ -12,6 +12,7 @@ public class ASTNewListInitExpression extends AbstractApexNode<NewListInitExpres
         super(newListInitExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListLiteralExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListLiteralExpression.java
index f54dbf4adb..35d2f73e81 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListLiteralExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewListLiteralExpression.java
@@ -12,6 +12,7 @@ public class ASTNewListLiteralExpression extends AbstractApexNode<NewListLiteral
         super(newListLiteralExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapInitExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapInitExpression.java
index b97080fc8f..3b3e7eaca1 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapInitExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapInitExpression.java
@@ -12,6 +12,7 @@ public class ASTNewMapInitExpression extends AbstractApexNode<NewMapInitExpressi
         super(newMapInitExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapLiteralExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapLiteralExpression.java
index 406f3c046a..77cac52fa0 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapLiteralExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewMapLiteralExpression.java
@@ -12,6 +12,7 @@ public class ASTNewMapLiteralExpression extends AbstractApexNode<NewMapLiteralEx
         super(newMapLiteralExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewObjectExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewObjectExpression.java
index 510e79b6c9..7195c58afc 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewObjectExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewObjectExpression.java
@@ -12,6 +12,7 @@ public class ASTNewObjectExpression extends AbstractApexNode<NewObjectExpression
         super(newObjectExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetInitExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetInitExpression.java
index 6f412d2180..130a0603fd 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetInitExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetInitExpression.java
@@ -12,6 +12,7 @@ public class ASTNewSetInitExpression extends AbstractApexNode<NewSetInitExpressi
         super(newSetInitExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetLiteralExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetLiteralExpression.java
index 6e07c93260..43517f85c6 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetLiteralExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTNewSetLiteralExpression.java
@@ -12,6 +12,7 @@ public class ASTNewSetLiteralExpression extends AbstractApexNode<NewSetLiteralEx
         super(newSetLiteralExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPackageVersionExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPackageVersionExpression.java
index 2ad57df462..3313363370 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPackageVersionExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPackageVersionExpression.java
@@ -12,6 +12,7 @@ public class ASTPackageVersionExpression extends AbstractApexNode<PackageVersion
         super(packageVersionExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTParameter.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTParameter.java
index f0c3b41682..b861bc1472 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTParameter.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTParameter.java
@@ -14,6 +14,7 @@ public class ASTParameter extends AbstractApexNode<Parameter> implements CanSupp
         super(parameter);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -23,6 +24,7 @@ public class ASTParameter extends AbstractApexNode<Parameter> implements CanSupp
         return node.getName().getValue();
     }
 
+    @Override
     public boolean hasSuppressWarningsAnnotationFor(Rule rule) {
         for (ASTModifierNode modifier : findChildrenOfType(ASTModifierNode.class)) {
             for (ASTAnnotation a : modifier.findChildrenOfType(ASTAnnotation.class)) {
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPostfixExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPostfixExpression.java
index 19fe85bb4c..4d2bd2b017 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPostfixExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPostfixExpression.java
@@ -12,6 +12,7 @@ public class ASTPostfixExpression extends AbstractApexNode<PostfixExpression> {
         super(postfixExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPrefixExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPrefixExpression.java
index 707970e767..11db2fb4a3 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPrefixExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTPrefixExpression.java
@@ -12,6 +12,7 @@ public class ASTPrefixExpression extends AbstractApexNode<PrefixExpression> {
         super(prefixExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTProperty.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTProperty.java
index a64e976c9a..a0bec8ba90 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTProperty.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTProperty.java
@@ -12,6 +12,7 @@ public class ASTProperty extends AbstractApexNode<Property> {
         super(property);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReferenceExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReferenceExpression.java
index 8287ab39af..32e91d26bb 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReferenceExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReferenceExpression.java
@@ -12,6 +12,7 @@ public class ASTReferenceExpression extends AbstractApexNode<ReferenceExpression
         super(referenceExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReturnStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReturnStatement.java
index 004e735b16..dfe345408e 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReturnStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTReturnStatement.java
@@ -12,6 +12,7 @@ public class ASTReturnStatement extends AbstractApexNode<ReturnStatement> {
         super(returnStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTRunAsBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTRunAsBlockStatement.java
index e108b99e65..ff2b84eef4 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTRunAsBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTRunAsBlockStatement.java
@@ -12,6 +12,7 @@ public class ASTRunAsBlockStatement extends AbstractApexNode<RunAsBlockStatement
         super(runAsBlockStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpression.java
index 52c2f7355b..b05e5dcf7c 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpression.java
@@ -12,6 +12,7 @@ public class ASTSoqlExpression extends AbstractApexNode<SoqlExpression> {
         super(soqlExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoslExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoslExpression.java
index f029ecd490..b773d346aa 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoslExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSoslExpression.java
@@ -12,6 +12,7 @@ public class ASTSoslExpression extends AbstractApexNode<SoslExpression> {
         super(soslExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStandardCondition.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStandardCondition.java
index f01164cf42..9260962ef9 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStandardCondition.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStandardCondition.java
@@ -12,6 +12,7 @@ public class ASTStandardCondition extends AbstractApexNode<StandardCondition> {
         super(standardCondition);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatement.java
index f30541ebea..9fe6e7dd1c 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatement.java
@@ -12,6 +12,7 @@ public class ASTStatement extends AbstractApexNode<Statement> {
         super(statement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatementExecuted.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatementExecuted.java
index 3307ddca4b..0e4b865065 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatementExecuted.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTStatementExecuted.java
@@ -12,6 +12,7 @@ public class ASTStatementExecuted extends AbstractApexNode<StatementExecuted> {
         super(node);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperMethodCallExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperMethodCallExpression.java
index 689e201e7d..1dfbd47f46 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperMethodCallExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperMethodCallExpression.java
@@ -12,6 +12,7 @@ public class ASTSuperMethodCallExpression extends AbstractApexNode<SuperMethodCa
         super(superMethodCallExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperVariableExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperVariableExpression.java
index 65abf34027..2b13cb7171 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperVariableExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTSuperVariableExpression.java
@@ -12,6 +12,7 @@ public class ASTSuperVariableExpression extends AbstractApexNode<SuperVariableEx
         super(superVariableExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTernaryExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTernaryExpression.java
index 8f6beae765..3aa5622d52 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTernaryExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTernaryExpression.java
@@ -12,6 +12,7 @@ public class ASTTernaryExpression extends AbstractApexNode<TernaryExpression> {
         super(ternaryExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisMethodCallExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisMethodCallExpression.java
index 6ec6115930..b3f1194c2e 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisMethodCallExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisMethodCallExpression.java
@@ -12,6 +12,7 @@ public class ASTThisMethodCallExpression extends AbstractApexNode<ThisMethodCall
         super(thisMethodCallExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisVariableExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisVariableExpression.java
index 1a054880c1..d28e79a949 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisVariableExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThisVariableExpression.java
@@ -12,6 +12,7 @@ public class ASTThisVariableExpression extends AbstractApexNode<ThisVariableExpr
         super(thisVariableExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThrowStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThrowStatement.java
index 85a60624ca..00c977f9ca 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThrowStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTThrowStatement.java
@@ -12,6 +12,7 @@ public class ASTThrowStatement extends AbstractApexNode<ThrowStatement> {
         super(throwStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTriggerVariableExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTriggerVariableExpression.java
index 8d1ec224cc..45260316cc 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTriggerVariableExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTriggerVariableExpression.java
@@ -12,6 +12,7 @@ public class ASTTriggerVariableExpression extends AbstractApexNode<TriggerVariab
         super(triggerVariableExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatement.java
index 79d17b94ae..07d8e8e83f 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatement.java
@@ -12,6 +12,7 @@ public class ASTTryCatchFinallyBlockStatement extends AbstractApexNode<TryCatchF
         super(tryCatchFinallyBlockStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClass.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClass.java
index f9d4279505..8e8594e13e 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClass.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClass.java
@@ -21,6 +21,7 @@ public class ASTUserClass extends ApexRootNode<UserClass> implements ASTUserClas
     }
 
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassMethods.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassMethods.java
index da2161c13b..0146a2d3c6 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassMethods.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassMethods.java
@@ -12,6 +12,7 @@ public class ASTUserClassMethods extends AbstractApexNode<UserClassMethods> {
         super(userClassMethods);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnum.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnum.java
index 39588a4cfe..9e05252daf 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnum.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnum.java
@@ -12,6 +12,7 @@ public class ASTUserEnum extends ApexRootNode<UserEnum> {
         super(userEnum);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserExceptionMethods.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserExceptionMethods.java
index 522e882187..25306a1e5c 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserExceptionMethods.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserExceptionMethods.java
@@ -12,6 +12,7 @@ public class ASTUserExceptionMethods extends AbstractApexNode<UserExceptionMetho
         super(userExceptionMethods);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterface.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterface.java
index 0304d32012..bf7995bd26 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterface.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterface.java
@@ -20,6 +20,7 @@ public class ASTUserInterface extends ApexRootNode<UserInterface> implements AST
         super(userInterface);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTrigger.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTrigger.java
index d0aaa6de81..3c9f5b1bef 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTrigger.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTrigger.java
@@ -15,6 +15,7 @@ public class ASTUserTrigger extends ApexRootNode<UserTrigger> {
         super(userTrigger);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclaration.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclaration.java
index 0159c933ae..684e55b32f 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclaration.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclaration.java
@@ -14,6 +14,7 @@ public class ASTVariableDeclaration extends AbstractApexNode<VariableDeclaration
         super(variableDeclaration);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -23,6 +24,7 @@ public class ASTVariableDeclaration extends AbstractApexNode<VariableDeclaration
         return node.getLocalInfo().getName();
     }
 
+    @Override
     public boolean hasSuppressWarningsAnnotationFor(Rule rule) {
         ASTVariableDeclarationStatements parent = (ASTVariableDeclarationStatements) jjtGetParent();
 
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclarationStatements.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclarationStatements.java
index 8947360397..0a5a9b3155 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclarationStatements.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableDeclarationStatements.java
@@ -12,6 +12,7 @@ public class ASTVariableDeclarationStatements extends AbstractApexNode<VariableD
         super(variableDeclarationStatements);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableExpression.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableExpression.java
index 11061d4620..19f4150886 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableExpression.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTVariableExpression.java
@@ -12,6 +12,7 @@ public class ASTVariableExpression extends AbstractApexNode<VariableExpression>
         super(variableExpression);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTWhileLoopStatement.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTWhileLoopStatement.java
index 09bf0ad7e2..f24d2854f8 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTWhileLoopStatement.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ASTWhileLoopStatement.java
@@ -12,6 +12,7 @@ public class ASTWhileLoopStatement extends AbstractApexNode<WhileLoopStatement>
         super(whileLoopStatement);
     }
 
+    @Override
     public Object jjtAccept(ApexParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
index a14fc7ee23..73dd3fad07 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
@@ -99,6 +99,7 @@ public abstract class AbstractApexNode<T extends AstNode> extends AbstractNode i
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object childrenAccept(ApexParserVisitor visitor, Object data) {
         if (children != null) {
             for (int i = 0; i < children.length; ++i) {
@@ -111,6 +112,7 @@ public abstract class AbstractApexNode<T extends AstNode> extends AbstractNode i
         return data;
     }
 
+    @Override
     public T getNode() {
         return node;
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexParserVisitor.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexParserVisitor.java
index 6a20eb582a..105794e95a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexParserVisitor.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexParserVisitor.java
@@ -8,7 +8,7 @@ public interface ApexParserVisitor {
     Object visit(ApexNode<?> node, Object data);
 
     Object visit(ASTAnnotation node, Object data);
-    
+
     Object visit(ASTAnnotationParameter node, Object data);
 
     Object visit(ASTAnonymousClass node, Object data);
@@ -38,7 +38,7 @@ public interface ApexParserVisitor {
     Object visit(ASTClassRefExpression node, Object data);
 
     Object visit(ASTConstructorPreamble node, Object data);
-    
+
     Object visit(ASTConstructorPreambleStatement node, Object data);
 
     Object visit(ASTContinueStatement node, Object data);
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/CompilerService.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/CompilerService.java
index 651a47ead4..f115f87a78 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/CompilerService.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/CompilerService.java
@@ -29,9 +29,9 @@ import com.google.common.collect.ImmutableList;
  * Central point for interfacing with the compiler. Based on <a href=
  * "https://github.com/forcedotcom/idecore/blob/master/com.salesforce.ide.apex.core/src/com/salesforce/ide/apex/internal/core/CompilerService.java"
  * > CompilerService</a> but with Eclipse dependencies removed.
- * 
+ *
  * @author nchen
- * 
+ *
  */
 public class CompilerService {
     public static final CompilerService INSTANCE = new CompilerService();
@@ -41,7 +41,7 @@ public class CompilerService {
 
     /**
      * Configure a compiler with the default configurations:
-     * 
+     *
      * @param symbolProvider
      *            EmptySymbolProvider, doesn't provide any symbols that are not
      *            part of source.
@@ -56,7 +56,7 @@ public class CompilerService {
 
     /**
      * Configure a compiler with the following configurations:
-     * 
+     *
      * @param symbolProvider
      *            A way to retrieve symbols, where symbols are names of types.
      * @param accessEvaluator
@@ -106,7 +106,7 @@ public class CompilerService {
      * don't have all the parts for yet in the offline compiler. Rather than
      * stop all work on that, we bypass it so that we can still do useful things
      * like find all your types, find all your methods, etc.
-     * 
+     *
      */
     @SuppressWarnings("unchecked")
     private void callAdditionalPassVisitor(ApexCompiler compiler) {
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRule.java
index 0984252fb2..5f371792b6 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRule.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRule.java
@@ -121,6 +121,7 @@ public abstract class AbstractApexRule extends AbstractRule
         return new ApexParserOptions();
     }
 
+    @Override
     public void apply(List<? extends Node> nodes, RuleContext ctx) {
         visitAll(nodes, ctx);
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractStatisticalApexRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractStatisticalApexRule.java
index 0709b52054..054bea94c9 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractStatisticalApexRule.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractStatisticalApexRule.java
@@ -16,10 +16,12 @@ public abstract class AbstractStatisticalApexRule extends AbstractApexRule imple
 
     private final StatisticalRuleHelper helper = new StatisticalRuleHelper(this);
 
+    @Override
     public void addDataPoint(DataPoint point) {
         helper.addDataPoint(point);
     }
 
+    @Override
     public Object[] getViolationParameters(DataPoint point) {
         return new Object[0];
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexRuleChainVisitor.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexRuleChainVisitor.java
index b3f906bbc7..5abce5d8ac 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexRuleChainVisitor.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexRuleChainVisitor.java
@@ -18,6 +18,7 @@ import net.sourceforge.pmd.lang.rule.XPathRule;
 
 public class ApexRuleChainVisitor extends AbstractRuleChainVisitor {
 
+    @Override
     protected void indexNodes(List<Node> nodes, RuleContext ctx) {
         Stack<Node> stack = new Stack<>();
         stack.addAll(nodes);
@@ -33,6 +34,7 @@ public class ApexRuleChainVisitor extends AbstractRuleChainVisitor {
         }
     }
 
+    @Override
     protected void visit(Rule rule, Node node, RuleContext ctx) {
         if (rule instanceof XPathRule) {
             ((XPathRule) rule).evaluate(node, ctx);
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexRuleViolationFactory.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexRuleViolationFactory.java
index 89ed7bd555..1fd6ed544a 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexRuleViolationFactory.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexRuleViolationFactory.java
@@ -7,7 +7,6 @@ package net.sourceforge.pmd.lang.apex.rule;
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.RuleViolation;
-import net.sourceforge.pmd.lang.apex.ast.ApexNode;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.rule.AbstractRuleViolationFactory;
 
@@ -21,12 +20,13 @@ public final class ApexRuleViolationFactory extends AbstractRuleViolationFactory
     @SuppressWarnings("rawtypes")
     @Override
     protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message) {
-        return new ApexRuleViolation<>(rule, ruleContext, (ApexNode) node, message);
+        return new ApexRuleViolation<>(rule, ruleContext, node, message);
     }
 
+    @Override
     @SuppressWarnings("rawtypes")
     protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message,
             int beginLine, int endLine) {
-        return new ApexRuleViolation(rule, ruleContext, (ApexNode) node, message, beginLine, endLine);
+        return new ApexRuleViolation(rule, ruleContext, node, message, beginLine, endLine);
     }
 }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ClassNamingConventionsRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ClassNamingConventionsRule.java
index 289fca4c26..433acc7fe3 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ClassNamingConventionsRule.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ClassNamingConventionsRule.java
@@ -17,6 +17,7 @@ public class ClassNamingConventionsRule extends AbstractApexRule {
         setProperty(CODECLIMATE_BLOCK_HIGHLIGHTING, false);
     }
 
+    @Override
     public Object visit(ASTUserClass node, Object data) {
         if (Character.isLowerCase(node.getImage().charAt(0))) {
             addViolation(data, node);
@@ -24,6 +25,7 @@ public class ClassNamingConventionsRule extends AbstractApexRule {
         return data;
     }
 
+    @Override
     public Object visit(ASTUserInterface node, Object data) {
         if (Character.isLowerCase(node.getImage().charAt(0))) {
             addViolation(data, node);
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/MethodNamingConventionsRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/MethodNamingConventionsRule.java
index 236c46e111..7192e57900 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/MethodNamingConventionsRule.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/MethodNamingConventionsRule.java
@@ -20,10 +20,12 @@ public class MethodNamingConventionsRule extends AbstractApexRule {
         setProperty(CODECLIMATE_BLOCK_HIGHLIGHTING, false);
     }
 
+    @Override
     public Object visit(ASTUserClass node, Object data) {
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTMethod node, Object data) {
         if (isOverriddenMethod(node) || isPropertyAccessor(node) || isConstructor(node)) {
             return data;
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/VariableNamingConventionsRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/VariableNamingConventionsRule.java
index 0961401fc4..ec189d0ebc 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/VariableNamingConventionsRule.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/codestyle/VariableNamingConventionsRule.java
@@ -87,11 +87,13 @@ public class VariableNamingConventionsRule extends AbstractApexRule {
         setProperty(CODECLIMATE_BLOCK_HIGHLIGHTING, false);
     }
 
+    @Override
     public Object visit(ASTUserClass node, Object data) {
         init();
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTUserInterface node, Object data) {
         init();
         return super.visit(node, data);
@@ -111,6 +113,7 @@ public class VariableNamingConventionsRule extends AbstractApexRule {
         parameterSuffixes = getProperty(PARAMETER_SUFFIXES_DESCRIPTOR);
     }
 
+    @Override
     public Object visit(ASTField node, Object data) {
         if (!checkMembers) {
             return data;
@@ -122,6 +125,7 @@ public class VariableNamingConventionsRule extends AbstractApexRule {
                 isStatic, isFinal, data);
     }
 
+    @Override
     public Object visit(ASTVariableDeclaration node, Object data) {
 
         if (!checkLocals) {
@@ -132,6 +136,7 @@ public class VariableNamingConventionsRule extends AbstractApexRule {
         return checkName(localPrefixes, localSuffixes, node, false, isFinal, data);
     }
 
+    @Override
     public Object visit(ASTParameter node, Object data) {
         if (!checkParameters) {
             return data;
@@ -216,6 +221,7 @@ public class VariableNamingConventionsRule extends AbstractApexRule {
         return false;
     }
 
+    @Override
     public String dysfunctionReason() {
         return hasPrefixesOrSuffixes() ? null : "No prefixes or suffixes specified";
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/AvoidDeeplyNestedIfStmtsRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/AvoidDeeplyNestedIfStmtsRule.java
index 7dc9db738f..dc9e4d52d2 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/AvoidDeeplyNestedIfStmtsRule.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/AvoidDeeplyNestedIfStmtsRule.java
@@ -14,7 +14,7 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractApexRule {
     private int depth;
     private int depthLimit;
 
-    private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR 
+    private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR
             = IntegerProperty.named("problemDepth")
                              .desc("The if statement depth reporting threshold")
                              .range(1, 25).defaultValue(3).uiOrder(1.0f).build();
@@ -28,6 +28,7 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractApexRule {
         setProperty(CODECLIMATE_BLOCK_HIGHLIGHTING, false);
     }
 
+    @Override
     public Object visit(ASTUserClass node, Object data) {
         depth = 0;
         depthLimit = getProperty(PROBLEM_DEPTH_DESCRIPTOR);
@@ -35,6 +36,7 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractApexRule {
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTIfBlockStatement node, Object data) {
         depth++;
 
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveParameterListRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveParameterListRule.java
index d52a6e02f7..f323958683 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveParameterListRule.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveParameterListRule.java
@@ -22,6 +22,7 @@ public class ExcessiveParameterListRule extends ExcessiveNodeCountRule {
         setProperty(CODECLIMATE_BLOCK_HIGHLIGHTING, false);
     }
 
+    @Override
     public Object visit(ASTParameter node, Object data) {
         return NumericConstants.ONE;
     }
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessivePublicCountRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessivePublicCountRule.java
index 342725074c..8c8be1c698 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessivePublicCountRule.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessivePublicCountRule.java
@@ -36,6 +36,7 @@ public class ExcessivePublicCountRule extends ExcessiveNodeCountRule {
         setProperty(CODECLIMATE_BLOCK_HIGHLIGHTING, false);
     }
 
+    @Override
     public Object visit(ASTMethod node, Object data) {
         if (node.getNode().getModifiers().has(PUBLIC) && !node.getImage().matches("<clinit>|<init>|clone")) {
             return NumericConstants.ONE;
@@ -43,6 +44,7 @@ public class ExcessivePublicCountRule extends ExcessiveNodeCountRule {
         return NumericConstants.ZERO;
     }
 
+    @Override
     public Object visit(ASTFieldDeclarationStatements node, Object data) {
         if (node.getNode().getModifiers().has(PUBLIC) && !node.getNode().getModifiers().has(STATIC)) {
             return NumericConstants.ONE;
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/security/ApexDangerousMethodsRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/security/ApexDangerousMethodsRule.java
index 2c816977ee..91d9a6dfe4 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/security/ApexDangerousMethodsRule.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/security/ApexDangerousMethodsRule.java
@@ -20,8 +20,8 @@ import net.sourceforge.pmd.lang.apex.rule.AbstractApexRule;
  * Flags dangerous method calls, e.g. FinancialForce
  * Configuration.disableTriggerCRUDSecurity() or System.debug with sensitive
  * input
- * 
- * 
+ *
+ *
  * @author sergey.gorbaty
  *
  */
@@ -46,6 +46,7 @@ public class ApexDangerousMethodsRule extends AbstractApexRule {
 
     }
 
+    @Override
     public Object visit(ASTUserClass node, Object data) {
         if (Helper.isTestMethodOrClass(node)) {
             return data;
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java
index 29e4107cdc..ddbe17615b 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/xpath/SaxonXPathRuleQuery.java
@@ -47,7 +47,7 @@ public class SaxonXPathRuleQuery extends AbstractXPathRuleQuery {
     private static final Map<Node, DocumentNode> CACHE = new LinkedHashMap<Node, DocumentNode>(MAX_CACHE_SIZE) {
         private static final long serialVersionUID = -7653916493967142443L;
 
-
+        @Override
         protected boolean removeEldestEntry(final Map.Entry<Node, DocumentNode> eldest) {
             return size() > MAX_CACHE_SIZE;
         }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/AbstractMultiValueProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/AbstractMultiValueProperty.java
index 1f4e7a362d..514ed20003 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/AbstractMultiValueProperty.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/AbstractMultiValueProperty.java
@@ -119,6 +119,7 @@ import net.sourceforge.pmd.Rule;
      *
      * @return A string representation of the default value.
      */
+    @Override
     protected String defaultAsString() {
         return asDelimitedString(defaultValue(), multiValueDelimiter());
     }
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/PropertyDescriptorBuilderConversionWrapper.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/PropertyDescriptorBuilderConversionWrapper.java
index 88eaf0b7c2..caf9beb9d6 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/PropertyDescriptorBuilderConversionWrapper.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/PropertyDescriptorBuilderConversionWrapper.java
@@ -49,9 +49,11 @@ public abstract class PropertyDescriptorBuilderConversionWrapper<E, T extends Pr
     }
 
 
+    @Override
     public abstract boolean isMultiValue();
 
 
+    @Override
     public Class<?> valueType() {
         return valueType;
     }
diff --git a/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppTokenManager.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppTokenManager.java
index b22607777f..83aa097c39 100644
--- a/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppTokenManager.java
+++ b/pmd-cpp/src/main/java/net/sourceforge/pmd/lang/cpp/CppTokenManager.java
@@ -25,6 +25,7 @@ public class CppTokenManager implements TokenManager {
         tokenManager = new CppParserTokenManager(new CppCharStream(source));
     }
 
+    @Override
     public Object getNextToken() {
         return tokenManager.getNextToken();
     }
diff --git a/pmd-cs/src/main/java/net/sourceforge/pmd/cpd/CsLanguage.java b/pmd-cs/src/main/java/net/sourceforge/pmd/cpd/CsLanguage.java
index 2bf957a1ad..e54edcddbe 100644
--- a/pmd-cs/src/main/java/net/sourceforge/pmd/cpd/CsLanguage.java
+++ b/pmd-cs/src/main/java/net/sourceforge/pmd/cpd/CsLanguage.java
@@ -20,6 +20,7 @@ public class CsLanguage extends AbstractLanguage {
         setProperties(properties);
     }
 
+    @Override
     public final void setProperties(Properties properties) {
         CsTokenizer tokenizer = (CsTokenizer) getTokenizer();
         tokenizer.setProperties(properties);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaLanguage.java b/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaLanguage.java
index 2f79767bd8..0ff3638c99 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaLanguage.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/cpd/JavaLanguage.java
@@ -16,6 +16,7 @@ public class JavaLanguage extends AbstractLanguage {
         setProperties(properties);
     }
 
+    @Override
     public final void setProperties(Properties properties) {
         JavaTokenizer tokenizer = (JavaTokenizer) getTokenizer();
         tokenizer.setProperties(properties);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java
index 68ad02f403..725a4aae03 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaHandler.java
@@ -66,6 +66,7 @@ public abstract class AbstractJavaHandler extends AbstractLanguageVersionHandler
         };
     }
 
+    @Override
     public RuleViolationFactory getRuleViolationFactory() {
         return JavaRuleViolationFactory.INSTANCE;
     }
@@ -73,6 +74,7 @@ public abstract class AbstractJavaHandler extends AbstractLanguageVersionHandler
     @Override
     public VisitorStarter getDataFlowFacade() {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new DataFlowFacade().initializeWith(getDataFlowHandler(), (ASTCompilationUnit) rootNode);
             }
@@ -82,6 +84,7 @@ public abstract class AbstractJavaHandler extends AbstractLanguageVersionHandler
     @Override
     public VisitorStarter getSymbolFacade() {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new SymbolFacade().initializeWith(null, (ASTCompilationUnit) rootNode);
             }
@@ -91,6 +94,7 @@ public abstract class AbstractJavaHandler extends AbstractLanguageVersionHandler
     @Override
     public VisitorStarter getSymbolFacade(final ClassLoader classLoader) {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new SymbolFacade().initializeWith(classLoader, (ASTCompilationUnit) rootNode);
             }
@@ -100,6 +104,7 @@ public abstract class AbstractJavaHandler extends AbstractLanguageVersionHandler
     @Override
     public VisitorStarter getTypeResolutionFacade(final ClassLoader classLoader) {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new TypeResolutionFacade().initializeWith(classLoader, (ASTCompilationUnit) rootNode);
             }
@@ -109,6 +114,7 @@ public abstract class AbstractJavaHandler extends AbstractLanguageVersionHandler
     @Override
     public VisitorStarter getDumpFacade(final Writer writer, final String prefix, final boolean recurse) {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new DumpFacade().initializeWith(writer, prefix, recurse, (JavaNode) rootNode);
             }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaParser.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaParser.java
index a34e113b7f..d153760370 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaParser.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/AbstractJavaParser.java
@@ -48,15 +48,18 @@ public abstract class AbstractJavaParser extends AbstractParser {
         return parser;
     }
 
+    @Override
     public boolean canParse() {
         return true;
     }
 
+    @Override
     public Node parse(String fileName, Reader source) throws ParseException {
         AbstractTokenManager.setFileName(fileName);
         return createJavaParser(source).CompilationUnit();
     }
 
+    @Override
     public Map<Integer, String> getSuppressMap() {
         return parser.getSuppressMap();
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaDataFlowHandler.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaDataFlowHandler.java
index 347aa2010c..cccfad1684 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaDataFlowHandler.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaDataFlowHandler.java
@@ -13,10 +13,12 @@ import net.sourceforge.pmd.lang.java.ast.ASTLabeledStatement;
 import net.sourceforge.pmd.lang.java.dfa.JavaDataFlowNode;
 
 public class JavaDataFlowHandler implements DataFlowHandler {
+    @Override
     public DataFlowNode createDataFlowNode(List<DataFlowNode> dataFlow, Node node) {
         return new JavaDataFlowNode(dataFlow, node);
     }
 
+    @Override
     public Class<ASTLabeledStatement> getLabelStatementNodeClass() {
         return ASTLabeledStatement.class;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaTokenManager.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaTokenManager.java
index 7b4eb24a6e..8b579d270a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaTokenManager.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaTokenManager.java
@@ -20,10 +20,12 @@ public class JavaTokenManager implements TokenManager {
         tokenManager = new JavaParserTokenManager(new JavaCharStream(source));
     }
 
+    @Override
     public Object getNextToken() {
         return tokenManager.getNextToken();
     }
 
+    @Override
     public void setFileName(String fileName) {
         tokenManager.setFileName(fileName);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java
index 5c62af9461..7517687d9a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAdditiveExpression.java
@@ -17,6 +17,7 @@ public class ASTAdditiveExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java
index 7115767438..3ea7ef08ec 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAllocationExpression.java
@@ -23,6 +23,7 @@ public class ASTAllocationExpression extends AbstractJavaTypeNode implements Jav
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -48,6 +49,7 @@ public class ASTAllocationExpression extends AbstractJavaTypeNode implements Jav
      *
      * @see #isAnonymousClass()
      */
+    @Override
     public JavaTypeQualifiedName getQualifiedName() {
         return qualifiedName;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java
index 586d27d5c4..421f71e99f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAndExpression.java
@@ -17,6 +17,7 @@ public class ASTAndExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java
index 6147d8ec64..9b59f1d688 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationMethodDeclaration.java
@@ -16,6 +16,7 @@ public class ASTAnnotationMethodDeclaration extends AbstractMethodLikeNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeBody.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeBody.java
index d6da45cc3c..cf98a6be87 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeBody.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeBody.java
@@ -17,6 +17,7 @@ public class ASTAnnotationTypeBody extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeMemberDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeMemberDeclaration.java
index f8f2ae4ef6..328f06ec88 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeMemberDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTypeMemberDeclaration.java
@@ -17,6 +17,7 @@ public class ASTAnnotationTypeMemberDeclaration extends AbstractTypeBodyDeclarat
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArgumentList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArgumentList.java
index 8b4f6fbfbb..cc2faea91a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArgumentList.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArgumentList.java
@@ -17,6 +17,7 @@ public class ASTArgumentList extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java
index d0898b5ea4..a2edc5094f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArguments.java
@@ -24,6 +24,7 @@ public class ASTArguments extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
index 0f1fa3fa38..de1035272b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
@@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.java.ast;
 
 public class ASTArrayDimsAndInits extends AbstractJavaNode implements Dimensionable {
     private int arrayDepth;
-    
+
     public ASTArrayDimsAndInits(int id) {
         super(id);
     }
@@ -19,10 +19,11 @@ public class ASTArrayDimsAndInits extends AbstractJavaNode implements Dimensiona
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
-    
+
     public void bumpArrayDepth() {
         arrayDepth++;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayInitializer.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayInitializer.java
index 274b6ece08..d4f28d307c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayInitializer.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayInitializer.java
@@ -17,6 +17,7 @@ public class ASTArrayInitializer extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssertStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssertStatement.java
index 5ab7c6e0b6..52257bc23a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssertStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTAssertStatement.java
@@ -17,6 +17,7 @@ public class ASTAssertStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java
index 5ff61240ed..751adccf05 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatement.java
@@ -17,6 +17,7 @@ public class ASTBlockStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBreakStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBreakStatement.java
index 61ca9c4fd6..1076b9a803 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBreakStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTBreakStatement.java
@@ -17,6 +17,7 @@ public class ASTBreakStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCastExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCastExpression.java
index d432ba5d30..1191ffa928 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCastExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTCastExpression.java
@@ -27,6 +27,7 @@ public class ASTCastExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBody.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBody.java
index a42b3b6ac0..a7d765ffde 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBody.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBody.java
@@ -17,6 +17,7 @@ public class ASTClassOrInterfaceBody extends AbstractJavaNode {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java
index a659b83ea2..7d850bf70e 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceBodyDeclaration.java
@@ -22,6 +22,7 @@ public class ASTClassOrInterfaceBodyDeclaration extends AbstractTypeBodyDeclarat
         return isAnonymousInnerClass();
     }
 
+    @Override
     public boolean hasSuppressWarningsAnnotationFor(Rule rule) {
         for (int i = 0; i < jjtGetNumChildren(); i++) {
             if (jjtGetChild(i) instanceof ASTAnnotation) {
@@ -37,6 +38,7 @@ public class ASTClassOrInterfaceBodyDeclaration extends AbstractTypeBodyDeclarat
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java
index 5ef2aa6b04..782574e22d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceType.java
@@ -19,6 +19,7 @@ public class ASTClassOrInterfaceType extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -57,7 +58,7 @@ public class ASTClassOrInterfaceType extends AbstractJavaTypeNode {
         }
         return false;
     }
-    
+
     public int getArrayDepth() {
         Node p = jjtGetParent();
         if (p instanceof ASTReferenceType) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java
index 838f722b58..b2e489aca8 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalAndExpression.java
@@ -17,6 +17,7 @@ public class ASTConditionalAndExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java
index 91e3109d0c..8e0f748279 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTConditionalOrExpression.java
@@ -17,6 +17,7 @@ public class ASTConditionalOrExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java
index 8f19f95f45..05d96f2b71 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java
@@ -17,6 +17,7 @@ public class ASTContinueStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDefaultValue.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDefaultValue.java
index c12cab1400..c5bb40c2af 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDefaultValue.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDefaultValue.java
@@ -17,6 +17,7 @@ public class ASTDefaultValue extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDoStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDoStatement.java
index 7fd631e46e..6412bb6824 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDoStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTDoStatement.java
@@ -17,6 +17,7 @@ public class ASTDoStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEmptyStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEmptyStatement.java
index 0f064c2a63..1260eeba11 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEmptyStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEmptyStatement.java
@@ -17,6 +17,7 @@ public class ASTEmptyStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumBody.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumBody.java
index ec9f5024ea..a722f66103 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumBody.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumBody.java
@@ -17,6 +17,7 @@ public class ASTEnumBody extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java
index 3139cbfc90..5c8b9085bb 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java
@@ -23,6 +23,7 @@ public class ASTEnumConstant extends AbstractJavaNode implements JavaQualifiable
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -35,6 +36,7 @@ public class ASTEnumConstant extends AbstractJavaNode implements JavaQualifiable
      *
      * @see #isAnonymousClass()
      */
+    @Override
     public JavaTypeQualifiedName getQualifiedName() {
         return qualifiedName;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumDeclaration.java
index 73d4022a28..bc22a66125 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumDeclaration.java
@@ -18,6 +18,7 @@ public class ASTEnumDeclaration extends AbstractAnyTypeDeclaration {
         super(p, id);
     }
 
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java
index c5686deb4c..f61d97a085 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEqualityExpression.java
@@ -17,6 +17,7 @@ public class ASTEqualityExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java
index 26c870eff6..46c0b7c433 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExclusiveOrExpression.java
@@ -17,6 +17,7 @@ public class ASTExclusiveOrExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExpression.java
index 0c19fc0c51..53c36c5634 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTExpression.java
@@ -17,6 +17,7 @@ public class ASTExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java
index 1f87f5a7af..877d327f52 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java
@@ -101,10 +101,12 @@ public class ASTFieldDeclaration extends AbstractJavaAccessTypeNode implements D
         return n != null && n.isInterface();
     }
 
+    @Override
     public boolean isArray() {
         return checkType() + checkDecl() > 0;
     }
 
+    @Override
     public int getArrayDepth() {
         if (!isArray()) {
             return 0;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFinallyStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFinallyStatement.java
index 4455daae61..afeb95910c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFinallyStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFinallyStatement.java
@@ -17,6 +17,7 @@ public class ASTFinallyStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForInit.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForInit.java
index 0f19bcdc65..99ed7f1dda 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForInit.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForInit.java
@@ -17,6 +17,7 @@ public class ASTForInit extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForStatement.java
index f6af498833..4f96ee2c54 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForStatement.java
@@ -17,6 +17,7 @@ public class ASTForStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForUpdate.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForUpdate.java
index ebb3b0fab3..4a7dd02a64 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForUpdate.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTForUpdate.java
@@ -17,6 +17,7 @@ public class ASTForUpdate extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameters.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameters.java
index 938a0448b3..57cc052d53 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameters.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameters.java
@@ -27,6 +27,7 @@ public class ASTFormalParameters extends AbstractJavaNode implements Iterable<AS
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java
index 497ffdaae0..3be6bf7b2f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTImplementsList.java
@@ -28,6 +28,7 @@ public class ASTImplementsList extends AbstractJavaNode implements Iterable<ASTC
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java
index e1391e819b..0089bc9496 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInclusiveOrExpression.java
@@ -17,6 +17,7 @@ public class ASTInclusiveOrExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java
index 672088a7c4..f184cbe52a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTInstanceOfExpression.java
@@ -17,6 +17,7 @@ public class ASTInstanceOfExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLabeledStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLabeledStatement.java
index 5ae2bb92e7..17ad7e804b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLabeledStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLabeledStatement.java
@@ -14,6 +14,7 @@ public class ASTLabeledStatement extends AbstractJavaNode {
         super(p, id);
     }
 
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
index 0b5764918e..0b35ac0316 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
@@ -24,6 +24,7 @@ public class ASTLambdaExpression extends AbstractMethodLikeNode {
 
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java
index f1b2f104ab..16e0d4db5b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java
@@ -54,7 +54,7 @@ public class ASTLiteral extends AbstractJavaTypeNode {
 
     /**
      * Checks whether this literal is a long integer.
-     * 
+     *
      * @return <code>true</code> if this literal is a long
      */
     public boolean isLongLiteral() {
@@ -84,7 +84,7 @@ public class ASTLiteral extends AbstractJavaTypeNode {
 
     /**
      * Checks whether this literal describes a double.
-     * 
+     *
      * @return <code>true</code> if this literal is a double.
      */
     public boolean isDoubleLiteral() {
@@ -97,20 +97,20 @@ public class ASTLiteral extends AbstractJavaTypeNode {
         }
         return false;
     }
-    
+
     private String stripIntValue() {
         String image = getImage().toLowerCase(Locale.ROOT).replaceAll("_", "");
-        
+
         boolean isNegative = false;
         if (image.charAt(0) == '-') {
             isNegative = true;
             image = image.substring(1);
         }
-        
+
         if (image.endsWith("l")) {
             image = image.substring(0, image.length() - 1);
         }
-        
+
         // ignore base prefix if any
         if (image.charAt(0) == '0' && image.length() > 1) {
             if (image.charAt(1) == 'x' || image.charAt(1) == 'b') {
@@ -119,17 +119,17 @@ public class ASTLiteral extends AbstractJavaTypeNode {
                 image = image.substring(1);
             }
         }
-        
+
         if (isNegative) {
             return "-" + image;
         }
         return image;
     }
-    
+
     private String stripFloatValue() {
         return getImage().toLowerCase(Locale.ROOT).replaceAll("_", "");
     }
-    
+
     private int getIntBase() {
         final String image = getImage().toLowerCase(Locale.ROOT);
         final int offset = image.charAt(0) == '-' ? 1 : 0;
@@ -144,19 +144,19 @@ public class ASTLiteral extends AbstractJavaTypeNode {
         }
         return 10;
     }
-    
+
     public int getValueAsInt() {
         return (int) getValueAsLong(); // the downcast allows to parse 0x80000000+ numbers as negative instead of a NumberFormatException
     }
-    
+
     public long getValueAsLong() {
         return Long.parseLong(stripIntValue(), getIntBase());
     }
-    
+
     public float getValueAsFloat() {
         return Float.parseFloat(stripFloatValue());
     }
-    
+
     public double getValueAsDouble() {
         return Double.parseDouble(stripFloatValue());
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java
index 76f2f04fb2..801dc0d917 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java
@@ -25,6 +25,7 @@ public class ASTLocalVariableDeclaration extends AbstractJavaAccessNode implemen
         return visitor.visit(this, data);
     }
 
+    @Override
     public boolean hasSuppressWarningsAnnotationFor(Rule rule) {
         for (int i = 0; i < jjtGetNumChildren(); i++) {
             if (jjtGetChild(i) instanceof ASTAnnotation) {
@@ -48,10 +49,12 @@ public class ASTLocalVariableDeclaration extends AbstractJavaAccessNode implemen
         return getTypeNode() == null;
     }
 
+    @Override
     public boolean isArray() {
         return getArrayDepth() > 0;
     }
 
+    @Override
     public int getArrayDepth() {
         return getArrayDimensionOnType() + getArrayDimensionOnDeclaratorId();
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMarkerAnnotation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMarkerAnnotation.java
index 9d7066612b..e61e418837 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMarkerAnnotation.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMarkerAnnotation.java
@@ -17,6 +17,7 @@ public class ASTMarkerAnnotation extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java
index 867dcd320e..c1ee155d1b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberSelector.java
@@ -17,6 +17,7 @@ public class ASTMemberSelector extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValue.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValue.java
index 03c8ec74c3..f94540b833 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValue.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValue.java
@@ -17,6 +17,7 @@ public class ASTMemberValue extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValueArrayInitializer.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValueArrayInitializer.java
index 1ae9aaf9b6..9cc6cc0e0c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValueArrayInitializer.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValueArrayInitializer.java
@@ -17,6 +17,7 @@ public class ASTMemberValueArrayInitializer extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePair.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePair.java
index 6676dcab24..159b8739ca 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePair.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePair.java
@@ -17,6 +17,7 @@ public class ASTMemberValuePair extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePairs.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePairs.java
index 7b26e3e78a..4e94c4f45f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePairs.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMemberValuePairs.java
@@ -17,6 +17,7 @@ public class ASTMemberValuePairs extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java
index 392d3712b1..61459b2a5a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarator.java
@@ -21,6 +21,7 @@ public class ASTMethodDeclarator extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodReference.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodReference.java
index 23f1e41a2e..fe6067f6b7 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodReference.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMethodReference.java
@@ -16,6 +16,7 @@ public class ASTMethodReference extends AbstractJavaNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclaration.java
index c792de2474..e5c551c780 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDeclaration.java
@@ -18,6 +18,7 @@ public class ASTModuleDeclaration extends AbstractJavaNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java
index f4ea6bcd1e..71be3a8e36 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleDirective.java
@@ -28,6 +28,7 @@ public class ASTModuleDirective extends AbstractJavaNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleName.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleName.java
index 7970817064..810b6c5861 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleName.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTModuleName.java
@@ -17,6 +17,7 @@ public class ASTModuleName extends AbstractJavaNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java
index 8392ce9e43..ffb144d2d7 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTMultiplicativeExpression.java
@@ -17,6 +17,7 @@ public class ASTMultiplicativeExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java
index c97d1346b3..f2e2c36b69 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNameList.java
@@ -17,6 +17,7 @@ public class ASTNameList extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNormalAnnotation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNormalAnnotation.java
index acd60791b9..7c48333f2c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNormalAnnotation.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNormalAnnotation.java
@@ -17,6 +17,7 @@ public class ASTNormalAnnotation extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNullLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNullLiteral.java
index b8a02253b4..1256c1a4e9 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNullLiteral.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTNullLiteral.java
@@ -17,6 +17,7 @@ public class ASTNullLiteral extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPostfixExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPostfixExpression.java
index 52da10a709..5785b009e9 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPostfixExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPostfixExpression.java
@@ -18,6 +18,7 @@ public class ASTPostfixExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreDecrementExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreDecrementExpression.java
index 51b3c221c8..61ab87d071 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreDecrementExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreDecrementExpression.java
@@ -17,6 +17,7 @@ public class ASTPreDecrementExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreIncrementExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreIncrementExpression.java
index e82287d93d..4bedec1c20 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreIncrementExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPreIncrementExpression.java
@@ -17,6 +17,7 @@ public class ASTPreIncrementExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryExpression.java
index 2b027318b8..92d645f0ff 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimaryExpression.java
@@ -17,6 +17,7 @@ public class ASTPrimaryExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java
index 7223999f7c..dda473d8b1 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffix.java
@@ -38,7 +38,7 @@ public class ASTPrimarySuffix extends AbstractJavaTypeNode {
      * Get the number of arguments for this primary suffix. One should call
      * {@link #isArguments()} to see if there are arguments. If this method is
      * called when there are no arguments it returns <code>-1</code>.
-     * 
+     *
      * @return A non-negative argument number when there are arguments,
      *         <code>-1</code> otherwise.
      */
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java
index 76c56123c9..a48e0ae171 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRSIGNEDSHIFT.java
@@ -17,6 +17,7 @@ public class ASTRSIGNEDSHIFT extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java
index 8314a4a795..15753e797d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRUNSIGNEDSHIFT.java
@@ -17,6 +17,7 @@ public class ASTRUNSIGNEDSHIFT extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java
index a60f0c149e..5aa250a359 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRelationalExpression.java
@@ -17,6 +17,7 @@ public class ASTRelationalExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResource.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResource.java
index 9e83a94f7f..dc4b381423 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResource.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResource.java
@@ -16,6 +16,7 @@ public class ASTResource extends ASTFormalParameter {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResourceSpecification.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResourceSpecification.java
index 7c9105459f..f0610899db 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResourceSpecification.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResourceSpecification.java
@@ -16,6 +16,7 @@ public class ASTResourceSpecification extends AbstractJavaNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java
index 079a2552d9..e93f321794 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResources.java
@@ -16,6 +16,7 @@ public class ASTResources extends AbstractJavaNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java
index 798105bb38..2312032605 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTResultType.java
@@ -25,6 +25,7 @@ public class ASTResultType extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReturnStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReturnStatement.java
index 6f9d0f6d5c..9ee9af2d8f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReturnStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTReturnStatement.java
@@ -17,6 +17,7 @@ public class ASTReturnStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java
index 425db2b595..4c89b8bd17 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTShiftExpression.java
@@ -17,6 +17,7 @@ public class ASTShiftExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSingleMemberAnnotation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSingleMemberAnnotation.java
index 4ef0a2541a..fbae3b3187 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSingleMemberAnnotation.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSingleMemberAnnotation.java
@@ -17,6 +17,7 @@ public class ASTSingleMemberAnnotation extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatement.java
index bb4ba88309..e48b71d27d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatement.java
@@ -17,6 +17,7 @@ public class ASTStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java
index 4eeac3bace..a656219ba9 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpression.java
@@ -17,6 +17,7 @@ public class ASTStatementExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpressionList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpressionList.java
index fab8b21039..3ab98ecee1 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpressionList.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTStatementExpressionList.java
@@ -17,6 +17,7 @@ public class ASTStatementExpressionList extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatement.java
index 80e44a388d..e9ad7c7b01 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatement.java
@@ -30,6 +30,7 @@ public class ASTSwitchStatement extends AbstractJavaNode implements Iterable<AST
     }
 
 
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSynchronizedStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSynchronizedStatement.java
index 7a1fbce1ae..71dc35564d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSynchronizedStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSynchronizedStatement.java
@@ -17,6 +17,7 @@ public class ASTSynchronizedStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTryStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTryStatement.java
index c34681ad08..53e3325c0c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTryStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTryStatement.java
@@ -25,6 +25,7 @@ public class ASTTryStatement extends AbstractJavaNode {
     }
 
 
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java
index f57690a016..23d3799262 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTType.java
@@ -7,11 +7,11 @@ package net.sourceforge.pmd.lang.java.ast;
 
 /**
  * Represents a type reference.
- * 
+ *
  * <pre>
  * Type ::= ReferenceType | PrimitiveType
  * </pre>
- * 
+ *
  * Note: it is not exactly the same the "UnnanType" defined in JLS.
  */
 public class ASTType extends AbstractJavaTypeNode {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java
index 7b0ffb8ffd..1dfbe83e36 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArgument.java
@@ -17,6 +17,7 @@ public class ASTTypeArgument extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArguments.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArguments.java
index 99f2483bd0..71e8bed1aa 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArguments.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeArguments.java
@@ -17,6 +17,7 @@ public class ASTTypeArguments extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java
index 3c0a5bf845..cdd870c1b2 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeBound.java
@@ -17,6 +17,7 @@ public class ASTTypeBound extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeDeclaration.java
index 399825499e..2db090fc2f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeDeclaration.java
@@ -16,6 +16,7 @@ public class ASTTypeDeclaration extends AbstractJavaTypeNode implements CanSuppr
         super(p, id);
     }
 
+    @Override
     public boolean hasSuppressWarningsAnnotationFor(Rule rule) {
         for (int i = 0; i < jjtGetNumChildren(); i++) {
             if (jjtGetChild(i) instanceof ASTAnnotation) {
@@ -31,6 +32,7 @@ public class ASTTypeDeclaration extends AbstractJavaTypeNode implements CanSuppr
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameter.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameter.java
index 6cd0ba9b37..519c178547 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameter.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameter.java
@@ -17,6 +17,7 @@ public class ASTTypeParameter extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameters.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameters.java
index c9583efa90..63f490f1c5 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameters.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTTypeParameters.java
@@ -17,6 +17,7 @@ public class ASTTypeParameters extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpression.java
index 6cf4a2a95a..d5d6a6624d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpression.java
@@ -17,6 +17,7 @@ public class ASTUnaryExpression extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java
index e55416a10b..ee1d0ca7bf 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTUnaryExpressionNotPlusMinus.java
@@ -17,6 +17,7 @@ public class ASTUnaryExpressionNotPlusMinus extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclarator.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclarator.java
index dc12212ff1..60fdd00c24 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclarator.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclarator.java
@@ -17,6 +17,7 @@ public class ASTVariableDeclarator extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java
index a10b3197d3..0c43164018 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableInitializer.java
@@ -17,6 +17,7 @@ public class ASTVariableInitializer extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWhileStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWhileStatement.java
index ee7891ada1..57d3850d97 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWhileStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWhileStatement.java
@@ -17,6 +17,7 @@ public class ASTWhileStatement extends AbstractJavaNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java
index 5c0aa5a72b..384e0849f8 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTWildcardBounds.java
@@ -17,6 +17,7 @@ public class ASTWildcardBounds extends AbstractJavaTypeNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessNode.java
index ad5a969568..da3063423e 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessNode.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaAccessNode.java
@@ -16,106 +16,132 @@ public abstract class AbstractJavaAccessNode extends AbstractJavaAnnotatableNode
         super(parser, i);
     }
 
+    @Override
     public int getModifiers() {
         return this.modifiers;
     }
 
+    @Override
     public void setModifiers(int modifiers) {
         this.modifiers = modifiers;
     }
 
+    @Override
     public boolean isPublic() {
         return isModifier(PUBLIC);
     }
 
+    @Override
     public void setPublic(boolean isPublic) {
         setModifier(isPublic, PUBLIC);
     }
 
+    @Override
     public boolean isProtected() {
         return isModifier(PROTECTED);
     }
 
+    @Override
     public void setProtected(boolean isProtected) {
         setModifier(isProtected, PROTECTED);
     }
 
+    @Override
     public boolean isPrivate() {
         return isModifier(PRIVATE);
     }
 
+    @Override
     public void setPrivate(boolean isPrivate) {
         setModifier(isPrivate, PRIVATE);
     }
 
+    @Override
     public boolean isAbstract() {
         return isModifier(ABSTRACT);
     }
 
+    @Override
     public void setAbstract(boolean isAbstract) {
         setModifier(isAbstract, ABSTRACT);
     }
 
+    @Override
     public boolean isStatic() {
         return isModifier(STATIC);
     }
 
+    @Override
     public void setStatic(boolean isStatic) {
         setModifier(isStatic, STATIC);
     }
 
+    @Override
     public boolean isFinal() {
         return isModifier(FINAL);
     }
 
+    @Override
     public void setFinal(boolean isFinal) {
         setModifier(isFinal, FINAL);
     }
 
+    @Override
     public boolean isSynchronized() {
         return isModifier(SYNCHRONIZED);
     }
 
+    @Override
     public void setSynchronized(boolean isSynchronized) {
         setModifier(isSynchronized, SYNCHRONIZED);
     }
 
+    @Override
     public boolean isNative() {
         return isModifier(NATIVE);
     }
 
+    @Override
     public void setNative(boolean isNative) {
         setModifier(isNative, NATIVE);
     }
 
+    @Override
     public boolean isTransient() {
         return isModifier(TRANSIENT);
     }
 
+    @Override
     public void setTransient(boolean isTransient) {
         setModifier(isTransient, TRANSIENT);
     }
 
+    @Override
     public boolean isVolatile() {
         return isModifier(VOLATILE);
     }
 
+    @Override
     public void setVolatile(boolean isVolative) {
         setModifier(isVolative, VOLATILE);
     }
 
+    @Override
     public boolean isStrictfp() {
         return isModifier(STRICTFP);
     }
 
+    @Override
     public void setStrictfp(boolean isStrictfp) {
         setModifier(isStrictfp, STRICTFP);
     }
 
+    @Override
     public boolean isDefault() {
         return isModifier(DEFAULT);
     }
 
+    @Override
     public void setDefault(boolean isDefault) {
         setModifier(isDefault, DEFAULT);
     }
@@ -132,6 +158,7 @@ public abstract class AbstractJavaAccessNode extends AbstractJavaAnnotatableNode
         }
     }
 
+    @Override
     public boolean isPackagePrivate() {
         return !isPrivate() && !isPublic() && !isProtected();
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java
index eb23f05577..acf4106d45 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/AbstractJavaNode.java
@@ -22,6 +22,7 @@ public abstract class AbstractJavaNode extends AbstractNode implements JavaNode
         this.parser = parser;
     }
 
+    @Override
     public void jjtOpen() {
         if (beginLine == -1 && parser.token.next != null) {
             beginLine = parser.token.next.beginLine;
@@ -29,6 +30,7 @@ public abstract class AbstractJavaNode extends AbstractNode implements JavaNode
         }
     }
 
+    @Override
     public void jjtClose() {
         if (beginLine == -1 && (children == null || children.length == 0)) {
             beginColumn = parser.token.beginColumn;
@@ -43,6 +45,7 @@ public abstract class AbstractJavaNode extends AbstractNode implements JavaNode
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -50,6 +53,7 @@ public abstract class AbstractJavaNode extends AbstractNode implements JavaNode
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object childrenAccept(JavaParserVisitor visitor, Object data) {
         if (children != null) {
             for (int i = 0; i < children.length; ++i) {
@@ -59,6 +63,7 @@ public abstract class AbstractJavaNode extends AbstractNode implements JavaNode
         return data;
     }
 
+    @Override
     public Scope getScope() {
         if (scope == null) {
             return ((JavaNode) parent).getScope();
@@ -66,6 +71,7 @@ public abstract class AbstractJavaNode extends AbstractNode implements JavaNode
         return scope;
     }
 
+    @Override
     public void setScope(Scope scope) {
         this.scope = scope;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java
index fc3f3ed0ba..9d9da35c36 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/Comment.java
@@ -23,6 +23,7 @@ public abstract class Comment extends AbstractNode {
         }
     }
 
+    @Override
     public String toString() {
         return getImage();
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaNode.java
index e19c8c6623..453cb64804 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaNode.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaNode.java
@@ -19,6 +19,7 @@ public interface JavaNode extends ScopedNode {
      */
     Object childrenAccept(JavaParserVisitor visitor, Object data);
 
+    @Override
     Scope getScope();
 
     void setScope(Scope scope);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserControllessVisitorAdapter.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserControllessVisitorAdapter.java
index ce75d10b06..aec2b1e153 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserControllessVisitorAdapter.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserControllessVisitorAdapter.java
@@ -17,5 +17,5 @@ public class JavaParserControllessVisitorAdapter extends JavaParserVisitorAdapte
     public Object visit(JavaNode node, Object data) {
         return data;
     }
-    
+
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitorAdapter.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitorAdapter.java
index 705ff00680..b62e67f9bb 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitorAdapter.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitorAdapter.java
@@ -6,470 +6,587 @@ package net.sourceforge.pmd.lang.java.ast;
 
 public class JavaParserVisitorAdapter implements JavaParserVisitor {
 
+    @Override
     public Object visit(JavaNode node, Object data) {
         return node.childrenAccept(this, data);
     }
 
+    @Override
     public Object visit(ASTExtendsList node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTImplementsList node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeParameters node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMemberSelector node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeParameter node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeBound node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTClassOrInterfaceBody node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTClassOrInterfaceBodyDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTEnumBody node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTEnumConstant node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTReferenceType node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTClassOrInterfaceType node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeArguments node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeArgument node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTWildcardBounds node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAnnotation node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTNormalAnnotation node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMarkerAnnotation node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTSingleMemberAnnotation node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMemberValuePairs node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMemberValuePair node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMemberValue node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMemberValueArrayInitializer node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAnnotationTypeDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAnnotationTypeBody node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAnnotationTypeMemberDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAnnotationMethodDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDefaultValue node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTRUNSIGNEDSHIFT node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTRSIGNEDSHIFT node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCompilationUnit node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTEnumDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAssertStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPackageDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTImportDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTFieldDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTVariableDeclarator node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTVariableDeclaratorId node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTVariableInitializer node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTArrayInitializer node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMethodDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMethodDeclarator node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTFormalParameters node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTFormalParameter node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTConstructorDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTExplicitConstructorInvocation node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTInitializer node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTType node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPrimitiveType node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTResultType node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTName node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTNameList node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAssignmentOperator node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTConditionalExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTConditionalOrExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTConditionalAndExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTInclusiveOrExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTExclusiveOrExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAndExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTEqualityExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTInstanceOfExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTRelationalExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTShiftExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAdditiveExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMultiplicativeExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTUnaryExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPreIncrementExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPreDecrementExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTUnaryExpressionNotPlusMinus node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPostfixExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCastExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPrimaryExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPrimaryPrefix node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPrimarySuffix node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTLiteral node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTBooleanLiteral node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTNullLiteral node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTArguments node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTArgumentList node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAllocationExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTArrayDimsAndInits node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTLabeledStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTBlock node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTBlockStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTLocalVariableDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTEmptyStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTStatementExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTSwitchStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTSwitchLabel node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTIfStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTWhileStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDoStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTForStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTForInit node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTStatementExpressionList node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTForUpdate node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTBreakStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTContinueStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTReturnStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTThrowStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTSynchronizedStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTryStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTResourceSpecification node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTResources node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTResource node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTFinallyStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCatchStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTLambdaExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMethodReference node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTModuleDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTModuleDirective node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTModuleName node, Object data) {
         return visit((JavaNode) node, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaQualifiableNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaQualifiableNode.java
index 7b858da20c..ded0119277 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaQualifiableNode.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaQualifiableNode.java
@@ -19,5 +19,6 @@ public interface JavaQualifiableNode extends QualifiableNode {
      *
      * @return A qualified name.
      */
+    @Override
     JavaQualifiedName getQualifiedName();
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/DataFlowFacade.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/DataFlowFacade.java
index 6353d8ed4f..4068b26e12 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/DataFlowFacade.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/DataFlowFacade.java
@@ -27,12 +27,14 @@ public class DataFlowFacade extends JavaParserVisitorAdapter {
         node.jjtAccept(this, null);
     }
 
+    @Override
     public Object visit(ASTMethodDeclaration node, Object data) {
         sbf.buildDataFlowFor(node);
         vav.compute(node);
         return data;
     }
 
+    @Override
     public Object visit(ASTConstructorDeclaration node, Object data) {
         sbf.buildDataFlowFor(node);
         vav.compute(node);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDFAGraphRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDFAGraphRule.java
index 4a3eec562c..f8eb752fdf 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDFAGraphRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDFAGraphRule.java
@@ -21,6 +21,7 @@ public class JavaDFAGraphRule extends AbstractJavaRule implements DFAGraphRule {
         super.setDfa(true);
     }
 
+    @Override
     public List<DFAGraphMethod> getMethods() {
         return this.methods;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDataFlowNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDataFlowNode.java
index aee3c7d5ea..76c3f0a054 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDataFlowNode.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/dfa/JavaDataFlowNode.java
@@ -18,6 +18,7 @@ public class JavaDataFlowNode extends AbstractDataFlowNode {
         super(dataFlow, node);
     }
 
+    @Override
     public String toString() {
         String res = "DataFlowNode: line " + this.getLine() + ", ";
         if (node instanceof ASTMethodDeclaration || node instanceof ASTConstructorDeclaration) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/AbstractJavaClassMetric.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/AbstractJavaClassMetric.java
index af755a3935..c37494ec22 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/AbstractJavaClassMetric.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/AbstractJavaClassMetric.java
@@ -35,6 +35,7 @@ public abstract class AbstractJavaClassMetric extends AbstractJavaMetric<ASTAnyT
      *
      * @return True if the metric can be computed on this type declaration
      */
+    @Override
     public boolean supports(ASTAnyTypeDeclaration node) {
         return node.getTypeKind() != TypeKind.ANNOTATION && node.getTypeKind() != TypeKind.INTERFACE;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/ImmutableList.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/ImmutableList.java
index c95a478816..bd7b33a2ce 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/ImmutableList.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/ImmutableList.java
@@ -52,12 +52,14 @@ interface ImmutableList<E> extends List<E> {
     /**
      * Size of this list.
      */
+    @Override
     int size();
 
 
     /**
      * Returns true if this list has no elements.
      */
+    @Override
     boolean isEmpty();
 
 
@@ -84,6 +86,7 @@ interface ImmutableList<E> extends List<E> {
      *
      * @throws IndexOutOfBoundsException if the index is out of bounds
      */
+    @Override
     E get(int i);
 
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/JavaOperationQualifiedName.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/JavaOperationQualifiedName.java
index 77c790d2db..02d23360aa 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/JavaOperationQualifiedName.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/JavaOperationQualifiedName.java
@@ -65,6 +65,7 @@ public final class JavaOperationQualifiedName extends JavaQualifiedName {
      *
      * @return The operation string.
      */
+    @Override
     public String getOperation() {
         return operation;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/JavaTypeQualifiedName.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/JavaTypeQualifiedName.java
index 2ff72bcbfe..0556ca050b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/JavaTypeQualifiedName.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/JavaTypeQualifiedName.java
@@ -105,6 +105,7 @@ public final class JavaTypeQualifiedName extends JavaQualifiedName {
      * Returns true if this qualified name identifies a
      * local class.
      */
+    @Override
     public boolean isLocalClass() {
         return localIndices.head() != NOTLOCAL_PLACEHOLDER;
     }
@@ -122,6 +123,7 @@ public final class JavaTypeQualifiedName extends JavaQualifiedName {
     /**
      * Get the simple name of the class.
      */
+    @Override
     public String getClassSimpleName() {
         return classes.head();
     }
@@ -131,6 +133,7 @@ public final class JavaTypeQualifiedName extends JavaQualifiedName {
      * Returns true if the class represented by this
      * qualified name is in the unnamed package.
      */
+    @Override
     public boolean isUnnamedPackage() {
         return packages.isEmpty();
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/QualifiedNameResolver.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/QualifiedNameResolver.java
index 4db3ef4af9..babdd7a494 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/QualifiedNameResolver.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/qname/QualifiedNameResolver.java
@@ -118,6 +118,7 @@ public class QualifiedNameResolver extends JavaParserVisitorReducedAdapter {
     }
 
 
+    @Override
     public Object visit(ASTCompilationUnit node, Object data) {
 
         // update the package list
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java
index 85171ce729..73a65444ac 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java
@@ -79,471 +79,588 @@ public abstract class AbstractJavaRule extends AbstractRule implements JavaParse
     // Due to Java single inheritance, it preferred to extend from the more
     // complex Rule base class instead of from relatively simple Visitor.
     //
+    @Override
     public Object visit(JavaNode node, Object data) {
         node.childrenAccept(this, data);
         return null;
     }
 
+    @Override
     public Object visit(ASTExtendsList node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTImplementsList node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeParameters node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMemberSelector node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeParameter node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeBound node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTClassOrInterfaceBody node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTClassOrInterfaceBodyDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTEnumBody node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTEnumConstant node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTReferenceType node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTClassOrInterfaceType node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeArguments node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeArgument node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTWildcardBounds node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAnnotation node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTNormalAnnotation node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMarkerAnnotation node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTSingleMemberAnnotation node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMemberValuePairs node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMemberValuePair node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMemberValue node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMemberValueArrayInitializer node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAnnotationTypeDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAnnotationTypeBody node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAnnotationTypeMemberDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAnnotationMethodDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDefaultValue node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTRUNSIGNEDSHIFT node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTRSIGNEDSHIFT node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCompilationUnit node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTEnumDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAssertStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPackageDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTImportDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTypeDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTFieldDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTVariableDeclarator node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTVariableDeclaratorId node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTVariableInitializer node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTArrayInitializer node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMethodDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMethodDeclarator node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTFormalParameters node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTFormalParameter node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTConstructorDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTExplicitConstructorInvocation node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTInitializer node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTType node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPrimitiveType node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTResultType node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTName node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTNameList node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAssignmentOperator node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTConditionalExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTConditionalOrExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTConditionalAndExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTInclusiveOrExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTExclusiveOrExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAndExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTEqualityExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTInstanceOfExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTRelationalExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTShiftExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAdditiveExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMultiplicativeExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTUnaryExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPreIncrementExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPreDecrementExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTUnaryExpressionNotPlusMinus node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPostfixExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCastExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPrimaryExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPrimaryPrefix node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTPrimarySuffix node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTLiteral node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTBooleanLiteral node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTNullLiteral node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTArguments node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTArgumentList node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAllocationExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTArrayDimsAndInits node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTLabeledStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTBlock node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTBlockStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTLocalVariableDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTEmptyStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTStatementExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTSwitchStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTSwitchLabel node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTIfStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTWhileStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDoStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTForStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTForInit node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTStatementExpressionList node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTForUpdate node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTBreakStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTContinueStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTReturnStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTThrowStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTSynchronizedStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTTryStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTFinallyStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCatchStatement node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTResourceSpecification node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTResources node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTResource node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTLambdaExpression node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTMethodReference node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTModuleDeclaration node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTModuleDirective node, Object data) {
         return visit((JavaNode) node, data);
     }
 
+    @Override
     public Object visit(ASTModuleName node, Object data) {
         return visit((JavaNode) node, data);
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractStatisticalJavaRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractStatisticalJavaRule.java
index c645afef57..d4b65dbd1b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractStatisticalJavaRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractStatisticalJavaRule.java
@@ -16,10 +16,12 @@ public abstract class AbstractStatisticalJavaRule extends AbstractJavaRule imple
 
     private final StatisticalRuleHelper helper = new StatisticalRuleHelper(this);
 
+    @Override
     public void addDataPoint(DataPoint point) {
         helper.addDataPoint(point);
     }
 
+    @Override
     public Object[] getViolationParameters(DataPoint point) {
         return new Object[0];
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleChainVisitor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleChainVisitor.java
index cfe6ab43c0..386335289a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleChainVisitor.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/JavaRuleChainVisitor.java
@@ -18,10 +18,12 @@ import net.sourceforge.pmd.lang.rule.XPathRule;
 
 public class JavaRuleChainVisitor extends AbstractRuleChainVisitor {
 
+    @Override
     protected void indexNodes(List<Node> nodes, RuleContext ctx) {
         JavaParserVisitor javaParserVistor = new JavaParserVisitorAdapter() {
             // Perform a visitation of the AST to index nodes which need
             // visiting by type
+            @Override
             public Object visit(JavaNode node, Object data) {
                 indexNode(node);
                 return super.visit(node, data);
@@ -33,6 +35,7 @@ public class JavaRuleChainVisitor extends AbstractRuleChainVisitor {
         }
     }
 
+    @Override
     protected void visit(Rule rule, Node node, RuleContext ctx) {
         // Rule better either be a JavaParserVisitor, or a XPathRule
         if (rule instanceof XPathRule) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/StringConcatenationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/StringConcatenationRule.java
index e495d858a5..a0c9f51195 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/StringConcatenationRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/StringConcatenationRule.java
@@ -11,6 +11,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTForStatement;
 //FUTURE This is not referenced by any RuleSet?
 public class StringConcatenationRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTForStatement node, Object data) {
         Node forLoopStmt = null;
         for (int i = 0; i < 4; i++) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/UselessAssignment.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/UselessAssignment.java
index 02fbdffc70..61b7a1950b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/UselessAssignment.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/UselessAssignment.java
@@ -21,6 +21,7 @@ public class UselessAssignment extends AbstractJavaRule implements Executable {
 
     private RuleContext rc;
 
+    @Override
     public Object visit(ASTMethodDeclaration node, Object data) {
         this.rc = (RuleContext) data;
 
@@ -48,11 +49,13 @@ public class UselessAssignment extends AbstractJavaRule implements Executable {
             this.node = node;
         }
 
+        @Override
         public String toString() {
             return "accessType = " + accessType + ", line = " + node.getLine();
         }
     }
 
+    @Override
     public void execute(CurrentPath path) {
         Map<String, Usage> hash = new HashMap<>();
         // System.out.println("path size is " + path.size());
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationRule.java
index 7106861c5c..56cad28680 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationRule.java
@@ -22,23 +22,24 @@ import net.sourceforge.pmd.lang.symboltable.NameOccurrence;
 
 public class AccessorMethodGenerationRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(final ASTCompilationUnit node, final Object data) {
         final SourceFileScope file = node.getScope().getEnclosingScope(SourceFileScope.class);
         analyzeScope(file, data);
-        
+
         return data; // Stop tree navigation
     }
 
     private void analyzeScope(final AbstractJavaScope file, final Object data) {
         for (final ClassNameDeclaration classDecl : file.getDeclarations(ClassNameDeclaration.class).keySet()) {
             final ClassScope classScope = (ClassScope) classDecl.getScope();
-            
+
             // Check fields
             for (final Map.Entry<VariableNameDeclaration, List<NameOccurrence>> varDecl : classScope.getVariableDeclarations().entrySet()) {
                 final ASTFieldDeclaration field = varDecl.getKey().getNode().getFirstParentOfType(ASTFieldDeclaration.class);
                 analyzeMember(field, varDecl.getValue(), classScope, data);
             }
-            
+
             // Check methods
             for (final Map.Entry<MethodNameDeclaration, List<NameOccurrence>> methodDecl : classScope.getMethodDeclarations().entrySet()) {
                 final ASTMethodDeclaration method = methodDecl.getKey().getNode().getFirstParentOfType(ASTMethodDeclaration.class);
@@ -49,7 +50,7 @@ public class AccessorMethodGenerationRule extends AbstractJavaRule {
             analyzeScope(classScope, data);
         }
     }
-    
+
     public void analyzeMember(final AbstractJavaAccessNode node, final List<NameOccurrence> occurrences,
             final ClassScope classScope, final Object data) {
         if (!node.isPrivate()) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitAssertionsShouldIncludeMessageRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitAssertionsShouldIncludeMessageRule.java
index 7a453a7a0d..065f8968bb 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitAssertionsShouldIncludeMessageRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitAssertionsShouldIncludeMessageRule.java
@@ -74,6 +74,7 @@ public class JUnitAssertionsShouldIncludeMessageRule extends AbstractJUnitRule {
         });
     }
 
+    @Override
     public Object visit(ASTArguments node, Object data) {
         for (AssertionCall call : checks) {
             call.check(data, node);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedFormalParameterRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedFormalParameterRule.java
index cc6561ec8b..df8473acbf 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedFormalParameterRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedFormalParameterRule.java
@@ -36,11 +36,13 @@ public class UnusedFormalParameterRule extends AbstractJavaRule {
         definePropertyDescriptor(CHECKALL_DESCRIPTOR);
     }
 
+    @Override
     public Object visit(ASTConstructorDeclaration node, Object data) {
         check(node, data);
         return data;
     }
 
+    @Override
     public Object visit(ASTMethodDeclaration node, Object data) {
         if (!node.isPrivate() && !getProperty(CHECKALL_DESCRIPTOR)) {
             return data;
@@ -86,12 +88,12 @@ public class UnusedFormalParameterRule extends AbstractJavaRule {
                     .getDeclarations(VariableNameDeclaration.class);
             for (Map.Entry<VariableNameDeclaration, List<NameOccurrence>> entry : vars.entrySet()) {
                 VariableNameDeclaration nameDecl = entry.getKey();
-                
+
                 ASTVariableDeclaratorId declNode = nameDecl.getDeclaratorId();
                 if (!declNode.isFormalParameter() || declNode.isExplicitReceiverParameter()) {
                     continue;
                 }
-                
+
                 if (actuallyUsed(nameDecl, entry.getValue())) {
                     continue;
                 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedLocalVariableRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedLocalVariableRule.java
index 9ce413d7bb..d98e525380 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedLocalVariableRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedLocalVariableRule.java
@@ -19,6 +19,7 @@ public class UnusedLocalVariableRule extends AbstractJavaRule {
         addRuleChainVisit(ASTLocalVariableDeclaration.class);
     }
 
+    @Override
     public Object visit(ASTLocalVariableDeclaration decl, Object data) {
         for (int i = 0; i < decl.jjtGetNumChildren(); i++) {
             if (!(decl.jjtGetChild(i) instanceof ASTVariableDeclarator)) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateMethodRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateMethodRule.java
index 67159cd1a5..6cd2a517e2 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateMethodRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateMethodRule.java
@@ -40,13 +40,14 @@ public class UnusedPrivateMethodRule extends AbstractIgnoredAnnotationRule {
 
     /**
      * Visit each method declaration.
-     * 
+     *
      * @param node
      *            the method declaration
      * @param data
      *            data - rule context
      * @return data
      */
+    @Override
     public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
         if (node.isInterface()) {
             return data;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseCollectionIsEmptyRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseCollectionIsEmptyRule.java
index a5e49cd0d5..923bc2c730 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseCollectionIsEmptyRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseCollectionIsEmptyRule.java
@@ -26,22 +26,24 @@ import net.sourceforge.pmd.util.CollectionUtil;
 /**
  * Detect structures like "foo.size() == 0" and suggest replacing them with
  * foo.isEmpty(). Will also find != 0 (replaceable with !isEmpty()).
- * 
+ *
  * @author Jason Bennett
  */
 public class UseCollectionIsEmptyRule extends AbstractInefficientZeroCheck {
 
+    @Override
     public boolean appliesToClassName(String name) {
         return CollectionUtil.isCollectionType(name, true);
     }
 
     /**
      * Determine if we're dealing with .size method
-     * 
+     *
      * @param occ
      *            The name occurrence
      * @return true if it's .size, else false
      */
+    @Override
     public boolean isTargetMethod(JavaNameOccurrence occ) {
         if (occ.getNameForWhichThisIsAQualifier() != null) {
             if (occ.getLocation().getImage().endsWith(".size")) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidDollarSignsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidDollarSignsRule.java
index c0f6099b15..84aeb53a1f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidDollarSignsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidDollarSignsRule.java
@@ -11,6 +11,7 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
 public class AvoidDollarSignsRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
         if (node.getImage().indexOf('$') != -1) {
             addViolation(data, node);
@@ -19,6 +20,7 @@ public class AvoidDollarSignsRule extends AbstractJavaRule {
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTVariableDeclaratorId node, Object data) {
         if (node.getImage().indexOf('$') != -1) {
             addViolation(data, node);
@@ -27,6 +29,7 @@ public class AvoidDollarSignsRule extends AbstractJavaRule {
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTMethodDeclarator node, Object data) {
         if (node.getImage().indexOf('$') != -1) {
             addViolation(data, node);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/ConfusingTernaryRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/ConfusingTernaryRule.java
index 832b337806..8eb681819b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/ConfusingTernaryRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/ConfusingTernaryRule.java
@@ -20,9 +20,9 @@ import net.sourceforge.pmd.properties.BooleanProperty;
 /**
  * <code>if (x != y) { diff(); } else { same(); }</code> and<br>
  * <code>(!x ? diff() : same());</code>
- * 
+ *
  * <p>XPath can handle the easy cases, e.g.:</p>
- * 
+ *
  * <pre>
  *    //IfStatement[
  *      Statement[2]
@@ -30,18 +30,18 @@ import net.sourceforge.pmd.properties.BooleanProperty;
  *        EqualityExpression[@Image="!="] or
  *        UnaryExpressionNotPlusMinus[@Image="!"]]]
  * </pre>
- * 
+ *
  * <p>But "&amp;&amp;" and "||" are difficult, since we need a match for <i>all</i>
  * children instead of just one. This can be done by using a double-negative,
  * e.g.:</p>
- * 
+ *
  * <pre>
  *    not(*[not(<i>matchme</i>)])
  * </pre>
- * 
+ *
  * <p>Still, XPath is unable to handle arbitrarily nested cases, since it lacks
  * recursion, e.g.:</p>
- * 
+ *
  * <pre>
  * if (((x != !y)) || !(x)) {
  *     diff();
@@ -59,6 +59,7 @@ public class ConfusingTernaryRule extends AbstractJavaRule {
         definePropertyDescriptor(ignoreElseIfProperty);
     }
 
+    @Override
     public Object visit(ASTIfStatement node, Object data) {
         // look for "if (match) ..; else .."
         if (node.jjtGetNumChildren() == 3) {
@@ -78,6 +79,7 @@ public class ConfusingTernaryRule extends AbstractJavaRule {
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTConditionalExpression node, Object data) {
         // look for "match ? .. : .."
         if (node.jjtGetNumChildren() > 0) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/DuplicateImportsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/DuplicateImportsRule.java
index 8c6c19dcb3..28963d7557 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/DuplicateImportsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/DuplicateImportsRule.java
@@ -19,6 +19,7 @@ public class DuplicateImportsRule extends AbstractJavaRule {
     private Set<ImportWrapper> singleTypeImports;
     private Set<ImportWrapper> importOnDemandImports;
 
+    @Override
     public Object visit(ASTCompilationUnit node, Object data) {
         singleTypeImports = new HashSet<>();
         importOnDemandImports = new HashSet<>();
@@ -49,7 +50,7 @@ public class DuplicateImportsRule extends AbstractJavaRule {
     /**
      * Check whether this seemingly duplicate import is actually a
      * disambiguation import.
-     * 
+     *
      * Example: import java.awt.*; import java.util.*; import java.util.List;
      * //Needed because java.awt.List exists
      */
@@ -83,6 +84,7 @@ public class DuplicateImportsRule extends AbstractJavaRule {
         return node.getClassTypeResolver().classNameExists(fullyQualifiedClassName);
     }
 
+    @Override
     public Object visit(ASTImportDeclaration node, Object data) {
         ImportWrapper wrapper = new ImportWrapper(node.getImportedName(), node.getImportedName(),
                 node.getImportedNameNode(), node.isStatic() && node.isImportOnDemand());
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableCouldBeFinalRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableCouldBeFinalRule.java
index 69b20a22c8..7bf3bb424a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableCouldBeFinalRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableCouldBeFinalRule.java
@@ -15,6 +15,7 @@ import net.sourceforge.pmd.lang.symboltable.Scope;
 
 public class LocalVariableCouldBeFinalRule extends AbstractOptimizationRule {
 
+    @Override
     public Object visit(ASTLocalVariableDeclaration node, Object data) {
         if (node.isFinal()) {
             return data;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java
index 45b0547624..ea61b03767 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java
@@ -121,6 +121,7 @@ public class UnnecessaryModifierRule extends AbstractJavaRule {
     }
 
 
+    @Override
     public Object visit(ASTAnnotationTypeDeclaration node, Object data) {
         if (node.isAbstract()) {
             // may have several violations, with different explanations
@@ -147,6 +148,7 @@ public class UnnecessaryModifierRule extends AbstractJavaRule {
     }
 
 
+    @Override
     public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
 
         if (node.isInterface() && node.isAbstract()) {
@@ -172,7 +174,8 @@ public class UnnecessaryModifierRule extends AbstractJavaRule {
 
         return data;
     }
-    
+
+    @Override
     public Object visit(final ASTMethodDeclaration node, Object data) {
         Set<Modifier> unnecessary = EnumSet.noneOf(Modifier.class);
 
@@ -201,18 +204,20 @@ public class UnnecessaryModifierRule extends AbstractJavaRule {
                 }
             }
         }
-        
+
         return data;
     }
-    
+
+    @Override
     public Object visit(final ASTResource node, final Object data) {
         if (node.isFinal()) {
             reportUnnecessaryModifiers(data, node, Modifier.FINAL, "resource specifications are implicitly final");
         }
-        
+
         return data;
     }
 
+    @Override
     public Object visit(ASTFieldDeclaration node, Object data) {
         Set<Modifier> unnecessary = EnumSet.noneOf(Modifier.class);
         if (node.isSyntacticallyPublic()) {
@@ -229,6 +234,7 @@ public class UnnecessaryModifierRule extends AbstractJavaRule {
         return data;
     }
 
+    @Override
     public Object visit(ASTAnnotationMethodDeclaration node, Object data) {
         Set<Modifier> unnecessary = EnumSet.noneOf(Modifier.class);
         if (node.isPublic()) {
@@ -240,7 +246,8 @@ public class UnnecessaryModifierRule extends AbstractJavaRule {
         checkDeclarationInInterfaceType(data, node, unnecessary);
         return data;
     }
-    
+
+    @Override
     public Object visit(ASTConstructorDeclaration node, Object data) {
         if (node.getNthParent(2) instanceof ASTEnumBody) {
             if (node.isPrivate()) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryReturnRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryReturnRule.java
index d97d8fdc70..dfc18aeb88 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryReturnRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryReturnRule.java
@@ -13,6 +13,7 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
 public class UnnecessaryReturnRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTMethodDeclaration node, Object data) {
 
         if (node.getResultType().isVoid()) {
@@ -21,6 +22,7 @@ public class UnnecessaryReturnRule extends AbstractJavaRule {
         return data;
     }
 
+    @Override
     public Object visit(ASTReturnStatement node, Object data) {
         if (node.jjtGetParent() instanceof ASTStatement && node.getNthParent(2) instanceof ASTBlockStatement
                 && node.getNthParent(3) instanceof ASTBlock && node.getNthParent(4) instanceof ASTMethodDeclaration) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/VariableNamingConventionsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/VariableNamingConventionsRule.java
index 67fe9b19fe..093cff17f6 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/VariableNamingConventionsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/VariableNamingConventionsRule.java
@@ -89,6 +89,7 @@ public class VariableNamingConventionsRule extends AbstractJavaRule {
         definePropertyDescriptor(PARAMETER_SUFFIXES_DESCRIPTOR);
     }
 
+    @Override
     public Object visit(ASTCompilationUnit node, Object data) {
         init();
         return super.visit(node, data);
@@ -109,6 +110,7 @@ public class VariableNamingConventionsRule extends AbstractJavaRule {
         parameterSuffixes = getProperty(PARAMETER_SUFFIXES_DESCRIPTOR);
     }
 
+    @Override
     public Object visit(ASTFieldDeclaration node, Object data) {
         if (!checkMembers) {
             return data;
@@ -128,6 +130,7 @@ public class VariableNamingConventionsRule extends AbstractJavaRule {
                 isStatic ? staticSuffixes : memberSuffixes, node, isStatic, isFinal, data);
     }
 
+    @Override
     public Object visit(ASTLocalVariableDeclaration node, Object data) {
         if (!checkLocals) {
             return data;
@@ -135,6 +138,7 @@ public class VariableNamingConventionsRule extends AbstractJavaRule {
         return checkVariableDeclarators(localPrefixes, localSuffixes, node, false, node.isFinal(), data);
     }
 
+    @Override
     public Object visit(ASTFormalParameters node, Object data) {
         if (!checkParameters) {
             return data;
@@ -241,6 +245,7 @@ public class VariableNamingConventionsRule extends AbstractJavaRule {
         return false;
     }
 
+    @Override
     public String dysfunctionReason() {
         return hasPrefixesOrSuffixes() ? null : "No prefixes or suffixes specified";
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java
index d7d4580da5..49b5012301 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java
@@ -14,7 +14,7 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractJavaRule {
     private int depth;
     private int depthLimit;
 
-    private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR 
+    private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR
             = IntegerProperty.named("problemDepth")
                              .desc("The if statement depth reporting threshold")
                              .range(1, 25).defaultValue(3).uiOrder(1.0f).build();
@@ -23,12 +23,14 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractJavaRule {
         definePropertyDescriptor(PROBLEM_DEPTH_DESCRIPTOR);
     }
 
+    @Override
     public Object visit(ASTCompilationUnit node, Object data) {
         depth = 0;
         depthLimit = getProperty(PROBLEM_DEPTH_DESCRIPTOR);
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTIfStatement node, Object data) {
         if (!node.hasElse()) {
             depth++;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveImportsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveImportsRule.java
index d7ff50b942..0b1baa3865 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveImportsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveImportsRule.java
@@ -31,6 +31,7 @@ public class ExcessiveImportsRule extends ExcessiveNodeCountRule {
      * @param data
      * @return Object
      */
+    @Override
     public Object visit(ASTImportDeclaration node, Object data) {
         return NumericConstants.ONE;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveParameterListRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveParameterListRule.java
index 5c63df2195..2895186887 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveParameterListRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveParameterListRule.java
@@ -20,6 +20,7 @@ public class ExcessiveParameterListRule extends ExcessiveNodeCountRule {
     }
 
     // Count these nodes, but no others.
+    @Override
     public Object visit(ASTFormalParameter node, Object data) {
         return NumericConstants.ONE;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessivePublicCountRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessivePublicCountRule.java
index 44edb316c3..be8c345239 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessivePublicCountRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/ExcessivePublicCountRule.java
@@ -17,7 +17,7 @@ import net.sourceforge.pmd.util.NumericConstants;
  * <p>If a class has a high number of public operations, it might be wise
  * to consider whether it would be appropriate to divide it into
  * subclasses.</p>
- * 
+ *
  * <p>A large proportion of public members and operations means the class
  * has high potential to be affected by external classes. Futhermore,
  * increased effort will be required to thoroughly test the class.
@@ -35,6 +35,7 @@ public class ExcessivePublicCountRule extends ExcessiveNodeCountRule {
     /**
      * Method counts ONLY public methods.
      */
+    @Override
     public Object visit(ASTMethodDeclarator node, Object data) {
         return this.getTallyOnAccessType((AccessNode) node.jjtGetParent());
     }
@@ -43,6 +44,7 @@ public class ExcessivePublicCountRule extends ExcessiveNodeCountRule {
      * Method counts ONLY public class attributes which are not PUBLIC and
      * static- these usually represent constants....
      */
+    @Override
     public Object visit(ASTFieldDeclaration node, Object data) {
         if (node.isFinal() && node.isStatic()) {
             return NumericConstants.ZERO;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterRule.java
index 9a791ad494..cb0d15b00a 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterRule.java
@@ -441,6 +441,7 @@ public class LawOfDemeterRule extends AbstractJavaRule {
                     + forLoop;
         }
 
+        @Override
         public int compareTo(Assignment o) {
             return o.line - line;
         }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NcssConstructorCountRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NcssConstructorCountRule.java
index 90cfbaab6d..3b368ff110 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NcssConstructorCountRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NcssConstructorCountRule.java
@@ -11,7 +11,7 @@ import net.sourceforge.pmd.util.NumericConstants;
 
 /**
  * Non-commented source statement counter for constructors.
- * 
+ *
  * @author Jason Bennett
  */
 public class NcssConstructorCountRule extends AbstractNcssCountRule {
@@ -24,6 +24,7 @@ public class NcssConstructorCountRule extends AbstractNcssCountRule {
         setProperty(MINIMUM_DESCRIPTOR, 100d);
     }
 
+    @Override
     public Object visit(ASTExplicitConstructorInvocation node, Object data) {
         return NumericConstants.ONE;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PositionalIteratorRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PositionalIteratorRule.java
index 933bcf4c63..09aa106952 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PositionalIteratorRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/PositionalIteratorRule.java
@@ -14,6 +14,7 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
 public class PositionalIteratorRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTWhileStatement node, Object data) {
         if (hasNameAsChild(node.jjtGetChild(0))) {
             String exprName = getName(node.jjtGetChild(0));
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java
index b6390905fa..be31cd3bca 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsRule.java
@@ -17,6 +17,7 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
 public class SimplifyBooleanReturnsRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTMethodDeclaration node, Object data) {
         // only boolean methods should be inspected
         ASTResultType r = node.getResultType();
@@ -34,6 +35,7 @@ public class SimplifyBooleanReturnsRule extends AbstractJavaRule {
         return data;
     }
 
+    @Override
     public Object visit(ASTIfStatement node, Object data) {
         // that's the case: if..then..return; return;
         if (!node.hasElse() && isIfJustReturnsBoolean(node) && isJustReturnsBooleanAfter(node)) {
@@ -154,7 +156,7 @@ public class SimplifyBooleanReturnsRule extends AbstractJavaRule {
     /**
      * Checks, whether there is a statement after the given if statement, and if
      * so, whether this is just a return boolean statement.
-     * 
+     *
      * @param node
      *            the if statement
      * @return
@@ -173,7 +175,7 @@ public class SimplifyBooleanReturnsRule extends AbstractJavaRule {
     /**
      * Checks whether the given ifstatement just returns a boolean in the if
      * clause.
-     * 
+     *
      * @param node
      *            the if statement
      * @return
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityRule.java
index 0f07c0a826..3299c585d1 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityRule.java
@@ -55,6 +55,7 @@ public class SwitchDensityRule extends AbstractStatisticalJavaRule {
         setProperty(MINIMUM_DESCRIPTOR, 10d);
     }
 
+    @Override
     public Object visit(ASTSwitchStatement node, Object data) {
         SwitchDensity oldData = null;
 
@@ -79,6 +80,7 @@ public class SwitchDensityRule extends AbstractStatisticalJavaRule {
         return oldData;
     }
 
+    @Override
     public Object visit(ASTStatement statement, Object data) {
         if (data instanceof SwitchDensity) {
             ((SwitchDensity) data).addStatement();
@@ -89,6 +91,7 @@ public class SwitchDensityRule extends AbstractStatisticalJavaRule {
         return data;
     }
 
+    @Override
     public Object visit(ASTSwitchLabel switchLabel, Object data) {
         if (data instanceof SwitchDensity) {
             ((SwitchDensity) data).addSwitchLabel();
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentToNonFinalStaticRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentToNonFinalStaticRule.java
index a25db595f0..4870e31778 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentToNonFinalStaticRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentToNonFinalStaticRule.java
@@ -22,12 +22,13 @@ import net.sourceforge.pmd.lang.symboltable.NameOccurrence;
  */
 public class AssignmentToNonFinalStaticRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
         Map<VariableNameDeclaration, List<NameOccurrence>> vars = node.getScope()
                 .getDeclarations(VariableNameDeclaration.class);
         for (Map.Entry<VariableNameDeclaration, List<NameOccurrence>> entry : vars.entrySet()) {
             VariableNameDeclaration decl = entry.getKey();
-            AccessNode accessNodeParent = (AccessNode) decl.getAccessNodeParent();
+            AccessNode accessNodeParent = decl.getAccessNodeParent();
             if (!accessNodeParent.isStatic() || accessNodeParent.isFinal()) {
                 continue;
             }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCallingFinalizeRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCallingFinalizeRule.java
index e2ae60bedb..28aa3b36a1 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCallingFinalizeRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCallingFinalizeRule.java
@@ -20,11 +20,13 @@ public class AvoidCallingFinalizeRule extends AbstractJavaRule {
 
     private Set<MethodScope> checked = new HashSet<>();
 
+    @Override
     public Object visit(ASTCompilationUnit acu, Object ctx) {
         checked.clear();
         return super.visit(acu, ctx);
     }
 
+    @Override
     public Object visit(ASTName name, Object ctx) {
         if (name.getImage() == null || !name.getImage().endsWith("finalize")) {
             return ctx;
@@ -36,6 +38,7 @@ public class AvoidCallingFinalizeRule extends AbstractJavaRule {
         return ctx;
     }
 
+    @Override
     public Object visit(ASTPrimaryPrefix pp, Object ctx) {
         List<ASTPrimarySuffix> primarySuffixes = pp.jjtGetParent().findChildrenOfType(ASTPrimarySuffix.class);
         ASTPrimarySuffix firstSuffix = null;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingTypeNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingTypeNameRule.java
index 8226f68220..ca96b63ebb 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingTypeNameRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingTypeNameRule.java
@@ -10,6 +10,7 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
 public class AvoidFieldNameMatchingTypeNameRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
         if (node.isInterface()) {
             return data;
@@ -17,6 +18,7 @@ public class AvoidFieldNameMatchingTypeNameRule extends AbstractJavaRule {
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTFieldDeclaration node, Object data) {
         ASTClassOrInterfaceDeclaration cl = node.getFirstParentOfType(ASTClassOrInterfaceDeclaration.class);
         if (cl != null && node.getVariableName().equalsIgnoreCase(cl.getImage())) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidUsingOctalValuesRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidUsingOctalValuesRule.java
index f739a50d02..d4c2fd551c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidUsingOctalValuesRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidUsingOctalValuesRule.java
@@ -26,6 +26,7 @@ public class AvoidUsingOctalValuesRule extends AbstractJavaRule {
         definePropertyDescriptor(STRICT_METHODS_DESCRIPTOR);
     }
 
+    @Override
     public Object visit(ASTLiteral node, Object data) {
         boolean strict = getProperty(STRICT_METHODS_DESCRIPTOR);
         Pattern p = strict ? STRICT_OCTAL_PATTERN : OCTAL_PATTERN;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/CompareObjectsWithEqualsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/CompareObjectsWithEqualsRule.java
index 01cf4074c9..9b75c5f9b4 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/CompareObjectsWithEqualsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/CompareObjectsWithEqualsRule.java
@@ -23,7 +23,7 @@ public class CompareObjectsWithEqualsRule extends AbstractJavaRule {
 
     /**
      * Indicate whether this node is allocating a new object.
-     * 
+     *
      * @param n
      *            node that might be allocating a new object
      * @return true if child 0 is an AllocationExpression
@@ -33,6 +33,7 @@ public class CompareObjectsWithEqualsRule extends AbstractJavaRule {
                 && n.jjtGetParent().jjtGetNumChildren() == 1;
     }
 
+    @Override
     public Object visit(ASTEqualityExpression node, Object data) {
         Node c0 = node.jjtGetChild(0).jjtGetChild(0);
         Node c1 = node.jjtGetChild(1).jjtGetChild(0);
@@ -100,7 +101,7 @@ public class CompareObjectsWithEqualsRule extends AbstractJavaRule {
     /**
      * Checks whether the given node contains a qualified name, consisting of
      * one ASTPrimaryPrefix and one or more ASTPrimarySuffix nodes.
-     * 
+     *
      * @param node
      *            the node
      * @return <code>true</code> if it is a qualified name
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DaaRuleViolation.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DaaRuleViolation.java
index 6bb7423685..40dfc8b977 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DaaRuleViolation.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DaaRuleViolation.java
@@ -13,7 +13,7 @@ import net.sourceforge.pmd.lang.java.rule.JavaRuleViolation;
 /**
  * The RuleViolation is extended by the VariableName. The VariableName is
  * required for showing what variable produces the UR DD or DU anomaly.
- * 
+ *
  * @author Sven Jacob
  * @author Brian Remedios
  */
@@ -30,6 +30,7 @@ public class DaaRuleViolation extends JavaRuleViolation {
         this.type = type;
     }
 
+    @Override
     public String getVariableName() {
         return variableName;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DataflowAnomalyAnalysisRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DataflowAnomalyAnalysisRule.java
index 9fc24f424e..ab529036a7 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DataflowAnomalyAnalysisRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DataflowAnomalyAnalysisRule.java
@@ -56,6 +56,7 @@ public class DataflowAnomalyAnalysisRule extends AbstractJavaRule implements Exe
             this.node = node;
         }
 
+        @Override
         public String toString() {
             return "accessType = " + accessType + ", line = " + node.getLine();
         }
@@ -66,12 +67,14 @@ public class DataflowAnomalyAnalysisRule extends AbstractJavaRule implements Exe
         definePropertyDescriptor(MAX_VIOLATIONS_DESCRIPTOR);
     }
 
+    @Override
     public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
         maxRuleViolations = getProperty(MAX_VIOLATIONS_DESCRIPTOR);
         currentRuleViolationCount = 0;
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTMethodDeclaration methodDeclaration, Object data) {
         rc = (RuleContext) data;
         daaRuleViolations = new ArrayList<>();
@@ -85,6 +88,7 @@ public class DataflowAnomalyAnalysisRule extends AbstractJavaRule implements Exe
         return data;
     }
 
+    @Override
     public void execute(CurrentPath path) {
 
         if (maxNumberOfViolationsReached()) {
@@ -149,7 +153,7 @@ public class DataflowAnomalyAnalysisRule extends AbstractJavaRule implements Exe
 
     /**
      * Maximum number of violations was already reached?
-     * 
+     *
      * @return <code>true</code> if the maximum number of violations was
      *         reached, <code>false</code> otherwise.
      */
@@ -160,7 +164,7 @@ public class DataflowAnomalyAnalysisRule extends AbstractJavaRule implements Exe
     /**
      * Checks if a violation already exists. This is needed because on the
      * different paths same anomalies can occur.
-     * 
+     *
      * @param type
      * @param var
      * @param startLine
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontImportSunRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontImportSunRule.java
index 65eed5d572..f7b42f7d59 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontImportSunRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontImportSunRule.java
@@ -9,6 +9,7 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
 public class DontImportSunRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTImportDeclaration node, Object data) {
         String img = node.jjtGetChild(0).getImage();
         if (img.startsWith("sun.") && !img.startsWith("sun.misc.Signal")) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ImportFromSamePackageRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ImportFromSamePackageRule.java
index dfdfd488e2..6323acface 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ImportFromSamePackageRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/ImportFromSamePackageRule.java
@@ -12,6 +12,7 @@ import net.sourceforge.pmd.lang.java.symboltable.SourceFileScope;
 
 public class ImportFromSamePackageRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTImportDeclaration importDecl, Object data) {
         String packageName = importDecl.getScope().getEnclosingScope(SourceFileScope.class).getPackageName();
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingleMethodSingletonRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingleMethodSingletonRule.java
index 8336ba8c0d..4308e8652f 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingleMethodSingletonRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingleMethodSingletonRule.java
@@ -7,8 +7,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone;
 
 import java.util.List;
 
-
-
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
@@ -27,6 +25,7 @@ public class SingleMethodSingletonRule extends AbstractJavaRule {
      */
 
 
+    @Override
     public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
 
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousHashcodeMethodNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousHashcodeMethodNameRule.java
index 4b1529d38b..48935a3b49 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousHashcodeMethodNameRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousHashcodeMethodNameRule.java
@@ -13,6 +13,7 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
 public class SuspiciousHashcodeMethodNameRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTMethodDeclaration node, Object data) {
         /*
          * original XPath rule was //MethodDeclaration [ResultType
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryCaseChangeRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryCaseChangeRule.java
index db36efe9aa..0ad72b50f0 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryCaseChangeRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryCaseChangeRule.java
@@ -13,6 +13,7 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 
 public class UnnecessaryCaseChangeRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTPrimaryExpression exp, Object data) {
         int n = exp.jjtGetNumChildren();
         if (n < 4) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryConversionTemporaryRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryConversionTemporaryRule.java
index 4f2b3316a1..fcd91042e6 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryConversionTemporaryRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryConversionTemporaryRule.java
@@ -22,6 +22,7 @@ public class UnnecessaryConversionTemporaryRule extends AbstractJavaRule {
     private static final Set<String> PRIMITIVE_WRAPPERS = CollectionUtil
             .asSet(new String[] { "Integer", "Boolean", "Double", "Long", "Short", "Byte", "Float" });
 
+    @Override
     public Object visit(ASTPrimaryExpression node, Object data) {
         if (node.jjtGetNumChildren() == 0 || (node.jjtGetChild(0)).jjtGetNumChildren() == 0
                 || !(node.jjtGetChild(0).jjtGetChild(0) instanceof ASTAllocationExpression)) {
@@ -37,6 +38,7 @@ public class UnnecessaryConversionTemporaryRule extends AbstractJavaRule {
         return data;
     }
 
+    @Override
     public Object visit(ASTAllocationExpression node, Object data) {
         if (!inPrimaryExpressionContext || !(node.jjtGetChild(0) instanceof ASTClassOrInterfaceType)) {
             return super.visit(node, data);
@@ -48,6 +50,7 @@ public class UnnecessaryConversionTemporaryRule extends AbstractJavaRule {
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTPrimarySuffix node, Object data) {
         if (inPrimaryExpressionContext && usingPrimitiveWrapperAllocation) {
             if (node.hasImageEqualTo("toString")) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/AbstractOptimizationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/AbstractOptimizationRule.java
index c999e16be6..320c35ad30 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/AbstractOptimizationRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/AbstractOptimizationRule.java
@@ -19,6 +19,7 @@ import net.sourceforge.pmd.lang.symboltable.NameOccurrence;
  */
 public class AbstractOptimizationRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTClassOrInterfaceDeclaration node, Object data) {
         if (node.isInterface()) {
             return data;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/RedundantFieldInitializerRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/RedundantFieldInitializerRule.java
index 9d8cfb9072..0ed7e1915b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/RedundantFieldInitializerRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/RedundantFieldInitializerRule.java
@@ -30,6 +30,7 @@ public class RedundantFieldInitializerRule extends AbstractJavaRule {
         addRuleChainVisit(ASTFieldDeclaration.class);
     }
 
+    @Override
     public Object visit(ASTFieldDeclaration fieldDeclaration, Object data) {
         // Finals can only be initialized once.
         if (fieldDeclaration.isFinal()) {
@@ -108,17 +109,17 @@ public class RedundantFieldInitializerRule extends AbstractJavaRule {
     /**
      * Checks if a FieldDeclaration is a reference type (includes arrays). The
      * reference information is in the FieldDeclaration for this example:
-     * 
+     *
      * <pre>
      * int[] ia1
      * </pre>
-     * 
+     *
      * and in the VariableDeclarator for this example:
-     * 
+     *
      * <pre>
      * int ia2[];
      * </pre>
-     * 
+     *
      * .
      *
      * @param fieldDeclaration
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/StringToStringRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/StringToStringRule.java
index 4ea00326aa..95c4e29986 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/StringToStringRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/StringToStringRule.java
@@ -16,6 +16,7 @@ import net.sourceforge.pmd.lang.symboltable.ScopedNode;
 
 public class StringToStringRule extends AbstractJavaRule {
 
+    @Override
     public Object visit(ASTVariableDeclaratorId node, Object data) {
         if (!TypeHelper.isExactlyAny(node.getNameDeclaration(), String.class)
                 && !TypeHelper.isExactlyAny(node.getNameDeclaration(), String[].class)) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UnnecessaryWrapperObjectCreationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UnnecessaryWrapperObjectCreationRule.java
index b2df7a4dda..4faf1d2891 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UnnecessaryWrapperObjectCreationRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UnnecessaryWrapperObjectCreationRule.java
@@ -25,6 +25,7 @@ public class UnnecessaryWrapperObjectCreationRule extends AbstractJavaRule {
     private static final Set<String> SUFFIX_SET = CollectionUtil.asSet(new String[] { "toString", "byteValue",
         "shortValue", "intValue", "longValue", "floatValue", "doubleValue", "charValue", });
 
+    @Override
     public Object visit(ASTPrimaryPrefix node, Object data) {
         if (node.jjtGetNumChildren() == 0 || !(node.jjtGetChild(0) instanceof ASTName)) {
             return super.visit(node, data);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UseIndexOfCharRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UseIndexOfCharRule.java
index 56e1562a19..69d0f23b4c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UseIndexOfCharRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/UseIndexOfCharRule.java
@@ -17,7 +17,7 @@ public class UseIndexOfCharRule extends AbstractPoorMethodCall {
 
     /**
      * Method targetTypeName.
-     * 
+     *
      * @return String
      */
     @Override
@@ -27,7 +27,7 @@ public class UseIndexOfCharRule extends AbstractPoorMethodCall {
 
     /**
      * Method methodNames.
-     * 
+     *
      * @return String[]
      */
     @Override
@@ -35,6 +35,7 @@ public class UseIndexOfCharRule extends AbstractPoorMethodCall {
         return METHOD_NAMES;
     }
 
+    @Override
     protected boolean isViolationArgument(Node arg) {
         return ((ASTLiteral) arg).isSingleCharacterStringLiteral();
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassNameDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassNameDeclaration.java
index e68d24a680..28bf128809 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassNameDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassNameDeclaration.java
@@ -15,6 +15,7 @@ public class ClassNameDeclaration extends AbstractNameDeclaration implements Typ
         super(node);
     }
 
+    @Override
     public String toString() {
         if (node instanceof ASTClassOrInterfaceDeclaration) {
             if (((ASTClassOrInterfaceDeclaration) node).isInterface()) {
@@ -31,10 +32,12 @@ public class ClassNameDeclaration extends AbstractNameDeclaration implements Typ
         return node;
     }
 
+    @Override
     public String getTypeImage() {
         return ((ASTClassOrInterfaceDeclaration) node).getImage();
     }
 
+    @Override
     public Class<?> getType() {
         return ((ASTClassOrInterfaceDeclaration) node).getType();
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassScope.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassScope.java
index 51cbb65e64..33cb17768c 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassScope.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/ClassScope.java
@@ -63,6 +63,7 @@ public class ClassScope extends AbstractJavaScope {
 
     // FIXME - this breaks given sufficiently nested code
     private static ThreadLocal<Integer> anonymousInnerClassCounter = new ThreadLocal<Integer>() {
+        @Override
         protected Integer initialValue() {
             return Integer.valueOf(1);
         }
@@ -90,7 +91,7 @@ public class ClassScope extends AbstractJavaScope {
      * <p>FIXME - should have name like Foo$1, not Anonymous$1 to get this working
      * right, the parent scope needs to be passed in when instantiating a
      * ClassScope</p>
-     * 
+     *
      * @param classNameDeclaration The declaration of this class, as known to the parent scope.
      */
     public ClassScope(final ClassNameDeclaration classNameDeclaration) {
@@ -122,6 +123,7 @@ public class ClassScope extends AbstractJavaScope {
         return getDeclarations(VariableNameDeclaration.class);
     }
 
+    @Override
     public Set<NameDeclaration> addNameOccurrence(NameOccurrence occurrence) {
         JavaNameOccurrence javaOccurrence = (JavaNameOccurrence) occurrence;
         Set<NameDeclaration> declarations = findVariableHere(javaOccurrence);
@@ -131,7 +133,7 @@ public class ClassScope extends AbstractJavaScope {
                 List<NameOccurrence> nameOccurrences = getMethodDeclarations().get(decl);
                 if (nameOccurrences == null) {
                     // TODO may be a class name: Foo.this.super();
-                    
+
                     // search inner classes
                     for (ClassNameDeclaration innerClass : getClassDeclarations().keySet()) {
                         Scope innerClassScope = innerClass.getScope();
@@ -176,6 +178,7 @@ public class ClassScope extends AbstractJavaScope {
         return this.className;
     }
 
+    @Override
     protected Set<NameDeclaration> findVariableHere(JavaNameOccurrence occurrence) {
         if (occurrence.isThisOrSuper() || className.equals(occurrence.getImage())) {
             // Reference to ourselves!
@@ -322,7 +325,7 @@ public class ClassScope extends AbstractJavaScope {
             variableDeclaratorId.setImage("arg" + i);
             formalParameter.jjtAddChild(variableDeclaratorId, 1);
             variableDeclaratorId.jjtSetParent(formalParameter);
-            
+
             ASTType type = new ASTType(JavaParserTreeConstants.JJTTYPE);
             formalParameter.jjtAddChild(type, 0);
             type.jjtSetParent(formalParameter);
@@ -352,7 +355,7 @@ public class ClassScope extends AbstractJavaScope {
     /**
      * Provide a list of types of the parameters of the given method
      * declaration. The types are simple type images.
-     * 
+     *
      * @param mnd
      *            the method declaration.
      * @return List of types
@@ -372,7 +375,7 @@ public class ClassScope extends AbstractJavaScope {
             if (p.isExplicitReceiverParameter()) {
                 continue;
             }
-            
+
             String typeImage = p.getTypeNode().getTypeImage();
             // typeImage might be qualified/unqualified. If it refers to a type,
             // defined in the same toplevel class,
@@ -439,7 +442,7 @@ public class ClassScope extends AbstractJavaScope {
      * (e.g. because it is itself the result of a method call), the parameter
      * type is used - so it is assumed, it is of the correct type. This might
      * cause confusion when methods are overloaded.
-     * 
+     *
      * @param occurrence
      *            the method call
      * @param parameterTypes
@@ -663,6 +666,7 @@ public class ClassScope extends AbstractJavaScope {
         return null;
     }
 
+    @Override
     public String toString() {
         StringBuilder res = new StringBuilder("ClassScope (").append(className).append("): ");
         Map<ClassNameDeclaration, List<NameOccurrence>> classDeclarations = getClassDeclarations();
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/OccurrenceFinder.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/OccurrenceFinder.java
index baf14a5c57..37b6b819a5 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/OccurrenceFinder.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/OccurrenceFinder.java
@@ -21,6 +21,7 @@ public class OccurrenceFinder extends JavaParserVisitorAdapter {
 
     private final Set<NameDeclaration> additionalDeclarations = new HashSet<>();
 
+    @Override
     public Object visit(ASTPrimaryExpression node, Object data) {
         NameFinder nameFinder = new NameFinder(node);
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScope.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScope.java
index 340cf7b8ab..877231c3de 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScope.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScope.java
@@ -40,7 +40,7 @@ public class SourceFileScope extends AbstractJavaScope {
 
     /**
      * Configures the type resolution for the symbol table.
-     * 
+     *
      * @param imports
      *            the import declarations
      */
@@ -62,7 +62,7 @@ public class SourceFileScope extends AbstractJavaScope {
      * Whether an auxclasspath has been configured or not. This can be used to
      * enable/disable more detailed symbol table analysis and type resolution
      * can be used - or to fall back to more simple implementation.
-     * 
+     *
      * @return <code>true</code> if the auxclasspath is configured and types can
      *         be resolved reliably.
      * @see #resolveType(String)
@@ -73,7 +73,7 @@ public class SourceFileScope extends AbstractJavaScope {
 
     /**
      * Tries to resolve a class by name.
-     * 
+     *
      * @param name
      *            the name of the class
      * @return the class or <code>null</code> if no class could be found
@@ -88,7 +88,7 @@ public class SourceFileScope extends AbstractJavaScope {
 
     /**
      *
-     * 
+     *
      * @throws IllegalArgumentException
      *             if declaration is not a {@link ClassNameDeclaration}
      */
@@ -103,7 +103,7 @@ public class SourceFileScope extends AbstractJavaScope {
     /**
      * Convenience method that casts the declarations to
      * {@link ClassNameDeclaration}s.
-     * 
+     *
      * @see #getDeclarations()
      * @return all class name declarations
      */
@@ -111,6 +111,7 @@ public class SourceFileScope extends AbstractJavaScope {
         return getDeclarations(ClassNameDeclaration.class);
     }
 
+    @Override
     public String toString() {
         return "SourceFileScope: " + glomNames(getClassDeclarations().keySet());
     }
@@ -121,6 +122,7 @@ public class SourceFileScope extends AbstractJavaScope {
         return (ClassNameDeclaration) finder.getDecl();
     }
 
+    @Override
     protected Set<NameDeclaration> findVariableHere(JavaNameOccurrence occ) {
         ImageFinderFunction finder = new ImageFinderFunction(occ.getImage());
         Applier.apply(finder, getDeclarations().keySet().iterator());
@@ -133,7 +135,7 @@ public class SourceFileScope extends AbstractJavaScope {
     /**
      * Returns a set of all types defined within this source file. This includes
      * all top-level types and nested types.
-     * 
+     *
      * @return set of all types in this source file.
      */
     public Map<String, Node> getQualifiedTypeNames() {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypeSet.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypeSet.java
index 1e29286a07..45c284a569 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypeSet.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/TypeSet.java
@@ -36,7 +36,7 @@ public class TypeSet {
 
     /**
      * The {@link TypeSet} provides type resolution for the symbol facade.
-     * 
+     *
      * @param classLoader
      *            the class loader to use to search classes (could be an
      *            auxiliary class path)
@@ -52,7 +52,7 @@ public class TypeSet {
 
     /**
      * Whether the classloader is using the auxclasspath or not.
-     * 
+     *
      * @return <code>true</code> if the classloader is using the auxclasspath
      *         feature
      */
@@ -83,7 +83,7 @@ public class TypeSet {
          * Checks if the given class could be resolved by this resolver. Notice,
          * that a resolver's ability to resolve a class does not imply that the
          * class will actually be found and resolved.
-         * 
+         *
          * @param name
          *            the name of the class, might be fully classified or not.
          * @return whether the class can be resolved
@@ -102,7 +102,7 @@ public class TypeSet {
 
         /**
          * Creates a new AbstractResolver that uses the given class loader.
-         * 
+         *
          * @param pmdClassLoader
          *            the class loader to use
          */
@@ -164,6 +164,7 @@ public class TypeSet {
             return null;
         }
 
+        @Override
         public boolean couldResolve(final String name) {
             /*
              * Resolvers based on this one, will attempt to load the class from
@@ -182,7 +183,7 @@ public class TypeSet {
 
         /**
          * Creates a new {@link ExplicitImportResolver}.
-         * 
+         *
          * @param pmdClassLoader
          *            the class loader to use.
          * @param importStmts
@@ -232,7 +233,7 @@ public class TypeSet {
 
         /**
          * Creates a new {@link CurrentPackageResolver}
-         * 
+         *
          * @param pmdClassLoader
          *            the class loader to use
          * @param pkg
@@ -291,7 +292,7 @@ public class TypeSet {
 
         /**
          * Creates a {@link ImplicitImportResolver}
-         * 
+         *
          * @param pmdClassLoader
          *            the class loader
          */
@@ -338,7 +339,7 @@ public class TypeSet {
 
         /**
          * Creates a {@link ImportOnDemandResolver}
-         * 
+         *
          * @param pmdClassLoader
          *            the class loader to use
          * @param importStmts
@@ -454,7 +455,7 @@ public class TypeSet {
     public static class FullyQualifiedNameResolver extends AbstractResolver {
         /**
          * Creates a {@link FullyQualifiedNameResolver}
-         * 
+         *
          * @param pmdClassLoader
          *            the class loader to use
          */
@@ -500,7 +501,7 @@ public class TypeSet {
 
     /**
      * Adds a import to the list of imports
-     * 
+     *
      * @param importString
      *            the import to add
      */
@@ -518,7 +519,7 @@ public class TypeSet {
 
     /**
      * Resolves a class by its name using all known resolvers.
-     * 
+     *
      * @param name
      *            the name of the class, can be a simple name or a fully
      *            qualified name.
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclaration.java
index d4573576f7..1a3a226cbf 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symboltable/VariableNameDeclaration.java
@@ -36,7 +36,7 @@ public class VariableNameDeclaration extends AbstractNameDeclaration implements
             return false;
         }
     }
-    
+
     public int getArrayDepth() {
         ASTVariableDeclaratorId astVariableDeclaratorId = (ASTVariableDeclaratorId) node;
         ASTType typeNode = astVariableDeclaratorId.getTypeNode();
@@ -64,7 +64,7 @@ public class VariableNameDeclaration extends AbstractNameDeclaration implements
     public boolean isLambdaTypelessParameter() {
         return isTypeInferred();
     }
-    
+
     public boolean isTypeInferred() {
         return getDeclaratorId().isTypeInferred();
     }
@@ -74,6 +74,7 @@ public class VariableNameDeclaration extends AbstractNameDeclaration implements
                 && getAccessNodeParent().getFirstChildOfType(ASTType.class).jjtGetChild(0) instanceof ASTPrimitiveType;
     }
 
+    @Override
     public String getTypeImage() {
         TypeNode typeNode = getTypeNode();
         if (typeNode != null) {
@@ -111,6 +112,7 @@ public class VariableNameDeclaration extends AbstractNameDeclaration implements
         return null;
     }
 
+    @Override
     public Class<?> getType() {
         TypeNode typeNode = getTypeNode();
         if (typeNode != null) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinitionSimple.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinitionSimple.java
index 8acf2c484c..1bed9a9f64 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinitionSimple.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/typedefinition/JavaTypeDefinitionSimple.java
@@ -101,7 +101,7 @@ import java.util.logging.Logger;
     public JavaTypeDefinition getGenericType(final String parameterName) {
         for (JavaTypeDefinition currTypeDef = this; currTypeDef != null;
                 currTypeDef = currTypeDef.getEnclosingClass()) {
-            
+
             int paramIndex = getGenericTypeIndex(currTypeDef.getType().getTypeParameters(), parameterName);
             if (paramIndex != -1) {
                 return currTypeDef.getGenericType(paramIndex);
@@ -112,7 +112,7 @@ import java.util.logging.Logger;
         StringBuilder builder = new StringBuilder("No generic parameter by name ").append(parameterName);
         for (JavaTypeDefinition currTypeDef = this; currTypeDef != null;
                 currTypeDef = currTypeDef.getEnclosingClass()) {
-            
+
             builder.append("\n on class ");
             builder.append(currTypeDef.getType().getSimpleName());
         }
@@ -137,7 +137,7 @@ import java.util.logging.Logger;
         for (int i = genericArgs.size(); i <= index; i++) {
             genericArgs.add(null);
         }
-        
+
         /*
          * Set a default to circuit-brake any recursions (ie: raw types with no generic info)
          * Object.class is a right answer in those scenarios
@@ -241,14 +241,17 @@ import java.util.logging.Logger;
                 : forClass(Array.newInstance(getType(), (int[]) Array.newInstance(int.class, numDimensions)).getClass());
     }
 
+    @Override
     public boolean isClassOrInterface() {
         return !clazz.isEnum() && !clazz.isPrimitive() && !clazz.isAnnotation() && !clazz.isArray();
     }
 
+    @Override
     public boolean isNullType() {
         return false;
     }
 
+    @Override
     public boolean isPrimitive() {
         return clazz.isPrimitive();
     }
@@ -258,10 +261,12 @@ import java.util.logging.Logger;
         return clazz.equals(def.getType()) && getTypeParameterCount() == def.getTypeParameterCount();
     }
 
+    @Override
     public boolean hasSameErasureAs(JavaTypeDefinition def) {
         return clazz == def.getType();
     }
 
+    @Override
     public int getTypeParameterCount() {
         return typeParameterCount;
     }
@@ -357,6 +362,7 @@ import java.util.logging.Logger;
         return destinationSet;
     }
 
+    @Override
     public Set<Class<?>> getErasedSuperTypeSet() {
         Set<Class<?>> result = new HashSet<>();
         result.add(Object.class);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/GetCommentOnFunction.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/GetCommentOnFunction.java
index 2a6ba8bf20..386798653b 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/GetCommentOnFunction.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/GetCommentOnFunction.java
@@ -21,7 +21,7 @@ import net.sourceforge.pmd.lang.java.ast.Comment;
  * The XPath query "//VariableDeclarator[contains(getCommentOn(),
  * '//password')]" will find all variables declared that are annotated with the
  * password comment.
- * 
+ *
  * @author Andy Throgmorton
  */
 public class GetCommentOnFunction implements Function {
@@ -32,6 +32,7 @@ public class GetCommentOnFunction implements Function {
                 new GetCommentOnFunction());
     }
 
+    @Override
     public Object call(Context context, List args) throws FunctionCallException {
         if (!args.isEmpty()) {
             return Boolean.FALSE;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/TypeOfFunction.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/TypeOfFunction.java
index b313674ba5..2fe6167146 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/TypeOfFunction.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/xpath/TypeOfFunction.java
@@ -30,9 +30,10 @@ public class TypeOfFunction implements Function {
                 new TypeOfFunction());
     }
 
+    @Override
     public Object call(Context context, List args) throws FunctionCallException {
         nagDeprecatedFunction();
-        
+
         String nodeTypeName = null;
         String fullTypeName = null;
         String shortTypeName = null;
@@ -85,7 +86,7 @@ public class TypeOfFunction implements Function {
      */
     public static boolean typeof(Node n, String nodeTypeName, String fullTypeName, String shortTypeName) {
         nagDeprecatedFunction();
-        
+
         if (n instanceof TypeNode) {
             Class<?> type = ((TypeNode) n).getType();
             if (type == null) {
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug650.java b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug650.java
new file mode 100644
index 0000000000..7c19450a62
--- /dev/null
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ast/GitHubBug650.java
@@ -0,0 +1,583 @@
+package com.cb4.common.utils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.Random;
+import java.util.TreeMap;
+import java.util.function.Predicate;
+
+import org.apache.commons.collections4.Transformer;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import com.cb4.common.test.JUnitTestSupport;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class MapUtilsTest extends JUnitTestSupport {
+    public MapUtilsTest() {
+        super();
+    }
+
+    @Test
+    public void testPutUniqueValuesForNoSource() {
+        @SuppressWarnings("unchecked")
+        Map<Object, Object>[] maps = new Map[] { null, Collections.emptyMap() };
+        for (Map<Object, Object> dst : maps) {
+            for (Map<?, ?> src : maps) {
+                assertSame("Mismatched result for src=" + src + ", dst=" + dst, dst, MapUtils.putUniqueValues(src, dst));
+            }
+        }
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testPutUniqueValuesWithDuplicates() {
+        Map<Object, Object> dst = new HashMap<>(Collections.singletonMap("test", getCurrentTestName()));
+        assertSame("Mismatched result for self update", dst, MapUtils.putUniqueValues(dst, dst));
+
+        for (Map.Entry<?, ?> de : dst.entrySet()) {
+            Map<?, ?> result = MapUtils.putUniqueValues(Collections.singletonMap(de.getKey(), de.getValue()), dst);
+            fail("Unexpected success for entry=" + de + ": " + result);
+        }
+    }
+
+    @Test
+    public void testPutUniqueValues() {
+        final Class<?> anchor = getClass();
+        Map<String, String> extra = new TreeMap<String, String>() {
+            // Not serializing it
+            private static final long serialVersionUID = 1L;
+
+            {
+                put("class", anchor.getSimpleName());
+                put("package", anchor.getPackage().getName());
+                put("test", getCurrentTestName());
+            }
+        };
+
+        Map<String, String> original = Collections.singletonMap("now", new Date().toString());
+        Map<String, String> dest = new HashMap<>(original);
+        // NOTE: we use a hash map on purpose so we get a map with different keys order than original
+        Map<String, String> merged = MapUtils.putUniqueValues(extra, dest);
+        assertSame("Not same destination result", dest, merged);
+        assertEquals("Mismatched merged size", extra.size() + original.size(), merged.size());
+
+        for (@SuppressWarnings("unchecked")
+        Map<String, String> m : new Map[] { original, extra }) {
+            for (Map.Entry<String, String> me : m.entrySet()) {
+                String key = me.getKey();
+                String expected = me.getValue();
+                String actual = merged.get(key);
+                assertEquals("Mismatched merged result for key=" + key, expected, actual);
+            }
+        }
+    }
+
+    @Test
+    public void testSort() {
+        Map<Integer, String> map = new HashMap<>();
+        map.put(5, "aa");
+        map.put(1, "ss");
+        map.put(3, "ww");
+
+        Map<Integer, String> actualMap = MapUtils.sort(map);
+
+        Map<Integer, String> expectedMap = new LinkedHashMap<>();
+        expectedMap.put(1, "ss");
+        expectedMap.put(3, "ww");
+        expectedMap.put(5, "aa");
+
+        assertEquals(expectedMap, actualMap);
+    }
+
+    @Test
+    public void testAddValuesToMap() {
+        Map<Integer, ArrayList<String>> map = new HashMap<>();
+        MapUtils.addValueToMapList(map, 5, "aa");
+        assertTrue("Missing '5' key", map.containsKey(5));
+        assertTrue("Missing 'aa' sub-key", map.get(5).contains("aa"));
+
+        MapUtils.addValueToMapList(map, 5, "bb");
+        assertTrue("Missing 2nd 'aa' sub-key", map.get(5).contains("aa"));
+        assertTrue("Missing 'bb' sub-key", map.get(5).contains("bb"));
+        MapUtils.addValueToMapList(map, 1, "aa");
+        assertTrue("Missing 'aa' sub-key of '1'", map.get(1).contains("aa"));
+    }
+
+    @Test
+    public void testSortKeys() {
+        Map<Integer, String> map = new HashMap<>();
+        map.put(5, "aa");
+        map.put(1, "ss");
+        map.put(3, "ww");
+
+        Map<Integer, String> actualMap = MapUtils.sort(map);
+        Map<Integer, String> expectedMap = new LinkedHashMap<>();
+        expectedMap.put(1, "ss");
+        expectedMap.put(3, "ww");
+        expectedMap.put(5, "aa");
+
+        assertEquals(expectedMap, actualMap);
+    }
+
+    @Test
+    public void testValuesSort() {
+        Map<Integer, String> map = new HashMap<>();
+        map.put(5, "aa");
+        map.put(1, "ss");
+        map.put(3, "ww");
+
+        Map<Integer, String> actualMap = MapUtils.sort(map);
+
+        Map<Integer, String> expectedMap = new LinkedHashMap<>();
+        expectedMap.put(5, "aa");
+        expectedMap.put(1, "ss");
+        expectedMap.put(3, "ww");
+
+        assertEquals(expectedMap, actualMap);
+    }
+
+    @Test
+    public void testRandomSortByValue() {
+        Random random = new Random(System.currentTimeMillis());
+        Map<String, Integer> testMap = new HashMap<>(1000);
+        for (int i = 0; i < 1000; ++i) {
+            testMap.put("SomeString" + random.nextInt(), random.nextInt());
+        }
+
+        testMap = MapUtils.sortByValues(testMap);
+        assertEquals(1000, testMap.size());
+
+        Integer previous = null;
+        for (Map.Entry<String, Integer> entry : testMap.entrySet()) {
+            assertNotNull(entry.getValue());
+            if (previous != null) {
+                assertTrue(entry.getValue() >= previous);
+            }
+            previous = entry.getValue();
+        }
+    }
+
+    @Test
+    public void testByKeyComparator() {
+        Map<String, Object> original = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER) {
+            // not serializing it
+            private static final long serialVersionUID = 1L;
+
+            {
+                Class<?> anchor = getCurrentTestClass();
+                put("class", anchor);
+                put("package", anchor.getPackage());
+                put("method", getCurrentTestName());
+                put("now", new Date());
+                put("nanos", Long.valueOf(System.nanoTime()));
+                put("pi", Math.PI);
+            }
+        };
+        List<Map.Entry<String, Object>> expected = new ArrayList<>(original.entrySet());
+
+        Map<String, Object> hashed = new HashMap<>(original);
+        List<Map.Entry<String, Object>> actual = new ArrayList<>(hashed.entrySet());
+        Comparator<Map.Entry<String, Object>> comp = MapUtils.byKeyComparator(String.CASE_INSENSITIVE_ORDER);
+        Collections.sort(actual, comp);
+
+        assertListEquals(getCurrentTestName(), expected, actual);
+    }
+
+    @Test
+    public void testFlip() {
+        Map<String, Long> src = new TreeMap<String, Long>() {
+            private static final long serialVersionUID = -3686693573082540693L;
+
+            {
+                put("sysTime", Long.valueOf(7365L));
+                put("nanoTime", Long.valueOf(3777347L));
+            }
+        };
+
+        Map<Number, CharSequence> dst = MapUtils.flip(false, src, new HashMap<Number, CharSequence>(src.size()));
+        assertEquals("Mismatched size", src.size(), dst.size());
+        for (Map.Entry<String, Long> se : src.entrySet()) {
+            String expected = se.getKey();
+            Long value = se.getValue();
+            CharSequence actual = dst.remove(value);
+            assertSame("Mismatched key for value=" + value, expected, actual);
+        }
+    }
+
+    @Test
+    public void testFlipNullOrEmpty() {
+        Map<Object, Object> dst = Collections.unmodifiableMap(new HashMap<>());
+        assertSame("Mismatached instance for null source", dst, MapUtils.flip(false, null, dst));
+        assertSame("Mismatached instance for empty source", dst, MapUtils.flip(false, Collections.emptyMap(), dst));
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testFlipOnDuplicateKeys() {
+        Map<String, String> map = new HashMap<>();
+        map.put("testName1", getCurrentTestName());
+        map.put("testName2", getCurrentTestName());
+
+        Map<String, String> flipped = MapUtils.flip(false, map, new TreeMap<String, String>());
+        fail("Unexpected success: " + flipped);
+    }
+
+    @Test
+    public void testGetMandatoryValue() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("A", 1);
+        map.put("B", 2);
+
+        for (Map.Entry<String, ?> me : map.entrySet()) {
+            String key = me.getKey();
+            Object expected = me.getValue();
+            Object actual = MapUtils.getMandatoryValue(map, key);
+            assertSame("Mismatched mandatory value instance for key=" + key, expected, actual);
+        }
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testGetMandatoryValueWithoutValue() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("A", 1);
+        map.put("B", 2);
+
+        Object mandatoryValue = MapUtils.getMandatoryValue(map, getCurrentTestName());
+        fail("Unexpected success: " + mandatoryValue);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testGetMandatoryValueWithEmptyMap() {
+        Map<String, Object> map = new HashMap<>();
+
+        Object mandatoryValue = MapUtils.getMandatoryValue(map, getCurrentTestName());
+        fail("Unexpected success: " + mandatoryValue);
+    }
+
+    @Test
+    public void testGetMandatoryIntValue() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("A", 1);
+        map.put("B", "2");
+
+        int mandatoryIntValueA = MapUtils.getMandatoryIntValue(map, "A");
+        assertEquals("Mismatched value for the 'A' key", 1, mandatoryIntValueA);
+        int mandatoryIntValueB = MapUtils.getMandatoryIntValue(map, "B");
+        assertEquals("Mismatched value for the 'B' key", 2, mandatoryIntValueB);
+    }
+
+    @Test
+    public void testGetMandatoryDoubleValue() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("A", 1.2);
+        map.put("B", "2.2");
+
+        double mandatoryIntValueA = MapUtils.getMandatoryDoubleValue(map, "A");
+        assertEquals("Mismatched value for the 'A' key", 1.2, mandatoryIntValueA, 0);
+        double mandatoryIntValueB = MapUtils.getMandatoryDoubleValue(map, "B");
+        assertEquals("Mismatched value for the 'B' key", 2.2, mandatoryIntValueB, 0);
+    }
+
+    @Test
+    public void testNestedLen() {
+        Map<String, Collection<Object>> mapOfColls = new HashMap<>();
+
+        Collection<Object> col1 = new ArrayList<>();
+        col1.add(1L);
+        col1.add(2L);
+
+        Collection<Object> col2 = new LinkedList<>();
+        col2.add(1L);
+        col2.add(2L);
+        col2.add(3L);
+
+        mapOfColls.put("a", col1);
+        mapOfColls.put("b", col2);
+        assertEquals("Mismatched nested entries count", 5, MapUtils.nestedLen(mapOfColls));
+    }
+
+    @Test
+    public void testEmptyNestedLen() {
+        assertEquals("Mismatched empty nested entries count", 0, MapUtils.nestedLen(new HashMap<String, Collection<Object>>()));
+    }
+
+    @Test
+    public void testNullNestedLen() {
+        assertEquals("Mismatched null 0 nested entries count", 0, MapUtils.nestedLen((Map<String, Collection<Object>>) null));
+    }
+
+    @Test
+    public void testClearNullOrEmptyMap() {
+        assertNull("Unexpected null map clear result", MapUtils.clear(null));
+
+        @SuppressWarnings("unchecked")
+        Map<String, String> expected = Mockito.mock(Map.class);
+        Mockito.when(expected.size()).thenReturn(NumberUtils.INTEGER_ZERO);
+        Mockito.when(expected.isEmpty()).thenReturn(Boolean.TRUE);
+        Mockito.when(expected.toString()).thenReturn(getCurrentTestName());
+        Mockito.doAnswer(new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                fail("Unexpected clear method invocation");
+                return null;
+            }
+        }).when(expected).clear();
+
+        Map<String, String> actual = MapUtils.clear(expected);
+        assertSame("Mismatched cleared result reference", expected, actual);
+    }
+
+    @Test
+    public void testClearNonEmptyMap() {
+        Map<String, String> expected = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER) {
+            // Not serializing it
+            private static final long serialVersionUID = 1L;
+
+            {
+                put("testName", getCurrentTestName());
+                put("className", SafeUtils.safeShortName(getCurrentTestClass()));
+            }
+        };
+        Map<String, String> actual = MapUtils.clear(expected);
+        assertSame("Mismatched cleared result reference", expected, actual);
+        assertTrue("Map not cleared", actual.isEmpty());
+        assertEquals("Size not zeroed", 0, actual.size());
+    }
+
+    @Test
+    public void testClearAndReplace() {
+        for (@SuppressWarnings("unchecked")
+            Map<String, String> expected : new Map[] { null, Collections.emptyMap(), new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER) {
+                // Not serializing it
+                private static final long serialVersionUID = 1L;
+
+                {
+                    put("testName", getCurrentTestName());
+                    put("className", SafeUtils.safeShortName(getCurrentTestClass()));
+                }
+            } }) {
+            Map<String, String> original = new HashMap<String, String>() {
+                // Not serializing it
+                private static final long serialVersionUID = 1L;
+
+                {
+                    put("expected", Objects.toString(expected));
+                }
+            };
+
+            Map<String, String> actual = MapUtils.clearAndReplace(original, expected);
+            assertTrue("Original not cleared: " + original, original.isEmpty());
+            assertSame("Mismatched replacement", expected, actual);
+        }
+    }
+
+    @Test
+    public void testKeyExtractor() {
+        Map<String, Object> map = new TreeMap<String, Object>() {
+            // Not serializing it
+            private static final long serialVersionUID = 1L;
+
+            {
+                put("testName", getCurrentTestName());
+                put("className", getCurrentTestClass());
+            }
+        };
+
+        Transformer<Map.Entry<String, Object>, String> keyExtractor = MapUtils.keyExtractor();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            String expected = entry.getKey();
+            String actual = keyExtractor.transform(entry);
+            assertSame(expected, actual);
+        }
+    }
+
+    @Test
+    public void testValueExtractor() {
+        Map<String, Object> map = new TreeMap<String, Object>() {
+            // Not serializing it
+            private static final long serialVersionUID = 1L;
+
+            {
+                put("testName", getCurrentTestName());
+                put("className", getCurrentTestClass());
+            }
+        };
+
+        Transformer<Map.Entry<String, Object>, Object> valueExtractor = MapUtils.valueExtractor();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            String key = entry.getKey();
+            Object expected = entry.getValue();
+            Object actual = valueExtractor.transform(entry);
+            assertSame(key, expected, actual);
+        }
+    }
+
+    @Test
+    public void testFilterByKey() {
+        String expectedKey = "testName";
+        Map<String, Object> map = new HashMap<String, Object>() {
+            // Not serializing it
+            private static final long serialVersionUID = 1L;
+
+            {
+                put(expectedKey, getCurrentTestName());
+                put("className", getCurrentTestClass());
+            }
+        };
+
+        Map.Entry<String, Object> expEntry = Pair.of(expectedKey, map.get(expectedKey));
+        NavigableMap<String, Object> actual = MapUtils.filterByKey(map, k -> expectedKey.equals(k), TreeMap::new);
+        assertMapEquals(getCurrentTestName(), Collections.singletonMap(expEntry.getKey(), expEntry.getValue()), actual);
+
+        Map.Entry<String, Object> actEntry = SafeUtils.head(actual.entrySet());
+        assertSame("Mismatched key instance", expEntry.getKey(), actEntry.getKey());
+        assertSame("Mismatched value instance", expEntry.getValue(), actEntry.getValue());
+    }
+
+    @Test
+    public void testFilterByEntry() {
+        Map<Integer, Integer> map = new HashMap<>();
+        for (int index = 1; index <= Byte.SIZE; index++) {
+            map.put(index, index & 0x01);
+        }
+
+        Map<Integer, Integer> expected = new HashMap<>();
+        Predicate<Map.Entry<Integer, Integer>> selector = e -> (e.getKey() > 3) && (e.getKey() <= 7) && ((e.getValue() & 0x01) == 0);
+        map.forEach((key, value) -> {
+            if (selector.test(Pair.of(key, value))) {
+                expected.put(key, value);
+            }
+        });
+
+        Map<Integer, Integer> actual = MapUtils.filterByEntry(map, selector, TreeMap::new);
+        assertMapEquals(getCurrentTestName(), expected, actual);
+    }
+
+    @Test
+    public void testEqualPropertiesCaseSensitiveName() {
+        Properties p1 = new Properties() {
+            // Not serializing it
+            private static final long serialVersionUID = 1L;
+
+            {
+                setProperty(getCurrentTestName(), getCurrentTestName());
+
+                Class<?> c = getCurrentTestClass();
+                setProperty(c.getSimpleName(), c.getSimpleName());
+
+                Package pkg = c.getPackage();
+                setProperty(pkg.getName(), pkg.getName());
+            }
+        };
+
+        Properties p2 = new Properties();
+        for (String name : p1.stringPropertyNames()) {
+            String key = shuffleCase(name);
+            String value = p1.getProperty(name);
+            p2.setProperty(key, value);
+        }
+
+        assertFalse("Unexpected case sensitive equality", MapUtils.equalProperties(p1, p2));
+        assertTrue("Non-equal case insensitive result", MapUtils.equalProperties(p1, p2, String.CASE_INSENSITIVE_ORDER, Comparator.naturalOrder()));
+    }
+
+    @Test
+    public void testEqualPropertiesCaseSensitiveValue() {
+        Properties p1 = new Properties() {
+            // Not serializing it
+            private static final long serialVersionUID = 1L;
+
+            {
+                setProperty(getCurrentTestName(), getCurrentTestName());
+
+                Class<?> c = getCurrentTestClass();
+                setProperty(c.getSimpleName(), c.getSimpleName());
+
+                Package pkg = c.getPackage();
+                setProperty(pkg.getName(), pkg.getName());
+            }
+        };
+
+        Properties p2 = new Properties();
+        for (String key : p1.stringPropertyNames()) {
+            String value = p1.getProperty(key);
+            p2.setProperty(key, shuffleCase(value));
+        }
+
+        assertFalse("Unexpected case sensitive equality", MapUtils.equalProperties(p1, p2));
+        assertTrue("Non-equal case insensitive result", MapUtils.equalProperties(p1, p2, Comparator.naturalOrder(), String.CASE_INSENSITIVE_ORDER));
+    }
+
+    @Test
+    public void testSubMapWithEmptyMaps() {
+        Map<String, Integer> m1 = new HashMap<>();
+        m1.put(getCurrentTestName(), 1);
+        Collection<Map<String, Integer>> empties = Arrays.asList(null, Collections.emptyMap());
+        for (Map<String, Integer> empty : empties) {
+            assertTrue("empty is submap of any map", MapUtils.isSubMap(m1, empty));
+            assertFalse("nothing is a submap of empty", MapUtils.isSubMap(empty, m1));
+            assertTrue("empty is submap of empty", MapUtils.isSubMap(empty, empty));
+        }
+    }
+
+    @Test
+    public void testSubMapWithSubs() {
+        Map<String, Integer> m1 = new HashMap<>();
+        m1.put(getCurrentTestName(), 1);
+        Map<String, Integer> m2 = new HashMap<>();
+        m2.put(getCurrentTestName(), 1);
+
+        assertTrue("equal maps are sub maps", MapUtils.isSubMap(m1, m2));
+        assertTrue("equal maps are sub maps", MapUtils.isSubMap(m2, m1));
+        m1.put(JAVA_SUFFIX, 2);
+        assertTrue("strictly sub", MapUtils.isSubMap(m1, m2));
+        assertFalse("non sub", MapUtils.isSubMap(m2, m1));
+
+        int differentValueForKey = m1.get(JAVA_SUFFIX) + 1;
+        m2.put(JAVA_SUFFIX, differentValueForKey);
+
+        assertFalse("non sub", MapUtils.isSubMap(m1, m2));
+        assertFalse("non sub", MapUtils.isSubMap(m2, m1));
+    }
+
+    @Test
+    public void testGetSubMap() {
+        Map<String, Integer> hashMap = new HashMap<>();
+        hashMap.put(getCurrentTestName(), 1);
+        hashMap.put(JAVA_SUFFIX, 2);
+        hashMap.put(JAVA_TYPE, 3);
+        NavigableMap<String, Integer> expectedSingletonMap = MapUtils.getSubMap(hashMap, e -> e.getValue() > 2, TreeMap::new);
+        assertEquals(Collections.singletonMap(JAVA_TYPE, 3), expectedSingletonMap);
+
+        Map<String, Integer> treeMap = new TreeMap<>(hashMap);
+
+        Map<String, Integer> expectedEmpty = MapUtils.getSubMap(treeMap, e -> e.getValue() > 3, HashMap::new);
+        assertEquals(Collections.emptyMap(), expectedEmpty);
+
+        Map<String, Integer> expectedAllEntries = MapUtils.getSubMap(treeMap, e -> e.getValue() < 10, HashMap::new);
+        assertEquals(treeMap, expectedAllEntries);
+    }
+
+    @Test
+    public void testGetSubMapEmpty() {
+        assertEquals(Collections.emptyMap(), MapUtils.getSubMap(Collections.emptyMap(), e -> true, TreeMap::new));
+        assertEquals(Collections.emptyMap(), MapUtils.getSubMap(null, e -> true, HashMap::new));
+    }
+}
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Handler.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Handler.java
index 37de975367..bfbdd95fae 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Handler.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Handler.java
@@ -28,6 +28,7 @@ public class Ecmascript3Handler extends AbstractLanguageVersionHandler {
         return new DefaultASTXPathHandler();
     }
 
+    @Override
     public RuleViolationFactory getRuleViolationFactory() {
         return EcmascriptRuleViolationFactory.INSTANCE;
     }
@@ -37,6 +38,7 @@ public class Ecmascript3Handler extends AbstractLanguageVersionHandler {
         return new EcmascriptParserOptions();
     }
 
+    @Override
     public Parser getParser(ParserOptions parserOptions) {
         return new Ecmascript3Parser(parserOptions);
     }
@@ -44,6 +46,7 @@ public class Ecmascript3Handler extends AbstractLanguageVersionHandler {
     @Override
     public VisitorStarter getDumpFacade(final Writer writer, final String prefix, final boolean recurse) {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new DumpFacade().initializeWith(writer, prefix, recurse, (EcmascriptNode<?>) rootNode);
             }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Parser.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Parser.java
index 5b3efb7eca..bd5fbbdf96 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Parser.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/Ecmascript3Parser.java
@@ -31,14 +31,17 @@ public class Ecmascript3Parser extends AbstractParser {
         return new Ecmascript5TokenManager(source);
     }
 
+    @Override
     public boolean canParse() {
         return true;
     }
 
+    @Override
     public Node parse(String fileName, Reader source) throws ParseException {
         return ecmascriptParser.parse(source);
     }
 
+    @Override
     public Map<Integer, String> getSuppressMap() {
         return ecmascriptParser.getSuppressMap();
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehension.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehension.java
index 634825d4dc..42b9740ec1 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehension.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehension.java
@@ -14,6 +14,7 @@ public class ASTArrayComprehension extends AbstractEcmascriptNode<ArrayComprehen
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehensionLoop.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehensionLoop.java
index a19e5920b2..6ede0d83a0 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehensionLoop.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayComprehensionLoop.java
@@ -15,6 +15,7 @@ public class ASTArrayComprehensionLoop extends AbstractEcmascriptNode<ArrayCompr
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayLiteral.java
index 24edf8904c..0365dce7b2 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTArrayLiteral.java
@@ -17,18 +17,22 @@ public class ASTArrayLiteral extends AbstractEcmascriptNode<ArrayLiteral>
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
 
+    @Override
     public boolean isDestructuring() {
         return node.isDestructuring();
     }
 
+    @Override
     public boolean isTrailingComma() {
         return trailingComma;
     }
 
+    @Override
     public void setTrailingComma(boolean trailingComma) {
         this.trailingComma = trailingComma;
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoop.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoop.java
index 8f2d1c095e..b66a875ced 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoop.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoop.java
@@ -14,6 +14,7 @@ public class ASTForInLoop extends AbstractEcmascriptNode<ForInLoop> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForLoop.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForLoop.java
index c2ee8cd4a9..5a19df4006 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForLoop.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForLoop.java
@@ -14,6 +14,7 @@ public class ASTForLoop extends AbstractEcmascriptNode<ForLoop> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionCall.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionCall.java
index 508987f83d..255203274c 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionCall.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionCall.java
@@ -14,6 +14,7 @@ public class ASTFunctionCall extends AbstractEcmascriptNode<FunctionCall> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java
index 6c7333efcd..5d1db39db5 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java
@@ -15,6 +15,7 @@ public class ASTFunctionNode extends AbstractEcmascriptNode<FunctionNode> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTIfStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTIfStatement.java
index d5f6f61c08..60a0d69fc9 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTIfStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTIfStatement.java
@@ -14,6 +14,7 @@ public class ASTIfStatement extends AbstractEcmascriptNode<IfStatement> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTInfixExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTInfixExpression.java
index 7c1ae88805..bbf8842263 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTInfixExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTInfixExpression.java
@@ -14,6 +14,7 @@ public class ASTInfixExpression extends AbstractInfixEcmascriptNode<InfixExpress
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabel.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabel.java
index 876f4c25df..6cd6466a67 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabel.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabel.java
@@ -15,6 +15,7 @@ public class ASTLabel extends AbstractEcmascriptNode<Label> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabeledStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabeledStatement.java
index f8987ad6d7..953628dd56 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabeledStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLabeledStatement.java
@@ -14,6 +14,7 @@ public class ASTLabeledStatement extends AbstractEcmascriptNode<LabeledStatement
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLetNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLetNode.java
index bdc003a01a..eb5a849b35 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLetNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTLetNode.java
@@ -14,6 +14,7 @@ public class ASTLetNode extends AbstractEcmascriptNode<LetNode> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNewExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNewExpression.java
index f77bf715e9..ca8b03eb91 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNewExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNewExpression.java
@@ -14,6 +14,7 @@ public class ASTNewExpression extends AbstractEcmascriptNode<NewExpression> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNumberLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNumberLiteral.java
index 9adcfd447d..02e77d3fbe 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNumberLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTNumberLiteral.java
@@ -15,6 +15,7 @@ public class ASTNumberLiteral extends AbstractEcmascriptNode<NumberLiteral> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectLiteral.java
index beb0687a08..af98dfb8ac 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectLiteral.java
@@ -17,6 +17,7 @@ public class ASTObjectLiteral extends AbstractEcmascriptNode<ObjectLiteral>
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -25,14 +26,17 @@ public class ASTObjectLiteral extends AbstractEcmascriptNode<ObjectLiteral>
         return (ASTObjectProperty) jjtGetChild(index);
     }
 
+    @Override
     public boolean isDestructuring() {
         return node.isDestructuring();
     }
 
+    @Override
     public boolean isTrailingComma() {
         return trailingComma;
     }
 
+    @Override
     public void setTrailingComma(boolean trailingComma) {
         this.trailingComma = trailingComma;
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java
index 96bae791c9..86a7bf8b47 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java
@@ -14,6 +14,7 @@ public class ASTObjectProperty extends AbstractInfixEcmascriptNode<ObjectPropert
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTParenthesizedExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTParenthesizedExpression.java
index 6ec5949bdd..170f0a9c7b 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTParenthesizedExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTParenthesizedExpression.java
@@ -14,6 +14,7 @@ public class ASTParenthesizedExpression extends AbstractEcmascriptNode<Parenthes
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTPropertyGet.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTPropertyGet.java
index 8334e61e28..cf8b3a5570 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTPropertyGet.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTPropertyGet.java
@@ -15,6 +15,7 @@ public class ASTPropertyGet extends AbstractInfixEcmascriptNode<PropertyGet> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTRegExpLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTRegExpLiteral.java
index 30dd9fa1dd..485537794e 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTRegExpLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTRegExpLiteral.java
@@ -15,6 +15,7 @@ public class ASTRegExpLiteral extends AbstractEcmascriptNode<RegExpLiteral> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTReturnStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTReturnStatement.java
index 58a5354e67..78dcbf1f9e 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTReturnStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTReturnStatement.java
@@ -14,6 +14,7 @@ public class ASTReturnStatement extends AbstractEcmascriptNode<ReturnStatement>
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTScope.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTScope.java
index e50fe23e8e..54dd0a5bc3 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTScope.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTScope.java
@@ -14,6 +14,7 @@ public class ASTScope extends AbstractEcmascriptNode<Scope> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTStringLiteral.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTStringLiteral.java
index bafcabe842..2d10e25d86 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTStringLiteral.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTStringLiteral.java
@@ -15,6 +15,7 @@ public class ASTStringLiteral extends AbstractEcmascriptNode<StringLiteral> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchCase.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchCase.java
index 395e357a0b..b2bf1b22e5 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchCase.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchCase.java
@@ -14,6 +14,7 @@ public class ASTSwitchCase extends AbstractEcmascriptNode<SwitchCase> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchStatement.java
index f2e676a199..330cd46717 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTSwitchStatement.java
@@ -14,6 +14,7 @@ public class ASTSwitchStatement extends AbstractEcmascriptNode<SwitchStatement>
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTThrowStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTThrowStatement.java
index dc61d1d040..eb380fbb17 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTThrowStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTThrowStatement.java
@@ -14,6 +14,7 @@ public class ASTThrowStatement extends AbstractEcmascriptNode<ThrowStatement> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatement.java
index d8d7c175d6..fb923cb908 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatement.java
@@ -14,6 +14,7 @@ public class ASTTryStatement extends AbstractEcmascriptNode<TryStatement> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclaration.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclaration.java
index 98236f0e38..966894d76f 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclaration.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclaration.java
@@ -18,6 +18,7 @@ public class ASTVariableDeclaration extends AbstractEcmascriptNode<VariableDecla
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableInitializer.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableInitializer.java
index c838c4aed6..e6a52837a8 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableInitializer.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableInitializer.java
@@ -14,6 +14,7 @@ public class ASTVariableInitializer extends AbstractEcmascriptNode<VariableIniti
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -30,6 +31,7 @@ public class ASTVariableInitializer extends AbstractEcmascriptNode<VariableIniti
         }
     }
 
+    @Override
     public boolean isDestructuring() {
         return node.isDestructuring();
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWhileLoop.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWhileLoop.java
index 8dd70cd0dc..feeb0e3ad0 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWhileLoop.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWhileLoop.java
@@ -14,6 +14,7 @@ public class ASTWhileLoop extends AbstractEcmascriptNode<WhileLoop> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWithStatement.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWithStatement.java
index 0b2e3f22e1..539f63ddc7 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWithStatement.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTWithStatement.java
@@ -14,6 +14,7 @@ public class ASTWithStatement extends AbstractEcmascriptNode<WithStatement> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlDotQuery.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlDotQuery.java
index bf1379c261..0d20ad94a7 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlDotQuery.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlDotQuery.java
@@ -14,6 +14,7 @@ public class ASTXmlDotQuery extends AbstractInfixEcmascriptNode<XmlDotQuery> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlExpression.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlExpression.java
index 69f3b143f3..0e851fbe7e 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlExpression.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlExpression.java
@@ -14,6 +14,7 @@ public class ASTXmlExpression extends AbstractEcmascriptNode<XmlExpression> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlMemberGet.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlMemberGet.java
index 40e5efff43..70b2a81001 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlMemberGet.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlMemberGet.java
@@ -14,6 +14,7 @@ public class ASTXmlMemberGet extends AbstractInfixEcmascriptNode<XmlMemberGet> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlString.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlString.java
index 2a844c1abd..fd17127064 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlString.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTXmlString.java
@@ -15,6 +15,7 @@ public class ASTXmlString extends AbstractEcmascriptNode<XmlString> {
     /**
      * Accept the visitor.
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
index 1ac8078adf..671b83b2e7 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/AbstractEcmascriptNode.java
@@ -36,6 +36,7 @@ public abstract class AbstractEcmascriptNode<T extends AstNode> extends Abstract
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(EcmascriptParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -43,6 +44,7 @@ public abstract class AbstractEcmascriptNode<T extends AstNode> extends Abstract
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object childrenAccept(EcmascriptParserVisitor visitor, Object data) {
         if (children != null) {
             for (int i = 0; i < children.length; ++i) {
@@ -56,14 +58,17 @@ public abstract class AbstractEcmascriptNode<T extends AstNode> extends Abstract
         return data;
     }
 
+    @Override
     public T getNode() {
         return node;
     }
 
+    @Override
     public String getJsDoc() {
         return node.getJsDoc();
     }
 
+    @Override
     public boolean hasSideEffects() {
         return node.hasSideEffects();
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptNode.java
index d346ebeb27..cf8ea8c1bb 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptNode.java
@@ -29,7 +29,7 @@ public interface EcmascriptNode<T extends AstNode> extends Node {
      * Get the JsDoc associated with the given node. If there is no JsDoc on
      * this node, it may be associated with a parent node, on more
      * representative of the entire expression containing this node.
-     * 
+     *
      * @return The JsDoc comment for the node, may be <code>null</code>.
      */
     String getJsDoc();
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitorAdapter.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitorAdapter.java
index b3cf8c6fc9..50cf23cff5 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitorAdapter.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserVisitorAdapter.java
@@ -6,203 +6,253 @@ package net.sourceforge.pmd.lang.ecmascript.ast;
 
 public class EcmascriptParserVisitorAdapter implements EcmascriptParserVisitor {
 
+    @Override
     public Object visit(EcmascriptNode<?> node, Object data) {
         node.childrenAccept(this, data);
         return null;
     }
 
+    @Override
     public Object visit(ASTArrayComprehension node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTArrayComprehensionLoop node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTArrayLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTAssignment node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTAstRoot node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTBlock node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTBreakStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTCatchClause node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTComment node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTConditionalExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTContinueStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTDoLoop node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTElementGet node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTEmptyExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTExpressionStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTForInLoop node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTForLoop node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTFunctionCall node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTFunctionNode node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTIfStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTInfixExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTKeywordLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTLabel node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTLabeledStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTLetNode node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTName node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTNewExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTNumberLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTObjectLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTObjectProperty node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTParenthesizedExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTPropertyGet node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTRegExpLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTReturnStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTScope node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTStringLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTSwitchCase node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTSwitchStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTThrowStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTTryStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTUnaryExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTVariableDeclaration node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTVariableInitializer node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTWhileLoop node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTWithStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTXmlDotQuery node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTXmlExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTXmlMemberGet node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTXmlString node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/AbstractEcmascriptRule.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/AbstractEcmascriptRule.java
index 5b8686d4da..795ea35ad8 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/AbstractEcmascriptRule.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/AbstractEcmascriptRule.java
@@ -87,6 +87,7 @@ public abstract class AbstractEcmascriptRule extends AbstractRule
         return new EcmascriptParserOptions(this);
     }
 
+    @Override
     public void apply(List<? extends Node> nodes, RuleContext ctx) {
         visitAll(nodes, ctx);
     }
@@ -105,203 +106,253 @@ public abstract class AbstractEcmascriptRule extends AbstractRule
     // complex Rule base class instead of from relatively simple Visitor.
     //
 
+    @Override
     public Object visit(EcmascriptNode<?> node, Object data) {
         node.childrenAccept(this, data);
         return null;
     }
 
+    @Override
     public Object visit(ASTArrayComprehension node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTArrayComprehensionLoop node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTArrayLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTAssignment node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTAstRoot node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTBlock node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTBreakStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTCatchClause node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTComment node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTConditionalExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTContinueStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTDoLoop node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTElementGet node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTEmptyExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTExpressionStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTForInLoop node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTForLoop node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTFunctionCall node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTFunctionNode node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTIfStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTInfixExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTKeywordLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTLabel node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTLabeledStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTLetNode node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTName node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTNewExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTNumberLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTObjectLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTObjectProperty node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTParenthesizedExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTPropertyGet node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTRegExpLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTReturnStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTScope node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTStringLiteral node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTSwitchCase node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTSwitchStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTThrowStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTTryStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTUnaryExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTVariableDeclaration node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTVariableInitializer node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTWhileLoop node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTWithStatement node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTXmlDotQuery node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTXmlExpression node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTXmlMemberGet node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
 
+    @Override
     public Object visit(ASTXmlString node, Object data) {
         return visit((EcmascriptNode<?>) node, data);
     }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/EcmascriptRuleChainVisitor.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/EcmascriptRuleChainVisitor.java
index 1c7b5db343..12cd04b1ff 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/EcmascriptRuleChainVisitor.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/EcmascriptRuleChainVisitor.java
@@ -18,6 +18,7 @@ import net.sourceforge.pmd.lang.rule.XPathRule;
 
 public class EcmascriptRuleChainVisitor extends AbstractRuleChainVisitor {
 
+    @Override
     protected void indexNodes(List<Node> nodes, RuleContext ctx) {
         // Visit Nodes in DFS order
         Stack<Node> stack = new Stack<>();
@@ -34,6 +35,7 @@ public class EcmascriptRuleChainVisitor extends AbstractRuleChainVisitor {
         }
     }
 
+    @Override
     protected void visit(Rule rule, Node node, RuleContext ctx) {
         // Rule better either be a EcmascriptParserVisitor, or a XPathRule
         if (rule instanceof XPathRule) {
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/EcmascriptRuleViolationFactory.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/EcmascriptRuleViolationFactory.java
index 1d63e1f400..3deca0d4e3 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/EcmascriptRuleViolationFactory.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/rule/EcmascriptRuleViolationFactory.java
@@ -25,6 +25,7 @@ public final class EcmascriptRuleViolationFactory extends AbstractRuleViolationF
         return new ParametricRuleViolation<>(rule, ruleContext, (EcmascriptNode) node, message);
     }
 
+    @Override
     protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message,
             int beginLine, int endLine) {
         return null; // FIXME
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript5/Ecmascript5TokenManager.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript5/Ecmascript5TokenManager.java
index a629dbf924..bdfea305bc 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript5/Ecmascript5TokenManager.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript5/Ecmascript5TokenManager.java
@@ -18,7 +18,7 @@ public class Ecmascript5TokenManager implements TokenManager {
 
     /**
      * Creates a new Ecmascript 5 Token Manager from the given source code.
-     * 
+     *
      * @param source
      *            the source code
      */
@@ -26,6 +26,7 @@ public class Ecmascript5TokenManager implements TokenManager {
         tokenManager = new Ecmascript5ParserTokenManager(new SimpleCharStream(source));
     }
 
+    @Override
     public Object getNextToken() {
         return tokenManager.getNextToken();
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/cpd/JSPTokenizer.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/cpd/JSPTokenizer.java
index 679ec783a4..7d032e99f4 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/cpd/JSPTokenizer.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/cpd/JSPTokenizer.java
@@ -18,6 +18,7 @@ import net.sourceforge.pmd.util.IOUtil;
 
 public class JSPTokenizer implements Tokenizer {
 
+    @Override
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
         StringBuilder buffer = sourceCode.getCodeBuffer();
         LanguageVersionHandler languageVersionHandler = LanguageRegistry.getLanguage(JspLanguageModule.NAME)
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspHandler.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspHandler.java
index 094d8da62f..5965244316 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspHandler.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspHandler.java
@@ -20,7 +20,7 @@ import net.sourceforge.pmd.lang.rule.RuleViolationFactory;
 
 /**
  * Implementation of LanguageVersionHandler for the JSP parser.
- * 
+ *
  * @author pieter_van_raemdonck - Application Engineers NV/SA - www.ae.be
  */
 public class JspHandler extends AbstractLanguageVersionHandler {
@@ -30,10 +30,12 @@ public class JspHandler extends AbstractLanguageVersionHandler {
         return new DefaultASTXPathHandler();
     }
 
+    @Override
     public RuleViolationFactory getRuleViolationFactory() {
         return JspRuleViolationFactory.INSTANCE;
     }
 
+    @Override
     public Parser getParser(ParserOptions parserOptions) {
         return new JspParser(parserOptions);
     }
@@ -41,6 +43,7 @@ public class JspHandler extends AbstractLanguageVersionHandler {
     @Override
     public VisitorStarter getDumpFacade(final Writer writer, final String prefix, final boolean recurse) {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new DumpFacade().initializeWith(writer, prefix, recurse, (JspNode) rootNode);
             }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspParser.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspParser.java
index e5e74518dd..0409ca6024 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspParser.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspParser.java
@@ -30,15 +30,18 @@ public class JspParser extends AbstractParser {
         return new JspTokenManager(source);
     }
 
+    @Override
     public boolean canParse() {
         return true;
     }
 
+    @Override
     public Node parse(String fileName, Reader source) throws ParseException {
         AbstractTokenManager.setFileName(fileName);
         return new net.sourceforge.pmd.lang.jsp.ast.JspParser(new SimpleCharStream(source)).CompilationUnit();
     }
 
+    @Override
     public Map<Integer, String> getSuppressMap() {
         return new HashMap<>(); // FIXME
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspTokenManager.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspTokenManager.java
index 3de636041a..5d19e5d8a0 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspTokenManager.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspTokenManager.java
@@ -20,10 +20,12 @@ public class JspTokenManager implements TokenManager {
         tokenManager = new JspParserTokenManager(new JavaCharStream(source));
     }
 
+    @Override
     public Object getNextToken() {
         return tokenManager.getNextToken();
     }
 
+    @Override
     public void setFileName(String fileName) {
         JspParserTokenManager.setFileName(fileName);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTAttributeValue.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTAttributeValue.java
index 27b842bd60..8c56e9bfd5 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTAttributeValue.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTAttributeValue.java
@@ -17,6 +17,7 @@ public class ASTAttributeValue extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCData.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCData.java
index c10ff286d1..00e04452d1 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCData.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCData.java
@@ -17,6 +17,7 @@ public class ASTCData extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCommentTag.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCommentTag.java
index c26c74d943..2dbc4f0f61 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCommentTag.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCommentTag.java
@@ -17,6 +17,7 @@ public class ASTCommentTag extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCompilationUnit.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCompilationUnit.java
index 35ac45872d..dd4b411f4a 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCompilationUnit.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTCompilationUnit.java
@@ -19,6 +19,7 @@ public class ASTCompilationUnit extends AbstractJspNode implements RootNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTContent.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTContent.java
index 7202cae479..5a17814f1c 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTContent.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTContent.java
@@ -17,6 +17,7 @@ public class ASTContent extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTElExpression.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTElExpression.java
index 7f082d35c6..9b41130210 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTElExpression.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTElExpression.java
@@ -17,6 +17,7 @@ public class ASTElExpression extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspComment.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspComment.java
index 9b36e14fba..8d7c7b3d75 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspComment.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspComment.java
@@ -17,6 +17,7 @@ public class ASTJspComment extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDeclaration.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDeclaration.java
index fe2eb47940..65814f382e 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDeclaration.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDeclaration.java
@@ -17,6 +17,7 @@ public class ASTJspDeclaration extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDeclarations.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDeclarations.java
index 885b2e8847..afc12ee48a 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDeclarations.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDeclarations.java
@@ -17,6 +17,7 @@ public class ASTJspDeclarations extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDocument.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDocument.java
index f6c8a4459c..9826676aab 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDocument.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspDocument.java
@@ -17,6 +17,7 @@ public class ASTJspDocument extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspExpression.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspExpression.java
index fb3436515b..6a9f41ae8d 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspExpression.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspExpression.java
@@ -17,6 +17,7 @@ public class ASTJspExpression extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspExpressionInAttribute.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspExpressionInAttribute.java
index 1b789b7937..8a1f88f9c4 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspExpressionInAttribute.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspExpressionInAttribute.java
@@ -17,6 +17,7 @@ public class ASTJspExpressionInAttribute extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspScriptlet.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspScriptlet.java
index 31517840a4..8fec3d9414 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspScriptlet.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTJspScriptlet.java
@@ -17,6 +17,7 @@ public class ASTJspScriptlet extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTText.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTText.java
index b37f582741..56a4654e01 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTText.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTText.java
@@ -17,6 +17,7 @@ public class ASTText extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTUnparsedText.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTUnparsedText.java
index b1a7f384d4..07b5bff083 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTUnparsedText.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTUnparsedText.java
@@ -17,6 +17,7 @@ public class ASTUnparsedText extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTValueBinding.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTValueBinding.java
index 00553f1ff6..d7ddf39a4d 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTValueBinding.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/ASTValueBinding.java
@@ -17,6 +17,7 @@ public class ASTValueBinding extends AbstractJspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNode.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNode.java
index 6a9a07e7b5..97c1d3de89 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNode.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/AbstractJspNode.java
@@ -19,6 +19,7 @@ public class AbstractJspNode extends AbstractNode implements JspNode {
         this.parser = parser;
     }
 
+    @Override
     public void jjtOpen() {
         if (beginLine == -1 && parser.token.next != null) {
             beginLine = parser.token.next.beginLine;
@@ -26,6 +27,7 @@ public class AbstractJspNode extends AbstractNode implements JspNode {
         }
     }
 
+    @Override
     public void jjtClose() {
         if (beginLine == -1 && (children == null || children.length == 0)) {
             beginColumn = parser.token.beginColumn;
@@ -40,6 +42,7 @@ public class AbstractJspNode extends AbstractNode implements JspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(JspParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -47,6 +50,7 @@ public class AbstractJspNode extends AbstractNode implements JspNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object childrenAccept(JspParserVisitor visitor, Object data) {
         if (children != null) {
             for (int i = 0; i < children.length; ++i) {
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/JspParserVisitorAdapter.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/JspParserVisitorAdapter.java
index 3a83294ab3..a167ecd04a 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/JspParserVisitorAdapter.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/JspParserVisitorAdapter.java
@@ -6,95 +6,118 @@ package net.sourceforge.pmd.lang.jsp.ast;
 
 public class JspParserVisitorAdapter implements JspParserVisitor {
 
+    @Override
     public Object visit(JspNode node, Object data) {
         node.childrenAccept(this, data);
         return null;
     }
 
+    @Override
     public Object visit(ASTCompilationUnit node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTContent node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspDirective node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspDirectiveAttribute node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspScriptlet node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspExpression node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspDeclaration node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspComment node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTText node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTUnparsedText node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTElExpression node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTValueBinding node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCData node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTElement node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAttribute node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAttributeValue node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspExpressionInAttribute node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCommentTag node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDeclaration node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDoctypeDeclaration node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDoctypeExternalId node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTHtmlScript node, Object data) {
         return visit((JspNode) node, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/OpenTagRegister.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/OpenTagRegister.java
index 8a4e604374..4b76e95e96 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/OpenTagRegister.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/OpenTagRegister.java
@@ -15,9 +15,9 @@ import net.sourceforge.pmd.util.StringUtil;
  * tag list and it will mark the first tag named 'x' as closed. If other tags
  * have been opened after 'x' ( &lt;x&gt; &lt;y&gt; &lt;z&gt; &lt;/x&gt;) it
  * will mark y and z as unclosed.
- * 
+ *
  * @author Victor Bucutea
- * 
+ *
  */
 public class OpenTagRegister {
 
@@ -32,7 +32,7 @@ public class OpenTagRegister {
     }
 
     /**
-     * 
+     *
      * @param closingTagName
      * @return true if a matching tag was found. False if no tag with this name
      *         was ever opened ( or registered )
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/StartAndEndTagMismatchException.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/StartAndEndTagMismatchException.java
index de1320211b..86c9131d9c 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/StartAndEndTagMismatchException.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/StartAndEndTagMismatchException.java
@@ -73,7 +73,7 @@ public class StartAndEndTagMismatchException extends SyntaxErrorException {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Throwable#getMessage()
      */
     @Override
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/SyntaxErrorException.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/SyntaxErrorException.java
index 1e2a60eed4..f886b882dc 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/SyntaxErrorException.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/ast/SyntaxErrorException.java
@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.jsp.ast;
 
 /**
  * Exception indicating that a syntactic error has been found.
- * 
+ *
  * @author Pieter_Van_Raemdonck
  * @since Created on 11-jan-2006
  */
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/AbstractJspRule.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/AbstractJspRule.java
index f4eae5a37a..350cc3313a 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/AbstractJspRule.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/AbstractJspRule.java
@@ -48,6 +48,7 @@ public abstract class AbstractJspRule extends AbstractRule implements JspParserV
         // No Type resolution for JSP rules?
     }
 
+    @Override
     public void apply(List<? extends Node> nodes, RuleContext ctx) {
         visitAll(nodes, ctx);
     }
@@ -65,95 +66,118 @@ public abstract class AbstractJspRule extends AbstractRule implements JspParserV
     // complex Rule base class instead of from relatively simple Visitor.
     //
 
+    @Override
     public Object visit(JspNode node, Object data) {
         node.childrenAccept(this, data);
         return null;
     }
 
+    @Override
     public Object visit(ASTCompilationUnit node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTContent node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspDirective node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspDirectiveAttribute node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspScriptlet node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspExpression node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspDeclaration node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspComment node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTText node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTUnparsedText node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTElExpression node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTValueBinding node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCData node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTElement node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAttribute node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAttributeValue node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTJspExpressionInAttribute node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCommentTag node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDeclaration node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDoctypeDeclaration node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDoctypeExternalId node, Object data) {
         return visit((JspNode) node, data);
     }
 
+    @Override
     public Object visit(ASTHtmlScript node, Object data) {
         return visit((JspNode) node, data);
     }
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/JspRuleChainVisitor.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/JspRuleChainVisitor.java
index 1b02e3be94..a9f76d1c32 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/JspRuleChainVisitor.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/JspRuleChainVisitor.java
@@ -18,10 +18,12 @@ import net.sourceforge.pmd.lang.rule.XPathRule;
 
 public class JspRuleChainVisitor extends AbstractRuleChainVisitor {
 
+    @Override
     protected void indexNodes(List<Node> nodes, RuleContext ctx) {
         JspParserVisitor jspParserVisitor = new JspParserVisitorAdapter() {
             // Perform a visitation of the AST to index nodes which need
             // visiting by type
+            @Override
             public Object visit(JspNode node, Object data) {
                 indexNode(node);
                 return super.visit(node, data);
@@ -33,6 +35,7 @@ public class JspRuleChainVisitor extends AbstractRuleChainVisitor {
         }
     }
 
+    @Override
     protected void visit(Rule rule, Node node, RuleContext ctx) {
         // Rule better either be a JspParserVisitor, or a XPathRule
         if (rule instanceof JspParserVisitor) {
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/JspRuleViolationFactory.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/JspRuleViolationFactory.java
index 8f91eb339f..8135d54f72 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/JspRuleViolationFactory.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/JspRuleViolationFactory.java
@@ -25,6 +25,7 @@ public final class JspRuleViolationFactory extends AbstractRuleViolationFactory
         return new ParametricRuleViolation<>(rule, ruleContext, (JspNode) node, message);
     }
 
+    @Override
     protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message,
             int beginLine, int endLine) {
         return null; // FIXME
diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationRule.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationRule.java
index 77d520a1af..21f42db1b5 100644
--- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationRule.java
+++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationRule.java
@@ -41,6 +41,7 @@ public class NoInlineStyleInformationRule extends AbstractJspRule {
     private static final Set<String> STYLE_ATTRIBUTES = CollectionUtil
             .asSet(new String[] { "STYLE", "FONT", "SIZE", "COLOR", "FACE", "ALIGN", "VALIGN", "BGCOLOR" });
 
+    @Override
     public Object visit(ASTAttribute node, Object data) {
         if (isStyleAttribute(node)) {
             addViolation(data, node);
@@ -49,6 +50,7 @@ public class NoInlineStyleInformationRule extends AbstractJspRule {
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTElement node, Object data) {
         if (isStyleElement(node)) {
             addViolation(data, node);
diff --git a/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/MatlabTokenManager.java b/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/MatlabTokenManager.java
index c090519e00..5b620f7664 100644
--- a/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/MatlabTokenManager.java
+++ b/pmd-matlab/src/main/java/net/sourceforge/pmd/lang/matlab/MatlabTokenManager.java
@@ -18,7 +18,7 @@ public class MatlabTokenManager implements TokenManager {
 
     /**
      * Creates a new Matlab Token Manager from the given source code.
-     * 
+     *
      * @param source
      *            the source code
      */
@@ -26,6 +26,7 @@ public class MatlabTokenManager implements TokenManager {
         tokenManager = new MatlabParserTokenManager(new SimpleCharStream(source));
     }
 
+    @Override
     public Object getNextToken() {
         return tokenManager.getNextToken();
     }
diff --git a/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/ObjectiveCTokenManager.java b/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/ObjectiveCTokenManager.java
index 9190e673be..ec573e5d96 100644
--- a/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/ObjectiveCTokenManager.java
+++ b/pmd-objectivec/src/main/java/net/sourceforge/pmd/lang/objectivec/ObjectiveCTokenManager.java
@@ -18,7 +18,7 @@ public class ObjectiveCTokenManager implements TokenManager {
 
     /**
      * Creates a new Objective-C Token Manager from the given source code.
-     * 
+     *
      * @param source
      *            the source code
      */
@@ -26,6 +26,7 @@ public class ObjectiveCTokenManager implements TokenManager {
         tokenManager = new ObjectiveCParserTokenManager(new SimpleCharStream(source));
     }
 
+    @Override
     public Object getNextToken() {
         return tokenManager.getNextToken();
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLDataFlowHandler.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLDataFlowHandler.java
index 5c65ec32ec..8f61ed7a51 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLDataFlowHandler.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLDataFlowHandler.java
@@ -13,10 +13,12 @@ import net.sourceforge.pmd.lang.plsql.ast.ASTLabelledStatement;
 import net.sourceforge.pmd.lang.plsql.dfa.PLSQLDataFlowNode;
 
 public class PLSQLDataFlowHandler implements DataFlowHandler {
+    @Override
     public DataFlowNode createDataFlowNode(List<DataFlowNode> dataFlow, Node node) {
         return new PLSQLDataFlowNode(dataFlow, node);
     }
 
+    @Override
     public Class<ASTLabelledStatement> getLabelStatementNodeClass() {
         return ASTLabelledStatement.class;
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLHandler.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLHandler.java
index 5a8d8388c8..2b2de68d98 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLHandler.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLHandler.java
@@ -32,10 +32,12 @@ import net.sourceforge.pmd.lang.rule.RuleViolationFactory;
  */
 public class PLSQLHandler extends AbstractLanguageVersionHandler {
 
+    @Override
     public Parser getParser(ParserOptions parserOptions) {
         return new PLSQLParser(parserOptions);
     }
 
+    @Override
     public RuleViolationFactory getRuleViolationFactory() {
         return PLSQLRuleViolationFactory.INSTANCE;
     }
@@ -53,6 +55,7 @@ public class PLSQLHandler extends AbstractLanguageVersionHandler {
     @Override
     public VisitorStarter getDataFlowFacade() {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new DataFlowFacade().initializeWith(getDataFlowHandler(), (ASTInput) rootNode);
             }
@@ -62,6 +65,7 @@ public class PLSQLHandler extends AbstractLanguageVersionHandler {
     @Override
     public VisitorStarter getSymbolFacade() {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new SymbolFacade().initializeWith((ASTInput) rootNode);
             }
@@ -71,6 +75,7 @@ public class PLSQLHandler extends AbstractLanguageVersionHandler {
     @Override
     public VisitorStarter getDumpFacade(final Writer writer, final String prefix, final boolean recurse) {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new DumpFacade().initializeWith(writer, prefix, recurse, (PLSQLNode) rootNode);
             }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLParser.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLParser.java
index 40e4d1f6e2..2ce2ffea8b 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLParser.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLParser.java
@@ -38,15 +38,18 @@ public class PLSQLParser extends AbstractParser {
         return new net.sourceforge.pmd.lang.plsql.ast.PLSQLParser(in);
     }
 
+    @Override
     public boolean canParse() {
         return true;
     }
 
+    @Override
     public Node parse(String fileName, Reader source) throws ParseException {
         AbstractTokenManager.setFileName(fileName);
         return createPLSQLParser(source).Input();
     }
 
+    @Override
     public Map<Integer, String> getSuppressMap() {
         return new HashMap<>(); // FIXME
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLTokenManager.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLTokenManager.java
index 047d8285b2..e07ee37d39 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLTokenManager.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLTokenManager.java
@@ -20,10 +20,12 @@ public class PLSQLTokenManager implements TokenManager {
         tokenManager = new PLSQLParserTokenManager(new SimpleCharStream(source));
     }
 
+    @Override
     public Object getNextToken() {
         return tokenManager.getNextToken();
     }
 
+    @Override
     public void setFileName(String fileName) {
         PLSQLParserTokenManager.setFileName(fileName);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTArguments.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTArguments.java
index a725b25c29..2ae20d49f6 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTArguments.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTArguments.java
@@ -17,6 +17,7 @@ public class ASTArguments extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLS
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTDatatype.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTDatatype.java
index f8854162d3..4b377a8b31 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTDatatype.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTDatatype.java
@@ -17,6 +17,7 @@ public class ASTDatatype extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQ
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTFormalParameter.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTFormalParameter.java
index 1803fba807..7166522190 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTFormalParameter.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTFormalParameter.java
@@ -17,6 +17,7 @@ public class ASTFormalParameter extends net.sourceforge.pmd.lang.plsql.ast.Abstr
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTIfStatement.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTIfStatement.java
index 5f4f30e054..0b31e65364 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTIfStatement.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTIfStatement.java
@@ -27,6 +27,7 @@ public class ASTIfStatement extends net.sourceforge.pmd.lang.plsql.ast.AbstractP
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTInput.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTInput.java
index 5cad91d760..a2e7f11f29 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTInput.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTInput.java
@@ -18,6 +18,7 @@ public class ASTInput extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNo
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclaration.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclaration.java
index 3c1e86db5f..e094dab750 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclaration.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclaration.java
@@ -17,6 +17,7 @@ public class ASTMethodDeclaration extends AbstractPLSQLNode implements Executabl
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclarator.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclarator.java
index be546c36d3..fccaf89874 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclarator.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTMethodDeclarator.java
@@ -17,6 +17,7 @@ public class ASTMethodDeclarator extends net.sourceforge.pmd.lang.plsql.ast.Abst
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTName.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTName.java
index 18d67945bf..32633fbb1d 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTName.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTName.java
@@ -19,6 +19,7 @@ public class ASTName extends net.sourceforge.pmd.lang.plsql.ast.AbstractPLSQLNod
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPackageBody.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPackageBody.java
index c22a2cc946..9b3a015f51 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPackageBody.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPackageBody.java
@@ -17,13 +17,14 @@ public class ASTPackageBody extends net.sourceforge.pmd.lang.plsql.ast.AbstractP
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
 
     /**
      * Gets the name of the Oracle Object.
-     * 
+     *
      * @return a String representing the name of the Oracle Object
      */
     @Override
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPackageSpecification.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPackageSpecification.java
index 4d8d6fd004..5fca76315a 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPackageSpecification.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPackageSpecification.java
@@ -18,13 +18,14 @@ public class ASTPackageSpecification extends net.sourceforge.pmd.lang.plsql.ast.
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
 
     /**
      * Gets the name of the Oracle Object.
-     * 
+     *
      * @return a String representing the name of the Oracle Object
      */
     @Override
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPrimaryPrefix.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPrimaryPrefix.java
index e09ef329ab..39f5964a7e 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPrimaryPrefix.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPrimaryPrefix.java
@@ -17,6 +17,7 @@ public class ASTPrimaryPrefix extends net.sourceforge.pmd.lang.plsql.ast.Abstrac
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPrimarySuffix.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPrimarySuffix.java
index ea3d6d8bf9..fa31ed75b7 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPrimarySuffix.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTPrimarySuffix.java
@@ -17,6 +17,7 @@ public class ASTPrimarySuffix extends net.sourceforge.pmd.lang.plsql.ast.Abstrac
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -44,7 +45,7 @@ public class ASTPrimarySuffix extends net.sourceforge.pmd.lang.plsql.ast.Abstrac
      * Get the number of arguments for this primary suffix. One should call
      * {@link #isArguments()} to see if there are arguments. If this method is
      * called when there are no arguments it returns <code>-1</code>.
-     * 
+     *
      * @return A non-negative argument number when there are arguments,
      *         <code>-1</code> otherwise.
      */
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTProgramUnit.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTProgramUnit.java
index c279fc3c40..5510349404 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTProgramUnit.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTProgramUnit.java
@@ -19,6 +19,7 @@ public class ASTProgramUnit extends AbstractPLSQLNode implements ExecutableCode,
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerTimingPointSection.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerTimingPointSection.java
index c115925b9f..d8b4600c0a 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerTimingPointSection.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerTimingPointSection.java
@@ -19,15 +19,17 @@ public class ASTTriggerTimingPointSection extends AbstractPLSQLNode implements E
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
 
     /**
      * return executable's name.
-     * 
+     *
      * @return
      */
+    @Override
     public String getMethodName() {
         return getImage();
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerUnit.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerUnit.java
index ff05e8f83f..336773bb23 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerUnit.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTriggerUnit.java
@@ -19,6 +19,7 @@ public class ASTTriggerUnit extends AbstractPLSQLNode implements ExecutableCode,
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -28,6 +29,7 @@ public class ASTTriggerUnit extends AbstractPLSQLNode implements ExecutableCode,
      *
      * @return a String representing the name of the trigger
      */
+    @Override
     public String getMethodName() {
         return getImage();
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTypeMethod.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTypeMethod.java
index f05aec2c1e..e69627d770 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTypeMethod.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTypeMethod.java
@@ -19,6 +19,7 @@ public class ASTTypeMethod extends AbstractPLSQLNode implements ExecutableCode,
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -28,6 +29,7 @@ public class ASTTypeMethod extends AbstractPLSQLNode implements ExecutableCode,
      *
      * @return a String representing the name of the method
      */
+    @Override
     public String getMethodName() {
         ASTMethodDeclarator md = getFirstChildOfType(ASTMethodDeclarator.class);
         if (md != null) {
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTypeSpecification.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTypeSpecification.java
index a1d8769774..cd3d598de1 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTypeSpecification.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTTypeSpecification.java
@@ -17,6 +17,7 @@ public class ASTTypeSpecification extends net.sourceforge.pmd.lang.plsql.ast.Abs
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTVariableOrConstantDeclaratorId.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTVariableOrConstantDeclaratorId.java
index df694a6e20..c7fd192a1a 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTVariableOrConstantDeclaratorId.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ASTVariableOrConstantDeclaratorId.java
@@ -23,6 +23,7 @@ public class ASTVariableOrConstantDeclaratorId extends net.sourceforge.pmd.lang.
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(PLSQLParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/AbstractPLSQLNode.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/AbstractPLSQLNode.java
index b9991fa763..aebc968098 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/AbstractPLSQLNode.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/AbstractPLSQLNode.java
@@ -23,6 +23,7 @@ public abstract class AbstractPLSQLNode extends net.sourceforge.pmd.lang.ast.Abs
         parser = p;
     }
 
+    @Override
     public void jjtOpen() {
         if (beginLine == -1 && parser.token.next != null) {
             beginLine = parser.token.next.beginLine;
@@ -30,6 +31,7 @@ public abstract class AbstractPLSQLNode extends net.sourceforge.pmd.lang.ast.Abs
         }
     }
 
+    @Override
     public void jjtClose() {
         if (beginLine == -1 && (children == null || children.length == 0)) {
             beginColumn = parser.token.beginColumn;
@@ -102,7 +104,7 @@ public abstract class AbstractPLSQLNode extends net.sourceforge.pmd.lang.ast.Abs
 
     /**
      * Return node image converted to the normal Oracle form.
-     * 
+     *
      * <p>
      * Normally this is uppercase, unless the names is quoted ("name").
      * </p>
@@ -114,12 +116,12 @@ public abstract class AbstractPLSQLNode extends net.sourceforge.pmd.lang.ast.Abs
     /**
      * Convert arbitrary String to normal Oracle format, under assumption that
      * the passed image is an Oracle name.
-     * 
+     *
      * <p>
      * This a helper method for PLSQL classes dependent on SimpleNode, that
      * would otherwise have to import PLSQParser.
      * </p>
-     * 
+     *
      * @param image
      * @return
      */
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLNode.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLNode.java
index 1ac627c6ee..c465306830 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLNode.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/PLSQLNode.java
@@ -16,6 +16,7 @@ public interface PLSQLNode extends Node, ScopedNode {
     /** Accept the visitor. **/
     Object childrenAccept(PLSQLParserVisitor visitor, Object data);
 
+    @Override
     Scope getScope();
 
     void setScope(Scope scope);
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/DFAPLSQLGraphRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/DFAPLSQLGraphRule.java
index 9a8bf3ed61..01c5309a00 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/DFAPLSQLGraphRule.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/DFAPLSQLGraphRule.java
@@ -24,6 +24,7 @@ public class DFAPLSQLGraphRule extends AbstractPLSQLRule implements DFAGraphRule
         super.setDfa(true);
     }
 
+    @Override
     public List<DFAGraphMethod> getMethods() {
         return this.executables;
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/PLSQLDataFlowNode.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/PLSQLDataFlowNode.java
index 8cb13e0ff5..b1c4db193d 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/PLSQLDataFlowNode.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/PLSQLDataFlowNode.java
@@ -19,6 +19,7 @@ public class PLSQLDataFlowNode extends AbstractDataFlowNode {
         super(dataFlow, node);
     }
 
+    @Override
     public String toString() {
         String res = "PLSQLDataFlowNode: line " + this.getLine() + ", (Type BitField==" + type + ")";
         if (node instanceof ASTProgramUnit || node instanceof ASTTypeMethod
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractStatisticalPLSQLRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractStatisticalPLSQLRule.java
index d83ac18789..440aaf8463 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractStatisticalPLSQLRule.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractStatisticalPLSQLRule.java
@@ -16,10 +16,12 @@ public abstract class AbstractStatisticalPLSQLRule extends AbstractPLSQLRule imp
 
     private final StatisticalRuleHelper helper = new StatisticalRuleHelper(this);
 
+    @Override
     public void addDataPoint(DataPoint point) {
         helper.addDataPoint(point);
     }
 
+    @Override
     public Object[] getViolationParameters(DataPoint point) {
         return new Object[0];
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/PLSQLRuleViolationFactory.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/PLSQLRuleViolationFactory.java
index b5cd241323..f4adec6b2d 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/PLSQLRuleViolationFactory.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/PLSQLRuleViolationFactory.java
@@ -24,6 +24,7 @@ public final class PLSQLRuleViolationFactory extends AbstractRuleViolationFactor
         return new ParametricRuleViolation<>(rule, ruleContext, node, message);
     }
 
+    @Override
     protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message,
             int beginLine, int endLine) {
         ParametricRuleViolation<Node> violation = new ParametricRuleViolation<>(rule, ruleContext, node, message);
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListRule.java
index dc4ec46917..8781733899 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListRule.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListRule.java
@@ -20,6 +20,7 @@ public class ExcessiveParameterListRule extends ExcessiveNodeCountRule {
     }
 
     // Count these nodes, but no others.
+    @Override
     public Object visit(ASTFormalParameter node, Object data) {
         return NumericConstants.ONE;
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/LocalScope.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/LocalScope.java
index bbd52e1090..c9bf64a436 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/LocalScope.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/LocalScope.java
@@ -61,6 +61,7 @@ public class LocalScope extends AbstractScope {
         return result;
     }
 
+    @Override
     public String toString() {
         return "LocalScope:" + getVariableDeclarations().keySet();
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/MethodScope.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/MethodScope.java
index 17fea72a6e..a1edc43f7f 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/MethodScope.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/MethodScope.java
@@ -75,6 +75,7 @@ public class MethodScope extends AbstractScope {
         return ((AbstractPLSQLNode) node.jjtGetChild(1)).getCanonicalImage();
     }
 
+    @Override
     public String toString() {
         return "MethodScope:" + getVariableDeclarations().keySet();
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/SourceFileScope.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/SourceFileScope.java
index 6fb1292d4c..d57c7af657 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/SourceFileScope.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/SourceFileScope.java
@@ -28,7 +28,7 @@ public class SourceFileScope extends AbstractScope {
 
     /**
      *
-     * 
+     *
      * @throws IllegalArgumentException
      *             if declaration is not a {@link ClassNameDeclaration}
      */
@@ -40,6 +40,7 @@ public class SourceFileScope extends AbstractScope {
         super.addDeclaration(declaration);
     }
 
+    @Override
     public String toString() {
         return "SourceFileScope: " + getDeclarations().keySet();
     }
diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/TypeSet.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/TypeSet.java
index 2f4bf439fd..9793550123 100644
--- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/TypeSet.java
+++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/TypeSet.java
@@ -32,6 +32,7 @@ public class TypeSet {
             this.importStmts = importStmts;
         }
 
+        @Override
         public Class<?> resolve(String name) throws ClassNotFoundException {
             for (String importStmt : importStmts) {
                 if (importStmt.endsWith(name)) {
@@ -49,6 +50,7 @@ public class TypeSet {
             this.pkg = pkg;
         }
 
+        @Override
         public Class<?> resolve(String name) throws ClassNotFoundException {
             return Class.forName(pkg + name);
         }
@@ -56,6 +58,7 @@ public class TypeSet {
 
     // TODO cite the JLS section on implicit imports
     public static class ImplicitImportResolver implements Resolver {
+        @Override
         public Class<?> resolve(String name) throws ClassNotFoundException {
             return Class.forName("java.lang." + name);
         }
@@ -68,6 +71,7 @@ public class TypeSet {
             this.importStmts = importStmts;
         }
 
+        @Override
         public Class<?> resolve(String name) throws ClassNotFoundException {
             for (String importStmt : importStmts) {
                 if (importStmt.endsWith("*")) {
@@ -99,6 +103,7 @@ public class TypeSet {
             primitiveTypes.put("char", char.class);
         }
 
+        @Override
         public Class<?> resolve(String name) throws ClassNotFoundException {
             if (!primitiveTypes.containsKey(name)) {
                 throw new ClassNotFoundException();
@@ -108,6 +113,7 @@ public class TypeSet {
     }
 
     public static class VoidResolver implements Resolver {
+        @Override
         public Class<?> resolve(String name) throws ClassNotFoundException {
             if ("void".equals(name)) {
                 return void.class;
@@ -117,6 +123,7 @@ public class TypeSet {
     }
 
     public static class FullyQualifiedNameResolver implements Resolver {
+        @Override
         public Class<?> resolve(String name) throws ClassNotFoundException {
             return Class.forName(name);
         }
diff --git a/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/PythonTokenManager.java b/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/PythonTokenManager.java
index 168609a5da..30a3aa72fc 100644
--- a/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/PythonTokenManager.java
+++ b/pmd-python/src/main/java/net/sourceforge/pmd/lang/python/PythonTokenManager.java
@@ -18,7 +18,7 @@ public class PythonTokenManager implements TokenManager {
 
     /**
      * Creates a new Python Token Manager from the given source code.
-     * 
+     *
      * @param source
      *            the source code
      */
@@ -26,6 +26,7 @@ public class PythonTokenManager implements TokenManager {
         tokenManager = new PythonParserTokenManager(new SimpleCharStream(source));
     }
 
+    @Override
     public Object getNextToken() {
         return tokenManager.getNextToken();
     }
diff --git a/pmd-scala/src/main/java/org/sonar/plugins/scala/cpd/ScalaTokenizer.java b/pmd-scala/src/main/java/org/sonar/plugins/scala/cpd/ScalaTokenizer.java
index 3ff303f195..ac9b159177 100644
--- a/pmd-scala/src/main/java/org/sonar/plugins/scala/cpd/ScalaTokenizer.java
+++ b/pmd-scala/src/main/java/org/sonar/plugins/scala/cpd/ScalaTokenizer.java
@@ -38,6 +38,7 @@ import net.sourceforge.pmd.lang.ast.TokenMgrError;
  */
 public final class ScalaTokenizer implements Tokenizer {
 
+    @Override
     public void tokenize(SourceCode source, Tokens cpdTokens) {
         String filename = source.getFileName();
 
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
index f78e1dd4f8..59f71e2225 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/DummyLanguageModule.java
@@ -113,6 +113,7 @@ public class DummyLanguageModule extends BaseLanguageModule {
         protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message,
                 int beginLine, int endLine) {
             ParametricRuleViolation<Node> rv = new ParametricRuleViolation<Node>(rule, ruleContext, node, message) {
+                @Override
                 public String getPackageName() {
                     this.packageName = "foo"; // just for testing variable expansion
                     return super.getPackageName();
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTestRunner.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTestRunner.java
index 52c2b64a63..642f033371 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTestRunner.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTestRunner.java
@@ -43,6 +43,7 @@ public class RuleTestRunner extends ParentRunner<TestDescriptor> {
         instance.setUp();
     }
 
+    @Override
     protected Description describeChild(TestDescriptor testCase) {
         Description description = testDescriptions.get(testCase);
         if (description == null) {
diff --git a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/beans/BeanModelNodeSeq.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/beans/BeanModelNodeSeq.java
index c079b900d2..b9b32450c6 100644
--- a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/beans/BeanModelNodeSeq.java
+++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/beans/BeanModelNodeSeq.java
@@ -48,6 +48,7 @@ public class BeanModelNodeSeq<T extends SimpleBeanModelNode> extends BeanModelNo
     }
 
 
+    @Override
     protected <U> void accept(BeanNodeVisitor<U> visitor, U data) {
         visitor.visit(this, data);
     }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/cpd/VfTokenizer.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/cpd/VfTokenizer.java
index 7c7f8386ec..c4434a0005 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/cpd/VfTokenizer.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/cpd/VfTokenizer.java
@@ -22,6 +22,7 @@ import net.sourceforge.pmd.util.IOUtil;
  */
 public class VfTokenizer implements Tokenizer {
 
+    @Override
     public void tokenize(SourceCode sourceCode, Tokens tokenEntries) {
         StringBuilder buffer = sourceCode.getCodeBuffer();
         LanguageVersionHandler languageVersionHandler = LanguageRegistry.getLanguage(VfLanguageModule.NAME)
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfHandler.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfHandler.java
index 8bb6d8509f..236a304f35 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfHandler.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfHandler.java
@@ -25,10 +25,12 @@ public class VfHandler extends AbstractLanguageVersionHandler {
         return new DefaultASTXPathHandler();
     }
 
+    @Override
     public RuleViolationFactory getRuleViolationFactory() {
         return VfRuleViolationFactory.INSTANCE;
     }
 
+    @Override
     public Parser getParser(ParserOptions parserOptions) {
         return new VfParser(parserOptions);
     }
@@ -36,6 +38,7 @@ public class VfHandler extends AbstractLanguageVersionHandler {
     @Override
     public VisitorStarter getDumpFacade(final Writer writer, final String prefix, final boolean recurse) {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new DumpFacade().initializeWith(writer, prefix, recurse, (VfNode) rootNode);
             }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfParser.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfParser.java
index 07a973e209..36a92c060c 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfParser.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfParser.java
@@ -29,15 +29,18 @@ public class VfParser extends AbstractParser {
         return new VfTokenManager(source);
     }
 
+    @Override
     public boolean canParse() {
         return true;
     }
 
+    @Override
     public Node parse(String fileName, Reader source) throws ParseException {
         AbstractTokenManager.setFileName(fileName);
         return new net.sourceforge.pmd.lang.vf.ast.VfParser(new VfSimpleCharStream(source)).CompilationUnit();
     }
 
+    @Override
     public Map<Integer, String> getSuppressMap() {
         return new HashMap<>(); // FIXME
     }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfTokenManager.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfTokenManager.java
index afbba717f0..1fe672d3aa 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfTokenManager.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfTokenManager.java
@@ -20,10 +20,12 @@ public class VfTokenManager implements TokenManager {
         tokenManager = new VfParserTokenManager(new JavaCharStream(source));
     }
 
+    @Override
     public Object getNextToken() {
         return tokenManager.getNextToken();
     }
 
+    @Override
     public void setFileName(String fileName) {
         VfParserTokenManager.setFileName(fileName);
     }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTArguments.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTArguments.java
index 25968e9e51..64a92dd2e6 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTArguments.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTArguments.java
@@ -14,6 +14,7 @@ public class ASTArguments extends AbstractVFNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
 
         return visitor.visit(this, data);
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttributeValue.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttributeValue.java
index 4a0afe9486..0245ad6030 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttributeValue.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttributeValue.java
@@ -14,6 +14,7 @@ public class ASTAttributeValue extends AbstractVFNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
 
         return visitor.visit(this, data);
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCData.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCData.java
index 341f9bd74f..53767f363c 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCData.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCData.java
@@ -17,6 +17,7 @@ public class ASTCData extends AbstractVFNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCompilationUnit.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCompilationUnit.java
index 2c58d140e7..10b6110e9e 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCompilationUnit.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTCompilationUnit.java
@@ -19,6 +19,7 @@ public class ASTCompilationUnit extends AbstractVFNode implements RootNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTContent.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTContent.java
index 2aa397b0ca..af7bbafc5a 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTContent.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTContent.java
@@ -14,6 +14,7 @@ public class ASTContent extends AbstractVFNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
 
         return visitor.visit(this, data);
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDotExpression.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDotExpression.java
index df1c373f57..7b46142c7a 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDotExpression.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDotExpression.java
@@ -16,6 +16,7 @@ public class ASTDotExpression extends AbstractVFNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElExpression.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElExpression.java
index 395f528219..4b7e7af26c 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElExpression.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElExpression.java
@@ -17,6 +17,7 @@ public class ASTElExpression extends AbstractVFNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTExpression.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTExpression.java
index ec6055597f..5caec19598 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTExpression.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTExpression.java
@@ -14,6 +14,7 @@ public class ASTExpression extends AbstractVFNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
 
         return visitor.visit(this, data);
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTIdentifier.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTIdentifier.java
index 1286ee029f..9d84c20089 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTIdentifier.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTIdentifier.java
@@ -14,6 +14,7 @@ public class ASTIdentifier extends AbstractVFNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
 
         return visitor.visit(this, data);
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTLiteral.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTLiteral.java
index 9694247107..cec178d1df 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTLiteral.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTLiteral.java
@@ -14,6 +14,7 @@ public class ASTLiteral extends AbstractVFNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
 
         return visitor.visit(this, data);
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTNegationExpression.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTNegationExpression.java
index 6bd638c3e9..130ade8dd9 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTNegationExpression.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTNegationExpression.java
@@ -14,6 +14,7 @@ public class ASTNegationExpression extends AbstractVFNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
 
         return visitor.visit(this, data);
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTText.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTText.java
index e684814387..16a359cdf8 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTText.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTText.java
@@ -17,6 +17,7 @@ public class ASTText extends AbstractVFNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java
index 2a9c87d4f8..57e12782d3 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java
@@ -19,6 +19,7 @@ public class AbstractVFNode extends AbstractNode implements VfNode {
         this.parser = parser;
     }
 
+    @Override
     public void jjtOpen() {
         if (beginLine == -1 && parser.token.next != null) {
             beginLine = parser.token.next.beginLine;
@@ -26,6 +27,7 @@ public class AbstractVFNode extends AbstractNode implements VfNode {
         }
     }
 
+    @Override
     public void jjtClose() {
         if (beginLine == -1 && (children == null || children.length == 0)) {
             beginColumn = parser.token.beginColumn;
@@ -40,6 +42,7 @@ public class AbstractVFNode extends AbstractNode implements VfNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object jjtAccept(VfParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
@@ -47,6 +50,7 @@ public class AbstractVFNode extends AbstractNode implements VfNode {
     /**
      * Accept the visitor. *
      */
+    @Override
     public Object childrenAccept(VfParserVisitor visitor, Object data) {
         if (children != null) {
             for (int i = 0; i < children.length; ++i) {
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java
index 6ef3adbcbe..2937e2a080 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java
@@ -15,9 +15,9 @@ import net.sourceforge.pmd.util.StringUtil;
  * tag list and it will mark the first tag named 'x' as closed. If other tags
  * have been opened after 'x' ( &lt;x&gt; &lt;y&gt; &lt;z&gt; &lt;/x&gt;) it
  * will mark y and z as unclosed.
- * 
+ *
  * @author Victor Bucutea
- * 
+ *
  */
 public class OpenTagRegister {
 
@@ -32,7 +32,7 @@ public class OpenTagRegister {
     }
 
     /**
-     * 
+     *
      * @param closingTagName
      * @return true if a matching tag was found. False if no tag with this name
      *         was ever opened ( or registered )
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/StartAndEndTagMismatchException.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/StartAndEndTagMismatchException.java
index 6a261d7b24..bb398ce111 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/StartAndEndTagMismatchException.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/StartAndEndTagMismatchException.java
@@ -73,7 +73,7 @@ public class StartAndEndTagMismatchException extends SyntaxErrorException {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.lang.Throwable#getMessage()
      */
     @Override
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/SyntaxErrorException.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/SyntaxErrorException.java
index d24a971234..c2c8b0d6ec 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/SyntaxErrorException.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/SyntaxErrorException.java
@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.vf.ast;
 
 /**
  * Exception indicating that a syntactic error has been found.
- * 
+ *
  * @author Pieter_Van_Raemdonck
  * @since Created on 11-jan-2006
  */
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfParserVisitorAdapter.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfParserVisitorAdapter.java
index 8600cc48ac..693bda0b51 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfParserVisitorAdapter.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfParserVisitorAdapter.java
@@ -6,51 +6,63 @@ package net.sourceforge.pmd.lang.vf.ast;
 
 public class VfParserVisitorAdapter implements VfParserVisitor {
 
+    @Override
     public Object visit(VfNode node, Object data) {
         node.childrenAccept(this, data);
         return data;
     }
 
+    @Override
     public Object visit(ASTCompilationUnit node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTText node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTElExpression node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCData node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTElement node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAttribute node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAttributeValue node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDeclaration node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDoctypeDeclaration node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDoctypeExternalId node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTHtmlScript node, Object data) {
         return visit((VfNode) node, data);
     }
@@ -69,12 +81,12 @@ public class VfParserVisitorAdapter implements VfParserVisitor {
     public Object visit(ASTExpression node, Object data) {
         return visit((VfNode) node, data);
     }
-    
+
     @Override
     public Object visit(ASTArguments node, Object data) {
         return visit((VfNode) node, data);
     }
-    
+
     @Override
     public Object visit(ASTDotExpression node, Object data) {
         return visit((VfNode) node, data);
@@ -84,10 +96,10 @@ public class VfParserVisitorAdapter implements VfParserVisitor {
     public Object visit(ASTContent node, Object data) {
         return visit((VfNode) node, data);
     }
-    
+
     @Override
     public Object visit(ASTNegationExpression node, Object data) {
         return visit((VfNode) node, data);
     }
-    
+
 }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/AbstractVfRule.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/AbstractVfRule.java
index ae0d0362e2..2329824e18 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/AbstractVfRule.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/AbstractVfRule.java
@@ -39,6 +39,7 @@ public abstract class AbstractVfRule extends AbstractRule implements VfParserVis
         super.setLanguage(LanguageRegistry.getLanguage(VfLanguageModule.NAME));
     }
 
+    @Override
     public void apply(List<? extends Node> nodes, RuleContext ctx) {
         visitAll(nodes, ctx);
     }
@@ -55,79 +56,98 @@ public abstract class AbstractVfRule extends AbstractRule implements VfParserVis
         }
     }
 
+    @Override
     public Object visit(VfNode node, Object data) {
         node.childrenAccept(this, data);
         return null;
     }
 
+    @Override
     public Object visit(ASTCompilationUnit node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTText node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAttributeValue node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTElExpression node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTCData node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTElement node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTAttribute node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDeclaration node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDoctypeDeclaration node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDoctypeExternalId node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTHtmlScript node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTLiteral node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTIdentifier node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTExpression node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTArguments node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTDotExpression node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTContent node, Object data) {
         return visit((VfNode) node, data);
     }
 
+    @Override
     public Object visit(ASTNegationExpression node, Object data) {
         return visit((VfNode) node, data);
     }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleChainVisitor.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleChainVisitor.java
index 86a05e63b4..3f47672901 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleChainVisitor.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleChainVisitor.java
@@ -18,6 +18,7 @@ import net.sourceforge.pmd.lang.vf.ast.VfParserVisitorAdapter;
 
 public class VfRuleChainVisitor extends AbstractRuleChainVisitor {
 
+    @Override
     protected void indexNodes(List<Node> nodes, RuleContext ctx) {
         VfParserVisitor vfParserVisitor = new VfParserVisitorAdapter();
 
@@ -26,6 +27,7 @@ public class VfRuleChainVisitor extends AbstractRuleChainVisitor {
         }
     }
 
+    @Override
     protected void visit(Rule rule, Node node, RuleContext ctx) {
         // Rule better either be a vfParserVisitor, or a XPathRule
         if (rule instanceof VfParserVisitor) {
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleViolationFactory.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleViolationFactory.java
index 829856af36..202394278e 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleViolationFactory.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/rule/VfRuleViolationFactory.java
@@ -25,9 +25,10 @@ public final class VfRuleViolationFactory extends AbstractRuleViolationFactory {
         return new ParametricRuleViolation<>(rule, ruleContext, (VfNode) node, message);
     }
 
+    @Override
     protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message,
             int beginLine, int endLine) {
-        
+
         ParametricRuleViolation<VfNode> rViolation = new ParametricRuleViolation<>(rule, ruleContext, (VfNode) node, message);
         rViolation.setLines(beginLine, endLine);
         return rViolation;
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmHandler.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmHandler.java
index 7ef5796df7..6012bddc48 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmHandler.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmHandler.java
@@ -19,7 +19,7 @@ import net.sourceforge.pmd.lang.vm.rule.VmRuleViolationFactory;
 
 /**
  * Implementation of LanguageVersionHandler for the VM parser.
- * 
+ *
  */
 public class VmHandler extends AbstractLanguageVersionHandler {
 
@@ -28,10 +28,12 @@ public class VmHandler extends AbstractLanguageVersionHandler {
         return new DefaultASTXPathHandler();
     }
 
+    @Override
     public RuleViolationFactory getRuleViolationFactory() {
         return VmRuleViolationFactory.INSTANCE;
     }
 
+    @Override
     public Parser getParser(final ParserOptions parserOptions) {
         return new VmParser(parserOptions);
     }
@@ -39,6 +41,7 @@ public class VmHandler extends AbstractLanguageVersionHandler {
     @Override
     public VisitorStarter getDumpFacade(final Writer writer, final String prefix, final boolean recurse) {
         return new VisitorStarter() {
+            @Override
             public void start(final Node rootNode) {
                 ((AbstractVmNode) rootNode).dump(prefix, recurse, writer);
             }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmParser.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmParser.java
index f1a2de9773..8721e782ed 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmParser.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmParser.java
@@ -30,15 +30,18 @@ public class VmParser extends AbstractParser {
         return new VmTokenManager(source);
     }
 
+    @Override
     public boolean canParse() {
         return true;
     }
 
+    @Override
     public Node parse(final String fileName, final Reader source) throws ParseException {
         AbstractTokenManager.setFileName(fileName);
         return new net.sourceforge.pmd.lang.vm.ast.VmParser(new VelocityCharStream(source, 1, 1)).process();
     }
 
+    @Override
     public Map<Integer, String> getSuppressMap() {
         return new HashMap<>(); // FIXME
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmTokenManager.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmTokenManager.java
index ff6721e298..4d8f01e46c 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmTokenManager.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/VmTokenManager.java
@@ -19,10 +19,12 @@ public class VmTokenManager implements TokenManager {
         vmParserTokenManager = new VmParserTokenManager(new VelocityCharStream(source, 1, 1));
     }
 
+    @Override
     public Object getNextToken() {
         return vmParserTokenManager.getNextToken();
     }
 
+    @Override
     public void setFileName(final String fileName) {
         AbstractTokenManager.setFileName(fileName);
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTAddNode.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTAddNode.java
index 8fd510c540..ac8136b9f2 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTAddNode.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTAddNode.java
@@ -17,16 +17,16 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * Handles number addition of nodes.<br>
  * <br>
- * 
+ *
  * Please look at the Parser.jjt file which is what controls the generation of
  * this class.
- * 
+ *
  * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
  * @author <a href="mailto:pero@antaramusic.de">Peter Romianowski</a>
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -50,6 +50,7 @@ public class ASTAddNode extends ASTMathNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VmParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTDirective.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTDirective.java
index c54db7f35d..9068449cce 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTDirective.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTDirective.java
@@ -19,17 +19,17 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * This class is responsible for handling the pluggable directives in VTL.
- * 
+ *
  * For example : #foreach()
- * 
+ *
  * Please look at the Parser.jjt file which is what controls the generation of
  * this class.
- * 
+ *
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  * @author <a href="mailto:kav@kav.dk">Kasper Nielsen</a>
@@ -62,7 +62,7 @@ public class ASTDirective extends AbstractVmNode {
      * Sets the directive name. Used by the parser. This keeps us from having to
      * dig it out of the token stream and gives the parse the change to
      * override.
-     * 
+     *
      * @param str
      */
     public void setDirectiveName(final String str) {
@@ -71,7 +71,7 @@ public class ASTDirective extends AbstractVmNode {
 
     /**
      * Gets the name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
     public String getDirectiveName() {
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTDivNode.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTDivNode.java
index b2b91c8e50..ba8cc16168 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTDivNode.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTDivNode.java
@@ -17,16 +17,16 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * Handles number division of nodes<br>
  * <br>
- * 
+ *
  * Please look at the Parser.jjt file which is what controls the generation of
  * this class.
- * 
+ *
  * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
  * @author <a href="mailto:pero@antaramusic.de">Peter Romianowski</a>
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -50,6 +50,7 @@ public class ASTDivNode extends ASTMathNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VmParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTEscape.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTEscape.java
index 0e4e54a1f3..8c8197ac55 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTEscape.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTEscape.java
@@ -17,15 +17,15 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * This class is responsible for handling Escapes in VTL.
- * 
+ *
  * Please look at the Parser.jjt file which is what controls the generation of
  * this class.
- * 
+ *
  * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  * @version $Id: ASTEscape.java 517553 2007-03-13 06:09:58Z wglass $
  */
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMathNode.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMathNode.java
index f8cd101aa9..34733b9be1 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMathNode.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMathNode.java
@@ -17,16 +17,16 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * Helps handle math<br>
  * <br>
- * 
+ *
  * Please look at the Parser.jjt file which is what controls the generation of
  * this class.
- * 
+ *
  * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
  * @author <a href="mailto:pero@antaramusic.de">Peter Romianowski</a>
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMethod.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMethod.java
index e5c25b6c3f..5dc1e3d563 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMethod.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMethod.java
@@ -20,21 +20,21 @@ import org.apache.commons.lang3.StringUtils;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * ASTMethod.java
- * 
+ *
  * Method support for references : $foo.method()
- * 
+ *
  * NOTE :
- * 
+ *
  * introspection is now done at render time.
- * 
+ *
  * Please look at the Parser.jjt file which is what controls the generation of
  * this class.
- * 
+ *
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  * @version $Id: ASTMethod.java 720228 2008-11-24 16:58:33Z nbubna $
@@ -64,7 +64,7 @@ public class ASTMethod extends AbstractVmNode {
      * Internal class used as key for method cache. Combines ASTMethod fields
      * with array of parameter classes. Has public access (and complete
      * constructor) for unit test purposes.
-     * 
+     *
      * @since 1.5
      */
     public static class MethodCacheKey {
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTModNode.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTModNode.java
index 6df412e48e..9bd588007b 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTModNode.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTModNode.java
@@ -17,16 +17,16 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * Handles modulus division<br>
  * <br>
- * 
+ *
  * Please look at the Parser.jjt file which is what controls the generation of
  * this class.
- * 
+ *
  * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
  * @author <a href="mailto:pero@antaramusic.de">Peter Romianowski</a>
  * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
@@ -49,6 +49,7 @@ public class ASTModNode extends ASTMathNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VmParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMulNode.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMulNode.java
index 98dad11471..da565930a5 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMulNode.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTMulNode.java
@@ -17,16 +17,16 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * Handles multiplication<br>
  * <br>
- * 
+ *
  * Please look at the Parser.jjt file which is what controls the generation of
  * this class.
- * 
+ *
  * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
  * @author <a href="mailto:pero@antaramusic.de">Peter Romianowski</a>
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -50,6 +50,7 @@ public class ASTMulNode extends ASTMathNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VmParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTReference.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTReference.java
index 484b123e77..d17e6b5a40 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTReference.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTReference.java
@@ -17,15 +17,15 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * This class is responsible for handling the references in VTL ($foo).
- * 
+ *
  * Please look at the Parser.jjt file which is what controls the generation of
  * this class.
- * 
+ *
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  * @author <a href="mailto:Christoph.Reck@dlr.de">Christoph Reck</a>
@@ -73,7 +73,7 @@ public class ASTReference extends AbstractVmNode {
 
     /**
      * Returns the 'root string', the reference key
-     * 
+     *
      * @return the root string.
      */
     public String getRootString() {
@@ -85,9 +85,9 @@ public class ASTReference extends AbstractVmNode {
      * Used now in the VM system to override a reference in a VM tree with the
      * literal of the calling arg to make it work nicely when calling arg is
      * null. It seems a bit much, but does keep things consistant.
-     * 
+     *
      * Note, you can only set the literal once...
-     * 
+     *
      * @param literal
      *            String to render to when null
      */
@@ -104,7 +104,7 @@ public class ASTReference extends AbstractVmNode {
     /**
      * Override of the SimpleNode method literal() Returns the literal
      * representation of the node. Should be something like $&lt;token&gt;.
-     * 
+     *
      * @return A literal string.
      */
     @Override
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTStringLiteral.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTStringLiteral.java
index e82d68f4dd..16aea343dc 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTStringLiteral.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTStringLiteral.java
@@ -10,9 +10,9 @@ import org.apache.commons.lang3.text.StrBuilder;
  * licenses this file to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -22,7 +22,7 @@ import org.apache.commons.lang3.text.StrBuilder;
 
 /**
  * ASTStringLiteral support. Will interpolate!
- * 
+ *
  * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  * @version $Id: ASTStringLiteral.java 705297 2008-10-16 17:59:24Z nbubna $
@@ -112,7 +112,7 @@ public class ASTStringLiteral extends AbstractVmNode {
 
     /**
      * Check to see if this is an interpolated string.
-     * 
+     *
      * @return true if this is constant (not an interpolated string)
      * @since 1.6
      */
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTSubtractNode.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTSubtractNode.java
index a93f7c5676..88e694669d 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTSubtractNode.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/ASTSubtractNode.java
@@ -17,16 +17,16 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * Handles subtraction of nodes (in #set() )<br>
  * <br>
- * 
+ *
  * Please look at the Parser.jjt file which is what controls the generation of
  * this class.
- * 
+ *
  * @author <a href="mailto:wglass@forio.com">Will Glass-Husain</a>
  * @author <a href="mailto:pero@antaramusic.de">Peter Romianowski</a>
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
@@ -50,6 +50,7 @@ public class ASTSubtractNode extends ASTMathNode {
     }
 
     /** Accept the visitor. **/
+    @Override
     public Object jjtAccept(VmParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java
index 152c1d1e8e..a640db2813 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import java.io.PrintWriter;
@@ -108,10 +108,12 @@ public class AbstractVmNode extends AbstractNode implements VmNode {
         return last;
     }
 
+    @Override
     public Object jjtAccept(final VmParserVisitor visitor, final Object data) {
         return visitor.visit(this, data);
     }
 
+    @Override
     public Object childrenAccept(final VmParserVisitor visitor, final Object data) {
         if (children != null) {
             for (int i = 0; i < children.length; ++i) {
@@ -147,7 +149,7 @@ public class AbstractVmNode extends AbstractNode implements VmNode {
     /**
      * Override this method if you want to customize how the node dumps out its
      * children.
-     * 
+     *
      * @param prefix
      */
     public void dump(final String prefix, final boolean recurse, final Writer writer) {
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/MacroParseException.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/MacroParseException.java
index 6d726b578b..16237c1aba 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/MacroParseException.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/MacroParseException.java
@@ -17,16 +17,16 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import net.sourceforge.pmd.lang.vm.util.LogUtil;
 
 /**
  * Exception to indicate problem happened while constructing #macro()
- * 
+ *
  * For internal use in parser - not to be passed to app level
- * 
+ *
  * @author <a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a>
  * @author <a href="hps@intermeta.de">Henning P. Schmiedehausen</a>
  * @version $Id: MacroParseException.java 735709 2009-01-19 14:30:03Z byron $
@@ -52,7 +52,7 @@ public class MacroParseException extends ParseException {
 
     /**
      * returns the Template name where this exception occured.
-     * 
+     *
      * @return The Template name where this exception occured.
      * @since 1.5
      */
@@ -62,7 +62,7 @@ public class MacroParseException extends ParseException {
 
     /**
      * returns the line number where this exception occured.
-     * 
+     *
      * @return The line number where this exception occured.
      * @since 1.5
      */
@@ -78,7 +78,7 @@ public class MacroParseException extends ParseException {
 
     /**
      * returns the column number where this exception occured.
-     * 
+     *
      * @return The column number where this exception occured.
      * @since 1.5
      */
@@ -100,7 +100,7 @@ public class MacroParseException extends ParseException {
      * catch it (it gets thrown from the parser), then this method is called
      * during the printing of the final stack trace, and hence the correct error
      * message gets displayed.
-     * 
+     *
      * @return the current message.
      * @since 1.5
      */
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/NodeUtils.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/NodeUtils.java
index dd0267a6af..270d1395c0 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/NodeUtils.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/NodeUtils.java
@@ -19,12 +19,12 @@ import org.apache.commons.lang3.text.StrBuilder;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
  * Utilities for dealing with the AST node structure.
- * 
+ *
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  * @version $Id: NodeUtils.java 687386 2008-08-20 16:57:07Z nbubna $
@@ -37,7 +37,7 @@ public final class NodeUtils {
      * Special tokens do not participate in parsing but can still trigger
      * certain lexical actions. In some cases you may want to retrieve these
      * special tokens, this is simply a way to extract them.
-     * 
+     *
      * @param t
      *            the Token
      * @return StrBuilder with the special tokens.
@@ -63,7 +63,7 @@ public final class NodeUtils {
 
                 /*
                  * more dreaded MORE hack :)
-                 * 
+                 *
                  * looking for ("\\")*"$" sequences
                  */
 
@@ -109,7 +109,7 @@ public final class NodeUtils {
 
     /**
      * complete node literal
-     * 
+     *
      * @param t
      * @return A node literal.
      */
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/TemplateParseException.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/TemplateParseException.java
index 11c874ea68..3f4122123f 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/TemplateParseException.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/TemplateParseException.java
@@ -17,16 +17,16 @@ package net.sourceforge.pmd.lang.vm.ast;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 import net.sourceforge.pmd.lang.vm.util.LogUtil;
 
 /**
  * This is an extension of the ParseException, which also takes a template name.
- * 
+ *
  * <p>see also the original <code>org.apache.velocity.runtime.parser.ParseException</code></p>
- * 
+ *
  * @author <a href="hps@intermeta.de">Henning P. Schmiedehausen</a>
  * @version $Id: TemplateParseException.java 703544 2008-10-10 18:15:53Z nbubna
  *          $
@@ -46,7 +46,7 @@ public class TemplateParseException extends ParseException {
     /**
      * This constructor is used to add a template name to info cribbed from a
      * ParseException generated in the parser.
-     * 
+     *
      * @param currentTokenVal
      * @param expectedTokenSequencesVal
      * @param tokenImageVal
@@ -68,7 +68,7 @@ public class TemplateParseException extends ParseException {
      * This constructor calls its super class with the empty string to force the
      * "toString" method of parent class "Throwable" to print the error message
      * in the form: ParseException: &lt;result of getMessage&gt;
-     * 
+     *
      * @param currentTokenVal
      * @param expectedTokenSequencesVal
      * @param tokenImageVal
@@ -95,7 +95,7 @@ public class TemplateParseException extends ParseException {
 
     /**
      * Creates a new TemplateParseException object.
-     * 
+     *
      * @param message
      *            TODO: DOCUMENT ME!
      */
@@ -106,7 +106,7 @@ public class TemplateParseException extends ParseException {
 
     /**
      * returns the Template name where this exception occured.
-     * 
+     *
      * @return The Template name where this exception occured.
      */
     public String getTemplateName() {
@@ -115,7 +115,7 @@ public class TemplateParseException extends ParseException {
 
     /**
      * returns the line number where this exception occured.
-     * 
+     *
      * @return The line number where this exception occured.
      */
     public int getLineNumber() {
@@ -128,7 +128,7 @@ public class TemplateParseException extends ParseException {
 
     /**
      * returns the column number where this exception occured.
-     * 
+     *
      * @return The column number where this exception occured.
      */
     public int getColumnNumber() {
@@ -147,7 +147,7 @@ public class TemplateParseException extends ParseException {
      * catch it (it gets thrown from the parser), then this method is called
      * during the printing of the final stack trace, and hence the correct error
      * message gets displayed.
-     * 
+     *
      * @return The error message.
      */
     @Override
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/TokenMgrError.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/TokenMgrError.java
index 288ef69405..546b054b60 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/TokenMgrError.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/TokenMgrError.java
@@ -9,7 +9,7 @@ public class TokenMgrError extends RuntimeException {
      */
 
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = 1L;
 
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Block.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Block.java
index de6bf9e449..b10b9dbe75 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Block.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Block.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -36,6 +36,7 @@ public abstract class Block extends Directive {
     /**
      * Return type of this directive.
      */
+    @Override
     public int getType() {
         return BLOCK;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/BlockMacro.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/BlockMacro.java
index 4eb0ad778e..e1b80173af 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/BlockMacro.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/BlockMacro.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -28,10 +28,10 @@ package net.sourceforge.pmd.lang.vm.directive;
  * as a "decorator". Body AST can contain any valid Velocity syntax.
  *
  * An example:
- * 
+ *
  * <pre>
  * #set($foobar = "yeah!")
- * 
+ *
  * #macro(strong $txt)
  * &lt;strong&gt;$bodyContent&lt;/strong&gt; $txt
  * #end
@@ -40,13 +40,13 @@ package net.sourceforge.pmd.lang.vm.directive;
  * &lt;u&gt;This text is underlined and bold&lt;/u&gt;
  * #end
  * </pre>
- * 
+ *
  * Will print:
- * 
+ *
  * <pre>
  * &lt;strong&gt;&lt;u&gt;This text is underlined and bold&lt;u&gt;&lt;/strong&gt; yeah!
  * </pre>
- * 
+ *
  * bodyContent reference name is configurable (see velocity.properties).
  *
  * @author <a href="mailto:wyla@removethis.sci.fi">Jarkko Viinamaki</a>
@@ -60,6 +60,7 @@ public class BlockMacro extends Block {
         this.name = name;
     }
 
+    @Override
     public String getName() {
         return key;
     }
@@ -68,6 +69,7 @@ public class BlockMacro extends Block {
      * Override to use the macro name, since it is within an #@myMacro() ...
      * #end block that the scope in question would be used.
      */
+    @Override
     public String getScopeName() {
         return name;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Break.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Break.java
index 8adcda445b..ee3bf5b629 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Break.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Break.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -31,18 +31,20 @@ public class Break extends Directive {
 
     /**
      * Return name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
+    @Override
     public String getName() {
         return "break";
     }
 
     /**
      * Return type of this directive.
-     * 
+     *
      * @return The type of this directive.
      */
+    @Override
     public int getType() {
         return LINE;
     }
@@ -51,6 +53,7 @@ public class Break extends Directive {
      * Since there is no processing of content, there is never a need for an
      * internal scope.
      */
+    @Override
     public boolean isScopeProvided() {
         return false;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Define.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Define.java
index d4f54d95b5..08683debf5 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Define.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Define.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -32,6 +32,7 @@ public class Define extends Block {
     /**
      * Return name of this directive.
      */
+    @Override
     public String getName() {
         return "define";
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Directive.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Directive.java
index 49f9892e93..0baaee2eae 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Directive.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Directive.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -41,21 +41,21 @@ public abstract class Directive implements Cloneable {
 
     /**
      * Return the name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
     public abstract String getName();
 
     /**
      * Get the directive type BLOCK/LINE.
-     * 
+     *
      * @return The directive type BLOCK/LINE.
      */
     public abstract int getType();
 
     /**
      * Allows the template location to be set.
-     * 
+     *
      * @param line
      * @param column
      */
@@ -66,7 +66,7 @@ public abstract class Directive implements Cloneable {
 
     /**
      * Allows the template location to be set.
-     * 
+     *
      * @param line
      * @param column
      */
@@ -77,7 +77,7 @@ public abstract class Directive implements Cloneable {
 
     /**
      * for log msg purposes
-     * 
+     *
      * @return The current line for log msg purposes.
      */
     public int getLine() {
@@ -86,7 +86,7 @@ public abstract class Directive implements Cloneable {
 
     /**
      * for log msg purposes
-     * 
+     *
      * @return The current column for log msg purposes.
      */
     public int getColumn() {
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Evaluate.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Evaluate.java
index 2b6bba2a77..ab48ac2392 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Evaluate.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Evaluate.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -31,18 +31,20 @@ public class Evaluate extends Directive {
 
     /**
      * Return name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
+    @Override
     public String getName() {
         return "evaluate";
     }
 
     /**
      * Return type of this directive.
-     * 
+     *
      * @return The type of this directive.
      */
+    @Override
     public int getType() {
         return LINE;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Foreach.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Foreach.java
index 7e60b3257b..715f17f5f0 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Foreach.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Foreach.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -32,18 +32,20 @@ package net.sourceforge.pmd.lang.vm.directive;
 public class Foreach extends Directive {
     /**
      * Return name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
+    @Override
     public String getName() {
         return "foreach";
     }
 
     /**
      * Return type of this directive.
-     * 
+     *
      * @return The type of this directive.
      */
+    @Override
     public int getType() {
         return BLOCK;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Include.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Include.java
index ca65a98c9f..fa6e04fe36 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Include.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Include.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -58,18 +58,20 @@ public class Include extends InputBase {
 
     /**
      * Return name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
+    @Override
     public String getName() {
         return "include";
     }
 
     /**
      * Return type of this directive.
-     * 
+     *
      * @return The type of this directive.
      */
+    @Override
     public int getType() {
         return LINE;
     }
@@ -78,6 +80,7 @@ public class Include extends InputBase {
      * Since there is no processing of content, there is never a need for an
      * internal scope.
      */
+    @Override
     public boolean isScopeProvided() {
         return false;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/InputBase.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/InputBase.java
index a6ee202fba..5c47a5fe36 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/InputBase.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/InputBase.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -30,8 +30,9 @@ package net.sourceforge.pmd.lang.vm.directive;
 public abstract class InputBase extends Directive {
     /**
      * Return name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
+    @Override
     public abstract String getName();
 }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Literal.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Literal.java
index 1683a5db5e..0d81c6c919 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Literal.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Literal.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -30,23 +30,26 @@ package net.sourceforge.pmd.lang.vm.directive;
  * @version $Id: Literal.java 746438 2009-02-21 05:41:24Z nbubna $
  * @deprecated Use the #[[unparsed content]]# syntax instead.
  */
+@Deprecated
 public class Literal extends Directive {
     String literalText;
 
     /**
      * Return name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
+    @Override
     public String getName() {
         return "literal";
     }
 
     /**
      * Return type of this directive.
-     * 
+     *
      * @return The type of this directive.
      */
+    @Override
     public int getType() {
         return BLOCK;
     }
@@ -55,6 +58,7 @@ public class Literal extends Directive {
      * Since there is no processing of content, there is never a need for an
      * internal scope.
      */
+    @Override
     public boolean isScopeProvided() {
         return false;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Macro.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Macro.java
index ff736adea5..1c15e2c6a8 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Macro.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Macro.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -37,18 +37,20 @@ package net.sourceforge.pmd.lang.vm.directive;
 public class Macro extends Directive {
     /**
      * Return name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
+    @Override
     public String getName() {
         return "macro";
     }
 
     /**
      * Return type of this directive.
-     * 
+     *
      * @return The type of this directive.
      */
+    @Override
     public int getType() {
         return BLOCK;
     }
@@ -57,6 +59,7 @@ public class Macro extends Directive {
      * Since this class does no processing of content, there is never a need for
      * an internal scope.
      */
+    @Override
     public boolean isScopeProvided() {
         return false;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Parse.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Parse.java
index 780a0ee2d9..9aa23dfa05 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Parse.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Parse.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -46,9 +46,10 @@ public class Parse extends InputBase {
 
     /**
      * Return name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
+    @Override
     public String getName() {
         return "parse";
     }
@@ -57,15 +58,17 @@ public class Parse extends InputBase {
      * Overrides the default to use "template", so that all templates can use
      * the same scope reference, whether rendered via #parse or direct merge.
      */
+    @Override
     public String getScopeName() {
         return "template";
     }
 
     /**
      * Return type of this directive.
-     * 
+     *
      * @return The type of this directive.
      */
+    @Override
     public int getType() {
         return LINE;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/RuntimeMacro.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/RuntimeMacro.java
index f22a5f9ee0..2b2b513cb6 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/RuntimeMacro.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/RuntimeMacro.java
@@ -26,7 +26,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * actually defined). At render time we check whether there is a implementation
  * for the macro call. If an implementation cannot be found the literal text is
  * rendered.
- * 
+ *
  * @since 1.6
  */
 public class RuntimeMacro extends Directive {
@@ -55,6 +55,7 @@ public class RuntimeMacro extends Directive {
      *
      * @return The name of this Velocimacro.
      */
+    @Override
     public String getName() {
         return macroName;
     }
@@ -65,6 +66,7 @@ public class RuntimeMacro extends Directive {
      * call. The macro name will instead be used as the scope name when defining
      * the body of a BlockMacro.
      */
+    @Override
     public String getScopeName() {
         return "macro";
     }
@@ -74,6 +76,7 @@ public class RuntimeMacro extends Directive {
      *
      * @return The type of this directive.
      */
+    @Override
     public int getType() {
         return LINE;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Stop.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Stop.java
index b12b166246..83a92cb731 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Stop.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/Stop.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -29,18 +29,20 @@ public class Stop extends Directive {
 
     /**
      * Return name of this directive.
-     * 
+     *
      * @return The name of this directive.
      */
+    @Override
     public String getName() {
         return "stop";
     }
 
     /**
      * Return type of this directive.
-     * 
+     *
      * @return The type of this directive.
      */
+    @Override
     public int getType() {
         return LINE;
     }
@@ -49,6 +51,7 @@ public class Stop extends Directive {
      * Since there is no processing of content, there is never a need for an
      * internal scope.
      */
+    @Override
     public boolean isScopeProvided() {
         return false;
     }
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/VelocimacroProxy.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/VelocimacroProxy.java
index 3380b4195c..5f1f79f2a9 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/VelocimacroProxy.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/directive/VelocimacroProxy.java
@@ -17,7 +17,7 @@ package net.sourceforge.pmd.lang.vm.directive;
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 /**
@@ -34,25 +34,27 @@ public class VelocimacroProxy extends Directive {
 
     /**
      * Return name of this Velocimacro.
-     * 
+     *
      * @return The name of this Velocimacro.
      */
+    @Override
     public String getName() {
         return macroName;
     }
 
     /**
      * Velocimacros are always LINE type directives.
-     * 
+     *
      * @return The type of this directive.
      */
+    @Override
     public int getType() {
         return LINE;
     }
 
     /**
      * sets the directive name of this VM
-     * 
+     *
      * @param name
      */
     public void setName(String name) {
@@ -61,7 +63,7 @@ public class VelocimacroProxy extends Directive {
 
     /**
      * sets the array of arguments specified in the macro definition
-     * 
+     *
      * @param arr
      */
     public void setArgArray(String[] arr) {
@@ -74,7 +76,7 @@ public class VelocimacroProxy extends Directive {
 
     /**
      * returns the number of ars needed for this VM
-     * 
+     *
      * @return The number of ars needed for this VM
      */
     public int getNumArgs() {
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/rule/design/AvoidDeeplyNestedIfStmtsRule.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/rule/design/AvoidDeeplyNestedIfStmtsRule.java
index 281dc1442b..ceff76e81e 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/rule/design/AvoidDeeplyNestedIfStmtsRule.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/rule/design/AvoidDeeplyNestedIfStmtsRule.java
@@ -16,7 +16,7 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractVmRule {
     private int depth;
     private int depthLimit;
 
-    private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR 
+    private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR
             = IntegerProperty.named("problemDepth")
                              .desc("The if statement depth reporting threshold")
                              .range(1, 25).defaultValue(3).uiOrder(1.0f).build();
@@ -25,16 +25,19 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractVmRule {
         definePropertyDescriptor(PROBLEM_DEPTH_DESCRIPTOR);
     }
 
+    @Override
     public Object visit(ASTprocess node, Object data) {
         depth = 0;
         depthLimit = getProperty(PROBLEM_DEPTH_DESCRIPTOR);
         return super.visit(node, data);
     }
 
+    @Override
     public Object visit(ASTIfStatement node, Object data) {
         return handleIf(node, data);
     }
 
+    @Override
     public Object visit(ASTElseIfStatement node, Object data) {
         return handleIf(node, data);
     }
diff --git a/pmd-xml/pmd-xml-ruleset.xml b/pmd-xml/pmd-xml-ruleset.xml
new file mode 100644
index 0000000000..0f3c99bfed
--- /dev/null
+++ b/pmd-xml/pmd-xml-ruleset.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<ruleset name="dogfood-without-missing-override" 
+    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+    <description>Rules to check PMD itself.</description>
+
+    <rule ref="net/sourceforge/pmd/pmd-dogfood-config.xml">
+        <!-- Disable rule MissingOverride, see https://github.com/pmd/pmd/issues/1074 -->
+        <exclude name="MissingOverride"/>
+    </rule>
+
+</ruleset>
\ No newline at end of file
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index 3caf30129d..2193f89a27 100644
--- a/pmd-xml/pom.xml
+++ b/pmd-xml/pom.xml
@@ -51,6 +51,17 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- Disable rule MissingOverride, see https://github.com/pmd/pmd/issues/1074 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <configuration>
+                    <rulesets>
+                        <ruleset>pmd-xml-ruleset.xml</ruleset>
+                    </rulesets>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlHandler.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlHandler.java
index 65d6c528cf..f8591b418b 100644
--- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlHandler.java
+++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlHandler.java
@@ -28,6 +28,7 @@ public class XmlHandler extends AbstractLanguageVersionHandler {
         return new DefaultASTXPathHandler();
     }
 
+    @Override
     public RuleViolationFactory getRuleViolationFactory() {
         return XmlRuleViolationFactory.INSTANCE;
     }
@@ -37,6 +38,7 @@ public class XmlHandler extends AbstractLanguageVersionHandler {
         return new XmlParserOptions();
     }
 
+    @Override
     public Parser getParser(ParserOptions parserOptions) {
         return new XmlParser(parserOptions);
     }
@@ -44,6 +46,7 @@ public class XmlHandler extends AbstractLanguageVersionHandler {
     @Override
     public VisitorStarter getDumpFacade(final Writer writer, final String prefix, final boolean recurse) {
         return new VisitorStarter() {
+            @Override
             public void start(Node rootNode) {
                 new DumpFacade().initializeWith(writer, prefix, recurse, (XmlNode) rootNode);
             }
diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParser.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParser.java
index 989b877bf7..8d72efcad7 100644
--- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParser.java
+++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParser.java
@@ -28,14 +28,17 @@ public class XmlParser extends AbstractParser {
         return null;
     }
 
+    @Override
     public boolean canParse() {
         return true;
     }
 
+    @Override
     public Node parse(String fileName, Reader source) throws ParseException {
         return new net.sourceforge.pmd.lang.xml.ast.XmlParser((XmlParserOptions) parserOptions).parse(source);
     }
 
+    @Override
     public Map<Integer, String> getSuppressMap() {
         return new HashMap<>(); // FIXME
     }
diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParserOptions.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParserOptions.java
index a8c466e3e6..bf7280761f 100644
--- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParserOptions.java
+++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParserOptions.java
@@ -43,6 +43,7 @@ public class XmlParserOptions extends ParserOptions {
             "Specifies whether XML parser will attempt to lookup the DTD.", Boolean.FALSE, 10.0f);
 
     public static final EntityResolver SILENT_ENTITY_RESOLVER = new EntityResolver() {
+        @Override
         public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
             return new InputSource(new ByteArrayInputStream("".getBytes()));
         }
@@ -81,7 +82,7 @@ public class XmlParserOptions extends ParserOptions {
     }
 
     /**
-     * 
+     *
      * @return the configured entity resolver. If {@link #lookupDescriptorDoc}
      *         is false it would normally force the XML parser to use its own
      *         resolver
diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/XmlNode.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/XmlNode.java
index 0cc4ee451a..7c43a09e36 100644
--- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/XmlNode.java
+++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/XmlNode.java
@@ -19,7 +19,7 @@ public interface XmlNode extends Node, AttributeNode {
 
     /**
      * Provide access to the underlying DOM node.
-     * 
+     *
      * @return The DOM node.
      */
     org.w3c.dom.Node getNode();
diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/XmlNodeWrapper.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/XmlNodeWrapper.java
index bf9c1cad6e..a3fd69ad25 100644
--- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/XmlNodeWrapper.java
+++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/ast/XmlNodeWrapper.java
@@ -243,7 +243,7 @@ public class XmlNodeWrapper extends AbstractDomNodeProxy implements XmlNode {
         // iterators.add(new AttributeAxisIterator((net.sourceforge.pmd.lang.ast.Node) p));
 
         @SuppressWarnings("unchecked")
-        Iterator<Attribute>[] it = (Iterator<Attribute>[]) new Iterator[iterators.size()];
+        Iterator<Attribute>[] it = new Iterator[iterators.size()];
 
         return new CompoundIterator<>(iterators.toArray(it));
     }
diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/AbstractXmlRule.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/AbstractXmlRule.java
index 7bd2b3fda3..0eaea880bf 100644
--- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/AbstractXmlRule.java
+++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/AbstractXmlRule.java
@@ -58,6 +58,7 @@ public class AbstractXmlRule extends AbstractRule implements ImmutableLanguage {
         return new XmlParserOptions(this);
     }
 
+    @Override
     public void apply(List<? extends Node> nodes, RuleContext ctx) {
         visitAll(nodes, ctx);
     }
diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/XmlRuleChainVisitor.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/XmlRuleChainVisitor.java
index bfed6a2e43..0962c9ebea 100644
--- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/XmlRuleChainVisitor.java
+++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/XmlRuleChainVisitor.java
@@ -16,6 +16,7 @@ import net.sourceforge.pmd.lang.rule.XPathRule;
 
 public class XmlRuleChainVisitor extends AbstractRuleChainVisitor {
 
+    @Override
     protected void indexNodes(List<Node> nodes, RuleContext ctx) {
         // Visit Nodes in DFS order
         Stack<Node> stack = new Stack<>();
@@ -32,6 +33,7 @@ public class XmlRuleChainVisitor extends AbstractRuleChainVisitor {
         }
     }
 
+    @Override
     protected void visit(Rule rule, Node node, RuleContext ctx) {
         // Rule better be a XPathRule
         ((XPathRule) rule).evaluate(node, ctx);
diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/XmlRuleViolationFactory.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/XmlRuleViolationFactory.java
index 5eb52620bf..190ec2152a 100644
--- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/XmlRuleViolationFactory.java
+++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/rule/XmlRuleViolationFactory.java
@@ -25,6 +25,7 @@ public final class XmlRuleViolationFactory extends AbstractRuleViolationFactory
         return new ParametricRuleViolation<>(rule, ruleContext, (XmlNode) node, message);
     }
 
+    @Override
     protected RuleViolation createRuleViolation(Rule rule, RuleContext ruleContext, Node node, String message,
             int beginLine, int endLine) {
         return null; // FIXME