Acceptable tokens are specified for all checks, issue #342

src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java

@@ -309,21 +309,14 @@ public final class TreeWalker
             final int[] acceptableTokens = check.getAcceptableTokens();
             Arrays.sort(acceptableTokens);
             for (String token : checkTokens) {
-                try {
-                    final int tokenId = TokenTypes.getTokenId(token);
-                    if (Arrays.binarySearch(acceptableTokens, tokenId) >= 0) {
-                        registerCheck(token, check);
-                    }
-                    else {
-                        throw new IllegalArgumentException("Token \""
-                            + token + "\" was not found in Acceptable tokens list"
-                                    + " in check " + check);
-                    }
+                final int tokenId = TokenTypes.getTokenId(token);
+                if (Arrays.binarySearch(acceptableTokens, tokenId) >= 0) {
+                    registerCheck(token, check);
                 }
-                catch (final IllegalArgumentException ex) {
+                else {
                     throw new CheckstyleException("Token \""
                         + token + "\" was not found in Acceptable tokens list"
-                                + " in check " + check, ex);
+                                + " in check " + check);
                 }
             }
         }

src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java

@@ -41,6 +41,12 @@ public class ArrayTypeStyleCheck extends Check
         return new int[] {TokenTypes.ARRAY_DECLARATOR};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.ARRAY_DECLARATOR};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java

@@ -202,6 +202,12 @@ public class AvoidEscapedUnicodeCharactersCheck
         return new int[] {TokenTypes.STRING_LITERAL, TokenTypes.CHAR_LITERAL};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.STRING_LITERAL, TokenTypes.CHAR_LITERAL};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.java

@@ -54,6 +54,15 @@ public class OuterTypeFilenameCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF,
+            TokenTypes.ENUM_DEF, TokenTypes.ANNOTATION_DEF,
+        };
+    }
+
     @Override
     public void beginTree(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java

@@ -85,6 +85,12 @@ public class TodoCommentCheck
         return new int[] {TokenTypes.COMMENT_CONTENT };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.COMMENT_CONTENT };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java

@@ -85,6 +85,16 @@ public class UncommentedMainCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.METHOD_DEF,
+            TokenTypes.CLASS_DEF,
+            TokenTypes.PACKAGE_DEF,
+        };
+    }
+
     @Override
     public int[] getRequiredTokens()
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java

@@ -55,6 +55,12 @@ public class UpperEllCheck extends Check
         return new int[] {TokenTypes.NUM_LONG};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.NUM_LONG};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java

@@ -182,6 +182,28 @@ public class AnnotationLocationCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CLASS_DEF,
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.CTOR_DEF,
+            TokenTypes.VARIABLE_DEF,
+            TokenTypes.PARAMETER_DEF,
+            TokenTypes.ANNOTATION_DEF,
+            TokenTypes.TYPECAST,
+            TokenTypes.LITERAL_THROWS,
+            TokenTypes.IMPLEMENTS_CLAUSE,
+            TokenTypes.TYPE_ARGUMENT,
+            TokenTypes.LITERAL_NEW,
+            TokenTypes.DOT,
+            TokenTypes.ANNOTATION_FIELD_DEF,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.java

@@ -104,6 +104,12 @@ public class AvoidNestedBlocksCheck extends Check
         return new int[] {TokenTypes.SLIST};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.SLIST};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java

@@ -117,6 +117,28 @@ public class EmptyBlockCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.LITERAL_WHILE,
+            TokenTypes.LITERAL_TRY,
+            TokenTypes.LITERAL_CATCH,
+            TokenTypes.LITERAL_FINALLY,
+            TokenTypes.LITERAL_DO,
+            TokenTypes.LITERAL_IF,
+            TokenTypes.LITERAL_ELSE,
+            TokenTypes.LITERAL_FOR,
+            TokenTypes.INSTANCE_INIT,
+            TokenTypes.STATIC_INIT,
+            TokenTypes.LITERAL_SWITCH,
+            TokenTypes.LITERAL_CASE,
+            TokenTypes.LITERAL_SWITCH,
+            TokenTypes.LITERAL_DEFAULT,
+            TokenTypes.ARRAY_INIT,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java

@@ -147,6 +147,30 @@ public class LeftCurlyCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.CLASS_DEF,
+            TokenTypes.ANNOTATION_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.CTOR_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.ENUM_CONSTANT_DEF,
+            TokenTypes.LITERAL_WHILE,
+            TokenTypes.LITERAL_TRY,
+            TokenTypes.LITERAL_CATCH,
+            TokenTypes.LITERAL_FINALLY,
+            TokenTypes.LITERAL_SYNCHRONIZED,
+            TokenTypes.LITERAL_SWITCH,
+            TokenTypes.LITERAL_DO,
+            TokenTypes.LITERAL_IF,
+            TokenTypes.LITERAL_ELSE,
+            TokenTypes.LITERAL_FOR,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java

@@ -96,6 +96,21 @@ public class NeedBracesCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.LITERAL_DO,
+            TokenTypes.LITERAL_ELSE,
+            TokenTypes.LITERAL_FOR,
+            TokenTypes.LITERAL_IF,
+            TokenTypes.LITERAL_WHILE,
+            TokenTypes.LITERAL_CASE,
+            TokenTypes.LITERAL_DEFAULT,
+            TokenTypes.LAMBDA,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractIllegalMethodCheck.java

@@ -51,6 +51,12 @@ public abstract class AbstractIllegalMethodCheck extends Check
         return new int[] {TokenTypes.METHOD_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.METHOD_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST aAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java

@@ -101,6 +101,15 @@ public abstract class AbstractSuperCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.METHOD_DEF,
+            TokenTypes.LITERAL_SUPER,
+        };
+    }
+
     /**
      * Returns the name of the overriding method.
      * @return the name of the overriding method.

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java

@@ -46,6 +46,12 @@ public class ArrayTrailingCommaCheck extends Check
         return new int[] {TokenTypes.ARRAY_INIT};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.ARRAY_INIT};
+    }
+
     @Override
     public void visitToken(DetailAST arrayInit)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java

@@ -50,6 +50,12 @@ public class AvoidInlineConditionalsCheck extends Check
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[]{TokenTypes.QUESTION};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java

@@ -58,6 +58,12 @@ public class CovariantEqualsCheck extends Check
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.CLASS_DEF, TokenTypes.LITERAL_NEW, };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java

@@ -104,6 +104,17 @@ public class DeclarationOrderCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CTOR_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.MODIFIERS,
+            TokenTypes.OBJBLOCK,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.java

@@ -51,6 +51,12 @@ public class EmptyStatementCheck extends Check
         return new int[] {TokenTypes.EMPTY_STAT};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.EMPTY_STAT};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java

@@ -97,6 +97,12 @@ public class EqualsAvoidNullCheck extends Check
         return new int[] {TokenTypes.METHOD_CALL};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.METHOD_CALL};
+    }
+
     @Override
     public void visitToken(final DetailAST methodCall)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java

@@ -64,6 +64,12 @@ public class EqualsHashCodeCheck
         return new int[] {TokenTypes.METHOD_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.METHOD_DEF};
+    }
+
     @Override
     public void beginTree(DetailAST rootAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java

@@ -62,6 +62,12 @@ public class ExplicitInitializationCheck extends Check
         return getDefaultTokens();
     }
 
+    @Override
+    public final int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.VARIABLE_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java

@@ -92,6 +92,12 @@ public class FallThroughCheck extends Check
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[]{TokenTypes.CASE_GROUP};
+    }
+
     /**
      * Set the relief pattern.
      *

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.java

@@ -57,6 +57,12 @@ public final class IllegalCatchCheck extends AbstractIllegalCheck
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.LITERAL_CATCH};
+    }
+
     @Override
     public void visitToken(DetailAST detailAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java

@@ -84,6 +84,12 @@ public final class IllegalThrowsCheck extends AbstractIllegalCheck
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.LITERAL_THROWS};
+    }
+
     @Override
     public void visitToken(DetailAST detailAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java

@@ -147,6 +147,17 @@ public final class IllegalTypeCheck extends AbstractFormatCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.VARIABLE_DEF,
+            TokenTypes.PARAMETER_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.IMPORT,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java

@@ -117,6 +117,25 @@ public class InnerAssignmentCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.ASSIGN,            // '='
+            TokenTypes.DIV_ASSIGN,        // "/="
+            TokenTypes.PLUS_ASSIGN,       // "+="
+            TokenTypes.MINUS_ASSIGN,      //"-="
+            TokenTypes.STAR_ASSIGN,       // "*="
+            TokenTypes.MOD_ASSIGN,        // "%="
+            TokenTypes.SR_ASSIGN,         // ">>="
+            TokenTypes.BSR_ASSIGN,        // ">>>="
+            TokenTypes.SL_ASSIGN,         // "<<="
+            TokenTypes.BXOR_ASSIGN,       // "^="
+            TokenTypes.BOR_ASSIGN,        // "|="
+            TokenTypes.BAND_ASSIGN,       // "&="
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java

@@ -84,6 +84,17 @@ public class MagicNumberCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.NUM_DOUBLE,
+            TokenTypes.NUM_FLOAT,
+            TokenTypes.NUM_INT,
+            TokenTypes.NUM_LONG,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java

@@ -69,6 +69,33 @@ public final class ModifiedControlVariableCheck extends Check
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.OBJBLOCK,
+            TokenTypes.LITERAL_FOR,
+            TokenTypes.FOR_ITERATOR,
+            TokenTypes.FOR_EACH_CLAUSE,
+            TokenTypes.ASSIGN,
+            TokenTypes.PLUS_ASSIGN,
+            TokenTypes.MINUS_ASSIGN,
+            TokenTypes.STAR_ASSIGN,
+            TokenTypes.DIV_ASSIGN,
+            TokenTypes.MOD_ASSIGN,
+            TokenTypes.SR_ASSIGN,
+            TokenTypes.BSR_ASSIGN,
+            TokenTypes.SL_ASSIGN,
+            TokenTypes.BAND_ASSIGN,
+            TokenTypes.BXOR_ASSIGN,
+            TokenTypes.BOR_ASSIGN,
+            TokenTypes.INC,
+            TokenTypes.POST_INC,
+            TokenTypes.DEC,
+            TokenTypes.POST_DEC,
+        };
+    }
+
     @Override
     public void beginTree(DetailAST rootAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java

@@ -114,6 +114,12 @@ public class MultipleStringLiteralsCheck extends Check
         return new int[] {TokenTypes.STRING_LITERAL};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.STRING_LITERAL};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java

@@ -55,6 +55,12 @@ public class MultipleVariableDeclarationsCheck extends Check
         return new int[] {TokenTypes.VARIABLE_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.VARIABLE_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.java

@@ -57,6 +57,12 @@ public final class NestedForDepthCheck extends AbstractNestedDepthCheck
         return new int[] {TokenTypes.LITERAL_FOR};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.LITERAL_FOR};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java

@@ -44,6 +44,12 @@ public final class NestedIfDepthCheck extends AbstractNestedDepthCheck
         return new int[] {TokenTypes.LITERAL_IF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.LITERAL_IF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.java

@@ -42,6 +42,12 @@ public final class NestedTryDepthCheck extends AbstractNestedDepthCheck
         return new int[] {TokenTypes.LITERAL_TRY};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.LITERAL_TRY};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java

@@ -48,6 +48,15 @@ public final class OneStatementPerLineCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.EXPR, TokenTypes.SEMI, TokenTypes.FOR_INIT,
+            TokenTypes.FOR_ITERATOR,
+        };
+    }
+
     @Override
     public void beginTree(DetailAST rootAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.java

@@ -57,6 +57,14 @@ public class OverloadMethodsDeclarationOrderCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.OBJBLOCK,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.java

@@ -47,6 +47,12 @@ public final class PackageDeclarationCheck extends Check
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.PACKAGE_DEF};
+    }
+
     @Override
     public void beginTree(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.java

@@ -78,6 +78,31 @@ public final class ParameterAssignmentCheck extends Check
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CTOR_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.ASSIGN,
+            TokenTypes.PLUS_ASSIGN,
+            TokenTypes.MINUS_ASSIGN,
+            TokenTypes.STAR_ASSIGN,
+            TokenTypes.DIV_ASSIGN,
+            TokenTypes.MOD_ASSIGN,
+            TokenTypes.SR_ASSIGN,
+            TokenTypes.BSR_ASSIGN,
+            TokenTypes.SL_ASSIGN,
+            TokenTypes.BAND_ASSIGN,
+            TokenTypes.BXOR_ASSIGN,
+            TokenTypes.BOR_ASSIGN,
+            TokenTypes.INC,
+            TokenTypes.POST_INC,
+            TokenTypes.DEC,
+            TokenTypes.POST_DEC,
+        };
+    }
+
     @Override
     public void beginTree(DetailAST rootAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java

@@ -119,6 +119,14 @@ public class RequireThisCheck extends DeclarationCollector
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.IDENT,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java

@@ -74,6 +74,16 @@ public final class ReturnCountCheck extends AbstractFormatCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CTOR_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.LITERAL_RETURN,
+        };
+    }
+
     /**
      * Getter for max property.
      * @return maximum allowed number of return statements.

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.java

@@ -47,6 +47,12 @@ public class SimplifyBooleanReturnCheck
         return new int[] {TokenTypes.LITERAL_IF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.LITERAL_IF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.java

@@ -43,6 +43,12 @@ public class StringLiteralEqualityCheck extends Check
         return new int[] {TokenTypes.EQUAL, TokenTypes.NOT_EQUAL};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.EQUAL, TokenTypes.NOT_EQUAL};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.java

@@ -123,6 +123,35 @@ public class UnnecessaryParenthesesCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.EXPR,
+            TokenTypes.IDENT,
+            TokenTypes.NUM_DOUBLE,
+            TokenTypes.NUM_FLOAT,
+            TokenTypes.NUM_INT,
+            TokenTypes.NUM_LONG,
+            TokenTypes.STRING_LITERAL,
+            TokenTypes.LITERAL_NULL,
+            TokenTypes.LITERAL_FALSE,
+            TokenTypes.LITERAL_TRUE,
+            TokenTypes.ASSIGN,
+            TokenTypes.BAND_ASSIGN,
+            TokenTypes.BOR_ASSIGN,
+            TokenTypes.BSR_ASSIGN,
+            TokenTypes.BXOR_ASSIGN,
+            TokenTypes.DIV_ASSIGN,
+            TokenTypes.MINUS_ASSIGN,
+            TokenTypes.MOD_ASSIGN,
+            TokenTypes.PLUS_ASSIGN,
+            TokenTypes.SL_ASSIGN,
+            TokenTypes.SR_ASSIGN,
+            TokenTypes.STAR_ASSIGN,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java

@@ -252,6 +252,12 @@ public class VariableDeclarationUsageDistanceCheck extends Check
         return new int[] {TokenTypes.VARIABLE_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.VARIABLE_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java

@@ -63,6 +63,12 @@ public class DesignForExtensionCheck extends Check
         return new int[] {TokenTypes.METHOD_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.METHOD_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java

@@ -49,6 +49,12 @@ public class FinalClassCheck
         return new int[]{TokenTypes.CLASS_DEF, TokenTypes.CTOR_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[]{TokenTypes.CLASS_DEF, TokenTypes.CTOR_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java

@@ -40,6 +40,12 @@ public class HideUtilityClassConstructorCheck extends Check
         return new int[] {TokenTypes.CLASS_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.CLASS_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java

@@ -39,6 +39,12 @@ public class InnerTypeLastCheck extends Check
         return new int[] {TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF};
+    }
+
     /** Meet a root class. */
     private boolean rootClass = true;
 

src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.java

@@ -58,6 +58,12 @@ public final class InterfaceIsTypeCheck
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.INTERFACE_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java

@@ -75,6 +75,12 @@ public final class MutableExceptionCheck extends AbstractFormatCheck
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.CLASS_DEF, TokenTypes.VARIABLE_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java

@@ -68,6 +68,14 @@ public final class ThrowsCountCheck extends Check
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.LITERAL_THROWS,
+        };
+    }
+
     /**
      * Getter for max property.
      * @return maximum allowed throws statements.

src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java

@@ -128,6 +128,12 @@ public class VisibilityModifierCheck
         return new int[] {TokenTypes.VARIABLE_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.VARIABLE_DEF, TokenTypes.OBJBLOCK};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java

@@ -80,6 +80,12 @@ public class AvoidStarImportCheck
         return new int[] {TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT};
+    }
+
     /**
      * Sets the list of packages or classes to be exempt from the check.
      * The excludes can contain a .* or not.

src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java

@@ -74,6 +74,12 @@ public class AvoidStaticImportCheck
         return new int[] {TokenTypes.STATIC_IMPORT};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.STATIC_IMPORT};
+    }
+
     /**
      * Sets the list of classes or static members to be exempt from the check.
      * @param excludes a list of fully-qualified class names/specific

src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java

@@ -296,6 +296,16 @@ public class CustomImportOrderCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.IMPORT,
+            TokenTypes.STATIC_IMPORT,
+            TokenTypes.PACKAGE_DEF,
+        };
+    }
+
     @Override
     public void beginTree(DetailAST rootAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java

@@ -87,6 +87,12 @@ public class IllegalImportCheck
         return new int[] {TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java

@@ -61,6 +61,13 @@ public class ImportControlCheck extends Check
                           TokenTypes.STATIC_IMPORT, };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.PACKAGE_DEF, TokenTypes.IMPORT,
+                          TokenTypes.STATIC_IMPORT, };
+    }
+
     @Override
     public void beginTree(final DetailAST rootAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java

@@ -203,6 +203,12 @@ public class ImportOrderCheck
         return new int[] {TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.IMPORT, TokenTypes.STATIC_IMPORT};
+    }
+
     @Override
     public void beginTree(DetailAST rootAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.java

@@ -78,6 +78,15 @@ public class RedundantImportCheck
          TokenTypes.PACKAGE_DEF, };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[]
+        {TokenTypes.IMPORT,
+         TokenTypes.STATIC_IMPORT,
+         TokenTypes.PACKAGE_DEF, };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java

@@ -111,7 +111,7 @@ public class UnusedImportsCheck extends Check
             TokenTypes.IDENT,
             TokenTypes.IMPORT,
             TokenTypes.STATIC_IMPORT,
-            // Definitions that may contain Javdoc...
+            // Definitions that may contain Javadoc...
             TokenTypes.PACKAGE_DEF,
             TokenTypes.ANNOTATION_DEF,
             TokenTypes.ANNOTATION_FIELD_DEF,
@@ -131,6 +131,27 @@ public class UnusedImportsCheck extends Check
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.IDENT,
+            TokenTypes.IMPORT,
+            TokenTypes.STATIC_IMPORT,
+            // Definitions that may contain Javadoc...
+            TokenTypes.PACKAGE_DEF,
+            TokenTypes.ANNOTATION_DEF,
+            TokenTypes.ANNOTATION_FIELD_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.ENUM_CONSTANT_DEF,
+            TokenTypes.CLASS_DEF,
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.CTOR_DEF,
+            TokenTypes.VARIABLE_DEF,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java

@@ -112,6 +112,23 @@ public class JavadocStyleCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.CLASS_DEF,
+            TokenTypes.ANNOTATION_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.CTOR_DEF,
+            TokenTypes.VARIABLE_DEF,
+            TokenTypes.ENUM_CONSTANT_DEF,
+            TokenTypes.ANNOTATION_FIELD_DEF,
+            TokenTypes.PACKAGE_DEF,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java

@@ -147,6 +147,17 @@ public class JavadocTypeCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.CLASS_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.ANNOTATION_DEF,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java

@@ -100,6 +100,15 @@ public class JavadocVariableCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.VARIABLE_DEF,
+            TokenTypes.ENUM_CONSTANT_DEF,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.java

@@ -74,6 +74,21 @@ public final class BooleanExpressionComplexityCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CTOR_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.EXPR,
+            TokenTypes.LAND,
+            TokenTypes.BAND,
+            TokenTypes.LOR,
+            TokenTypes.BOR,
+            TokenTypes.BXOR,
+        };
+    }
+
     /**
      * Getter for maximum allowed complexity.
      * @return value of maximum allowed complexity.

src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java

@@ -52,6 +52,18 @@ public final class ClassDataAbstractionCouplingCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.PACKAGE_DEF,
+            TokenTypes.CLASS_DEF,
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.LITERAL_NEW,
+        };
+    }
+
     @Override
     protected String getLogMessageId()
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java

@@ -54,6 +54,21 @@ public final class ClassFanOutComplexityCheck extends AbstractClassCouplingCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.PACKAGE_DEF,
+            TokenTypes.CLASS_DEF,
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.TYPE,
+            TokenTypes.LITERAL_NEW,
+            TokenTypes.LITERAL_THROWS,
+            TokenTypes.ANNOTATION_DEF,
+        };
+    }
+
     @Override
     protected String getLogMessageId()
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.java

@@ -66,6 +66,26 @@ public class CyclomaticComplexityCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CTOR_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.INSTANCE_INIT,
+            TokenTypes.STATIC_INIT,
+            TokenTypes.LITERAL_WHILE,
+            TokenTypes.LITERAL_DO,
+            TokenTypes.LITERAL_FOR,
+            TokenTypes.LITERAL_IF,
+            TokenTypes.LITERAL_CASE,
+            TokenTypes.LITERAL_CATCH,
+            TokenTypes.QUESTION,
+            TokenTypes.LAND,
+            TokenTypes.LOR,
+        };
+    }
+
     @Override
     protected final void visitTokenHook(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java

@@ -128,6 +128,41 @@ public class JavaNCSSCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[]{
+            TokenTypes.CLASS_DEF,
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.CTOR_DEF,
+            TokenTypes.INSTANCE_INIT,
+            TokenTypes.STATIC_INIT,
+            TokenTypes.PACKAGE_DEF,
+            TokenTypes.IMPORT,
+            TokenTypes.VARIABLE_DEF,
+            TokenTypes.CTOR_CALL,
+            TokenTypes.SUPER_CTOR_CALL,
+            TokenTypes.LITERAL_IF,
+            TokenTypes.LITERAL_ELSE,
+            TokenTypes.LITERAL_WHILE,
+            TokenTypes.LITERAL_DO,
+            TokenTypes.LITERAL_FOR,
+            TokenTypes.LITERAL_SWITCH,
+            TokenTypes.LITERAL_BREAK,
+            TokenTypes.LITERAL_CONTINUE,
+            TokenTypes.LITERAL_RETURN,
+            TokenTypes.LITERAL_THROW,
+            TokenTypes.LITERAL_SYNCHRONIZED,
+            TokenTypes.LITERAL_CATCH,
+            TokenTypes.LITERAL_FINALLY,
+            TokenTypes.EXPR,
+            TokenTypes.LABELED_STAT,
+            TokenTypes.LITERAL_CASE,
+            TokenTypes.LITERAL_DEFAULT,
+        };
+    }
+
     @Override
     public void beginTree(DetailAST rootAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.java

@@ -67,6 +67,27 @@ public final class NPathComplexityCheck extends AbstractComplexityCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CTOR_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.STATIC_INIT,
+            TokenTypes.INSTANCE_INIT,
+            TokenTypes.LITERAL_WHILE,
+            TokenTypes.LITERAL_DO,
+            TokenTypes.LITERAL_FOR,
+            TokenTypes.LITERAL_IF,
+            TokenTypes.LITERAL_ELSE,
+            TokenTypes.LITERAL_SWITCH,
+            TokenTypes.LITERAL_CASE,
+            TokenTypes.LITERAL_TRY,
+            TokenTypes.LITERAL_CATCH,
+            TokenTypes.QUESTION,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.java

@@ -81,6 +81,12 @@ public class ModifierOrderCheck
         return new int[] {TokenTypes.MODIFIERS};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.MODIFIERS};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java

@@ -51,6 +51,17 @@ public class RedundantModifierCheck
         return new int[] {};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.METHOD_DEF,
+            TokenTypes.VARIABLE_DEF,
+            TokenTypes.ANNOTATION_FIELD_DEF,
+            TokenTypes.INTERFACE_DEF,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java

@@ -182,6 +182,22 @@ public class AbbreviationAsWordInNameCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CLASS_DEF,
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.ANNOTATION_DEF,
+            TokenTypes.ANNOTATION_FIELD_DEF,
+            TokenTypes.PARAMETER_DEF,
+            TokenTypes.VARIABLE_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.ENUM_CONSTANT_DEF,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java

@@ -85,12 +85,16 @@ public final class AbstractClassNameCheck extends AbstractFormatCheck
         return getDefaultTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[]{TokenTypes.CLASS_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {
-        if (TokenTypes.CLASS_DEF == ast.getType()) {
-            visitClassDef(ast);
-        }
+        visitClassDef(ast);
     }
 
     /**

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractTypeParameterNameCheck.java

@@ -55,6 +55,14 @@ public abstract class AbstractTypeParameterNameCheck
         };
     }
 
+    @Override
+    public final int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.TYPE_PARAMETER,
+        };
+    }
+
     @Override
     public final void init()
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java

@@ -69,6 +69,12 @@ public class ConstantNameCheck
         return new int[] {TokenTypes.VARIABLE_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.VARIABLE_DEF};
+    }
+
     @Override
     protected final boolean mustCheckName(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.java

@@ -67,6 +67,15 @@ public class LocalFinalVariableNameCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.VARIABLE_DEF,
+            TokenTypes.PARAMETER_DEF,
+        };
+    }
+
     @Override
     protected final boolean mustCheckName(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.java

@@ -103,6 +103,15 @@ public class LocalVariableNameCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.VARIABLE_DEF,
+            TokenTypes.PARAMETER_DEF,
+        };
+    }
+
     @Override
     protected final boolean mustCheckName(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java

@@ -64,6 +64,12 @@ public class MemberNameCheck
         return new int[] {TokenTypes.VARIABLE_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.VARIABLE_DEF};
+    }
+
     @Override
     protected final boolean mustCheckName(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java

@@ -100,6 +100,12 @@ public class MethodNameCheck
         return new int[] {TokenTypes.METHOD_DEF, };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.METHOD_DEF, };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.java

@@ -80,6 +80,12 @@ public class PackageNameCheck
         return new int[] {TokenTypes.PACKAGE_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.PACKAGE_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java

@@ -64,6 +64,12 @@ public class ParameterNameCheck
         return new int[] {TokenTypes.PARAMETER_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.PARAMETER_DEF};
+    }
+
     @Override
     protected boolean mustCheckName(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java

@@ -62,6 +62,12 @@ public class StaticVariableNameCheck
         return new int[] {TokenTypes.VARIABLE_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.VARIABLE_DEF};
+    }
+
     @Override
     protected final boolean mustCheckName(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java

@@ -71,4 +71,14 @@ public class TypeNameCheck
                           TokenTypes.ANNOTATION_DEF,
         };
     }
+
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.CLASS_DEF,
+                          TokenTypes.INTERFACE_DEF,
+                          TokenTypes.ENUM_DEF,
+                          TokenTypes.ANNOTATION_DEF,
+        };
+    }
 }

src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.java

@@ -69,6 +69,12 @@ public class AnonInnerLengthCheck extends Check
         return new int[] {TokenTypes.LITERAL_NEW};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.LITERAL_NEW};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java

@@ -67,6 +67,18 @@ public final class ExecutableStatementCountCheck
         return new int[] {TokenTypes.SLIST};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CTOR_DEF,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.INSTANCE_INIT,
+            TokenTypes.STATIC_INIT,
+            TokenTypes.SLIST,
+        };
+    }
+
     /**
      * Gets the maximum threshold.
      * @return the maximum threshold.

src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java

@@ -119,6 +119,18 @@ public final class MethodCountCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CLASS_DEF,
+            TokenTypes.ENUM_CONSTANT_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.METHOD_DEF,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java

@@ -70,6 +70,12 @@ public class MethodLengthCheck extends Check
         return new int[] {TokenTypes.METHOD_DEF, TokenTypes.CTOR_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.METHOD_DEF, TokenTypes.CTOR_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.java

@@ -42,6 +42,13 @@ public class OuterTypeNumberCheck extends Check
             TokenTypes.ENUM_DEF, TokenTypes.ANNOTATION_DEF, };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF,
+            TokenTypes.ENUM_DEF, TokenTypes.ANNOTATION_DEF, };
+    }
+
     @Override
     public void beginTree(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java

@@ -106,6 +106,12 @@ public class ParameterNumberCheck
         return new int[] {TokenTypes.METHOD_DEF, TokenTypes.CTOR_DEF};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.METHOD_DEF, TokenTypes.CTOR_DEF};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java

@@ -65,6 +65,13 @@ public class EmptyForInitializerPadCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.FOR_INIT,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.java

@@ -65,6 +65,13 @@ public class EmptyForIteratorPadCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.FOR_ITERATOR,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java

@@ -202,6 +202,23 @@ public class EmptyLineSeparatorCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.PACKAGE_DEF,
+            TokenTypes.IMPORT,
+            TokenTypes.CLASS_DEF,
+            TokenTypes.INTERFACE_DEF,
+            TokenTypes.ENUM_DEF,
+            TokenTypes.STATIC_INIT,
+            TokenTypes.INSTANCE_INIT,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.CTOR_DEF,
+            TokenTypes.VARIABLE_DEF,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java

@@ -75,6 +75,12 @@ public class GenericWhitespaceCheck extends Check
         return new int[] {TokenTypes.GENERIC_START, TokenTypes.GENERIC_END};
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.GENERIC_START, TokenTypes.GENERIC_END};
+    }
+
     @Override
     public void beginTree(DetailAST rootAST)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java

@@ -89,6 +89,18 @@ public class MethodParamPadCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.CTOR_DEF,
+            TokenTypes.LITERAL_NEW,
+            TokenTypes.METHOD_CALL,
+            TokenTypes.METHOD_DEF,
+            TokenTypes.SUPER_CTOR_CALL,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java

@@ -75,6 +75,17 @@ public class ParenPadCheck extends AbstractParenPadCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.RPAREN,
+                          TokenTypes.LPAREN,
+                          TokenTypes.CTOR_CALL,
+                          TokenTypes.SUPER_CTOR_CALL,
+                          TokenTypes.METHOD_CALL,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.java

@@ -62,6 +62,12 @@ public class TypecastParenPadCheck extends AbstractParenPadCheck
         return getRequiredTokens();
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {TokenTypes.RPAREN, TokenTypes.TYPECAST};
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java

@@ -65,6 +65,16 @@ public class WhitespaceAfterCheck
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.COMMA,
+            TokenTypes.SEMI,
+            TokenTypes.TYPECAST,
+        };
+    }
+
     @Override
     public void visitToken(DetailAST ast)
     {

src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java

@@ -225,6 +225,63 @@ public class WhitespaceAroundCheck extends Check
         };
     }
 
+    @Override
+    public int[] getAcceptableTokens()
+    {
+        return new int[] {
+            TokenTypes.ASSIGN,
+            TokenTypes.BAND,
+            TokenTypes.BAND_ASSIGN,
+            TokenTypes.BOR,
+            TokenTypes.BOR_ASSIGN,
+            TokenTypes.BSR,
+            TokenTypes.BSR_ASSIGN,
+            TokenTypes.BXOR,
+            TokenTypes.BXOR_ASSIGN,
+            TokenTypes.COLON,
+            TokenTypes.DIV,
+            TokenTypes.DIV_ASSIGN,
+            TokenTypes.DO_WHILE,
+            TokenTypes.EQUAL,
+            TokenTypes.GE,
+            TokenTypes.GT,
+            TokenTypes.LAND,
+            TokenTypes.LCURLY,
+            TokenTypes.LE,
+            TokenTypes.LITERAL_CATCH,
+            TokenTypes.LITERAL_DO,
+            TokenTypes.LITERAL_ELSE,
+            TokenTypes.LITERAL_FINALLY,
+            TokenTypes.LITERAL_FOR,
+            TokenTypes.LITERAL_IF,
+            TokenTypes.LITERAL_RETURN,
+            TokenTypes.LITERAL_SWITCH,
+            TokenTypes.LITERAL_SYNCHRONIZED,
+            TokenTypes.LITERAL_TRY,
+            TokenTypes.LITERAL_WHILE,
+            TokenTypes.LOR,
+            TokenTypes.LT,
+            TokenTypes.MINUS,
+            TokenTypes.MINUS_ASSIGN,
+            TokenTypes.MOD,
+            TokenTypes.MOD_ASSIGN,
+            TokenTypes.NOT_EQUAL,
+            TokenTypes.PLUS,
+            TokenTypes.PLUS_ASSIGN,
+            TokenTypes.QUESTION,
+            TokenTypes.RCURLY,
+            TokenTypes.SL,
+            TokenTypes.SLIST,
+            TokenTypes.SL_ASSIGN,
+            TokenTypes.SR,
+            TokenTypes.SR_ASSIGN,
+            TokenTypes.STAR,
+            TokenTypes.STAR_ASSIGN,
+            TokenTypes.LITERAL_ASSERT,
+            TokenTypes.TYPE_EXTENSION_AND,
+        };
+    }
+
     /**
      * Sets whether or not empty method bodies are allowed.
      * @param allow <code>true</code> to allow empty method bodies.

src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java

@@ -18,9 +18,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 package com.puppycrawl.tools.checkstyle.checks.coding;
 
+import org.junit.Test;
+
 import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
-import org.junit.Test;
 
 public class HiddenFieldCheckTest
     extends BaseCheckTestSupport
@@ -348,4 +349,5 @@ public class HiddenFieldCheckTest
         };
         verify(checkConfig, getPath("InputHiddenField.java"), expected);
     }
+
 }

src/test/java/com/puppycrawl/tools/checkstyle/comments/AllBlockCommentsTest.java

@@ -50,6 +50,12 @@ public class AllBlockCommentsTest extends BaseCheckTestSupport
             return new int[] {TokenTypes.BLOCK_COMMENT_BEGIN};
         }
 
+        @Override
+        public int[] getAcceptableTokens()
+        {
+            return new int[] {TokenTypes.BLOCK_COMMENT_BEGIN};
+        }
+
         @Override
         public void init()
         {