From abe2b200312ee72aa552026b1a34e8bd72bfdc4e Mon Sep 17 00:00:00 2001 From: alexkravin Date: Wed, 4 Feb 2015 16:59:32 +0400 Subject: [PATCH] Acceptable tokens are specified for all checks, issue #342 --- .../tools/checkstyle/TreeWalker.java | 17 ++---- .../checks/ArrayTypeStyleCheck.java | 6 ++ .../AvoidEscapedUnicodeCharactersCheck.java | 6 ++ .../checks/OuterTypeFilenameCheck.java | 9 +++ .../checkstyle/checks/TodoCommentCheck.java | 6 ++ .../checks/UncommentedMainCheck.java | 10 ++++ .../checkstyle/checks/UpperEllCheck.java | 6 ++ .../annotation/AnnotationLocationCheck.java | 22 +++++++ .../checks/blocks/AvoidNestedBlocksCheck.java | 6 ++ .../checks/blocks/EmptyBlockCheck.java | 22 +++++++ .../checks/blocks/LeftCurlyCheck.java | 24 ++++++++ .../checks/blocks/NeedBracesCheck.java | 15 +++++ .../coding/AbstractIllegalMethodCheck.java | 6 ++ .../checks/coding/AbstractSuperCheck.java | 9 +++ .../coding/ArrayTrailingCommaCheck.java | 6 ++ .../coding/AvoidInlineConditionalsCheck.java | 6 ++ .../checks/coding/CovariantEqualsCheck.java | 6 ++ .../checks/coding/DeclarationOrderCheck.java | 11 ++++ .../checks/coding/EmptyStatementCheck.java | 6 ++ .../checks/coding/EqualsAvoidNullCheck.java | 6 ++ .../checks/coding/EqualsHashCodeCheck.java | 6 ++ .../coding/ExplicitInitializationCheck.java | 6 ++ .../checks/coding/FallThroughCheck.java | 6 ++ .../checks/coding/IllegalCatchCheck.java | 6 ++ .../checks/coding/IllegalThrowsCheck.java | 6 ++ .../checks/coding/IllegalTypeCheck.java | 11 ++++ .../checks/coding/InnerAssignmentCheck.java | 19 +++++++ .../checks/coding/MagicNumberCheck.java | 11 ++++ .../coding/ModifiedControlVariableCheck.java | 27 +++++++++ .../coding/MultipleStringLiteralsCheck.java | 6 ++ .../MultipleVariableDeclarationsCheck.java | 6 ++ .../checks/coding/NestedForDepthCheck.java | 6 ++ .../checks/coding/NestedIfDepthCheck.java | 6 ++ .../checks/coding/NestedTryDepthCheck.java | 6 ++ .../coding/OneStatementPerLineCheck.java | 9 +++ .../OverloadMethodsDeclarationOrderCheck.java | 8 +++ .../coding/PackageDeclarationCheck.java | 6 ++ .../coding/ParameterAssignmentCheck.java | 25 ++++++++ .../checks/coding/RequireThisCheck.java | 8 +++ .../checks/coding/ReturnCountCheck.java | 10 ++++ .../coding/SimplifyBooleanReturnCheck.java | 6 ++ .../coding/StringLiteralEqualityCheck.java | 6 ++ .../coding/UnnecessaryParenthesesCheck.java | 29 ++++++++++ ...VariableDeclarationUsageDistanceCheck.java | 6 ++ .../design/DesignForExtensionCheck.java | 6 ++ .../checks/design/FinalClassCheck.java | 6 ++ .../HideUtilityClassConstructorCheck.java | 6 ++ .../checks/design/InnerTypeLastCheck.java | 6 ++ .../checks/design/InterfaceIsTypeCheck.java | 6 ++ .../checks/design/MutableExceptionCheck.java | 6 ++ .../checks/design/ThrowsCountCheck.java | 8 +++ .../design/VisibilityModifierCheck.java | 6 ++ .../checks/imports/AvoidStarImportCheck.java | 6 ++ .../imports/AvoidStaticImportCheck.java | 6 ++ .../imports/CustomImportOrderCheck.java | 10 ++++ .../checks/imports/IllegalImportCheck.java | 6 ++ .../checks/imports/ImportControlCheck.java | 7 +++ .../checks/imports/ImportOrderCheck.java | 6 ++ .../checks/imports/RedundantImportCheck.java | 9 +++ .../checks/imports/UnusedImportsCheck.java | 23 +++++++- .../checks/javadoc/JavadocStyleCheck.java | 17 ++++++ .../checks/javadoc/JavadocTypeCheck.java | 11 ++++ .../checks/javadoc/JavadocVariableCheck.java | 9 +++ .../BooleanExpressionComplexityCheck.java | 15 +++++ .../ClassDataAbstractionCouplingCheck.java | 12 ++++ .../metrics/ClassFanOutComplexityCheck.java | 15 +++++ .../metrics/CyclomaticComplexityCheck.java | 20 +++++++ .../checks/metrics/JavaNCSSCheck.java | 35 ++++++++++++ .../checks/metrics/NPathComplexityCheck.java | 21 +++++++ .../checks/modifier/ModifierOrderCheck.java | 6 ++ .../modifier/RedundantModifierCheck.java | 11 ++++ .../naming/AbbreviationAsWordInNameCheck.java | 16 ++++++ .../checks/naming/AbstractClassNameCheck.java | 10 +++- .../AbstractTypeParameterNameCheck.java | 8 +++ .../checks/naming/ConstantNameCheck.java | 6 ++ .../naming/LocalFinalVariableNameCheck.java | 9 +++ .../checks/naming/LocalVariableNameCheck.java | 9 +++ .../checks/naming/MemberNameCheck.java | 6 ++ .../checks/naming/MethodNameCheck.java | 6 ++ .../checks/naming/PackageNameCheck.java | 6 ++ .../checks/naming/ParameterNameCheck.java | 6 ++ .../naming/StaticVariableNameCheck.java | 6 ++ .../checks/naming/TypeNameCheck.java | 10 ++++ .../checks/sizes/AnonInnerLengthCheck.java | 6 ++ .../sizes/ExecutableStatementCountCheck.java | 12 ++++ .../checks/sizes/MethodCountCheck.java | 12 ++++ .../checks/sizes/MethodLengthCheck.java | 6 ++ .../checks/sizes/OuterTypeNumberCheck.java | 7 +++ .../checks/sizes/ParameterNumberCheck.java | 6 ++ .../EmptyForInitializerPadCheck.java | 7 +++ .../whitespace/EmptyForIteratorPadCheck.java | 7 +++ .../whitespace/EmptyLineSeparatorCheck.java | 17 ++++++ .../whitespace/GenericWhitespaceCheck.java | 6 ++ .../whitespace/MethodParamPadCheck.java | 12 ++++ .../checks/whitespace/ParenPadCheck.java | 11 ++++ .../whitespace/TypecastParenPadCheck.java | 6 ++ .../whitespace/WhitespaceAfterCheck.java | 10 ++++ .../whitespace/WhitespaceAroundCheck.java | 57 +++++++++++++++++++ .../checks/coding/HiddenFieldCheckTest.java | 4 +- .../comments/AllBlockCommentsTest.java | 6 ++ .../comments/AllSinglelineCommentsTest.java | 6 ++ 101 files changed, 1020 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java index 7afc57d03..b6ddfe314 100755 --- a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java +++ b/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); } } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java index 00c1c86ec..1af1f5dd8 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/ArrayTypeStyleCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java index 059a79f79..5726ea509 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.java index 0fb01181e..39fd6026e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java index 8f11a1cac..46c952f96 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/TodoCommentCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java index 0f908b1e4..a754deab4 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UncommentedMainCheck.java +++ b/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() { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java index 47f4695e2..75833358e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/UpperEllCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java index d8c8f714e..ce4034a55 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.java index f77e29b1c..43c4cf4d5 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/AvoidNestedBlocksCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java index 51a81dc8a..1f444f5ce 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/EmptyBlockCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java index 900267db4..d15130a9f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java index 122ccf0ae..797a2d5f0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractIllegalMethodCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractIllegalMethodCheck.java index e42edb9bc..d113e8003 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractIllegalMethodCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java index 43dd980c4..d0f11f232 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AbstractSuperCheck.java +++ b/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. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java index 1018d832d..a90f66781 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ArrayTrailingCommaCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java index 6e520d638..1e4b8f7ef 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/AvoidInlineConditionalsCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java index 2071eaf6a..09c7e5841 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/CovariantEqualsCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java index 141a0a7ab..3a73890ff 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DeclarationOrderCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.java index ed4f4cf71..95790500b 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EmptyStatementCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java index aa9eb9523..33479fe06 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsAvoidNullCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java index eb2ebd9df..4aa46161d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/EqualsHashCodeCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java index 22f14f9dc..b17ec490a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ExplicitInitializationCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java index e6dce91a4..b208d14c9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FallThroughCheck.java +++ b/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. * diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.java index 82173f773..bc6bef657 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalCatchCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java index 7eeffa8c6..668af8316 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalThrowsCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java index 380dc565a..07838012c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTypeCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java index f6e5efd7a..dd46769b7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java index e4a172230..167e513e7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MagicNumberCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java index 8454fb5a0..356cdd2a0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ModifiedControlVariableCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java index 0e3dcd490..db60db247 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleStringLiteralsCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java index b0d14a8a4..c34fbf7d7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MultipleVariableDeclarationsCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.java index 50a75068f..4277d0fc6 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedForDepthCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java index 78c23c065..f6b605efc 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedIfDepthCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.java index 6fd2085a1..52932060c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/NestedTryDepthCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java index 626bde792..5e0f5cddc 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.java index 8e8eb6a0e..59e206257 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.java index 080076213..f2ace3028 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/PackageDeclarationCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.java index 17e3878ec..24bb9932d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ParameterAssignmentCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java index 97cf78d44..71cbf61b0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/RequireThisCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java index a5f700062..1031564a8 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/ReturnCountCheck.java +++ b/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. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.java index 297d9f6b1..aff2ea096 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/SimplifyBooleanReturnCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.java index c98b5d70b..66aacb4f1 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/StringLiteralEqualityCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.java index 8f839f104..c98be27a7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/UnnecessaryParenthesesCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java index 7d5ae7afe..d1498af01 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/VariableDeclarationUsageDistanceCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java index 5a7c1c036..537f6344c 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/DesignForExtensionCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java index 05917211e..28fd10edc 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/FinalClassCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java index df0578f1a..2f6c31235 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/HideUtilityClassConstructorCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java index 3089ddd8a..1c5b106fc 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InnerTypeLastCheck.java +++ b/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; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.java index 78282d960..1cd55f5d7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/InterfaceIsTypeCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java index cf5c4a478..2e62dbac3 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/MutableExceptionCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java index 58181ab1e..19cb14caa 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/ThrowsCountCheck.java +++ b/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. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java index a59cc0953..5038d1605 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/design/VisibilityModifierCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java index dde013410..1253d96f9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStarImportCheck.java +++ b/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. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java index 56ff79541..019bc2424 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AvoidStaticImportCheck.java +++ b/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 diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java index c458dd8a0..ae8a21fe9 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/CustomImportOrderCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java index 461301c62..562862a4a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/IllegalImportCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java index 7300f9e64..cf5df7ea7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java index 9c9411348..5b957207f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.java index 4d8569b9f..ee08f09a7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/RedundantImportCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java index 56949b8dc..1488046f4 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/UnusedImportsCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java index c8d85f97b..892002e4f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocStyleCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java index bce3e840d..0a7a6d010 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocTypeCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java index dd608312b..619b7ac68 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocVariableCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.java index ebc479088..12641b022 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/BooleanExpressionComplexityCheck.java +++ b/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. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java index 74a2876ca..07b2f1cf0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassDataAbstractionCouplingCheck.java +++ b/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() { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java index 2f9905fc8..91387fb91 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/ClassFanOutComplexityCheck.java +++ b/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() { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.java index 0e83db080..24a658189 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/CyclomaticComplexityCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java index ad2058b24..b5031bd9f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/JavaNCSSCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.java index d0e8d62f2..201ee76f3 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/metrics/NPathComplexityCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.java index f740fcab6..cb82cf41d 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/ModifierOrderCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java index 34363a039..4c64e2a62 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/modifier/RedundantModifierCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java index 1d89582ef..03fe77470 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbbreviationAsWordInNameCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java index 2f220866c..069236dc7 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractClassNameCheck.java +++ b/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); } /** diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractTypeParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractTypeParameterNameCheck.java index 784abdaf0..ccdec6307 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/AbstractTypeParameterNameCheck.java +++ b/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() { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java index 3ad02c025..5cc8732ca 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ConstantNameCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.java index 5ff37db7a..acff05c61 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalFinalVariableNameCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.java index 1da92a146..7477d30df 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/LocalVariableNameCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java index 45cb8b410..8b1fe0672 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MemberNameCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java index 317737569..17f162be5 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodNameCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.java index 0330e8355..71929300f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/PackageNameCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java index 0b448028b..6f7c5d66e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ParameterNameCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java index b36e9a7d4..91936f33a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/StaticVariableNameCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java index 4e8243bdc..8e51dc9dd 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/TypeNameCheck.java +++ b/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, + }; + } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.java index 0bd9600f9..4b4d25f58 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/AnonInnerLengthCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java index 6c0a0929a..484d8ef9a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ExecutableStatementCountCheck.java +++ b/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. diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java index e248e4752..f9927aab2 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodCountCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java index 72b7d28e1..751b20835 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/MethodLengthCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.java index 0aa611fd3..ed3102668 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/OuterTypeNumberCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java index 44e58bce3..1f9c90a7f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/ParameterNumberCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java index 0909a4d1d..cb94972e0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForInitializerPadCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.java index ee9e868c1..f3c177758 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyForIteratorPadCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java index 90fb0026a..fe86658a0 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java index 3c3cd11ca..90adad693 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java index 25d86927d..5e52c2572 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/MethodParamPadCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java index 9e016b891..b3b9944fb 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/ParenPadCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.java index 053f450fa..3be5c5034 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/TypecastParenPadCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java index 39f0cdd3d..b5623c96a 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAfterCheck.java +++ b/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) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java index df30913a6..608baef76 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java +++ b/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 true to allow empty method bodies. diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java index 8e23731cf..f7cfe2d11 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java +++ b/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); } + } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllBlockCommentsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllBlockCommentsTest.java index 49c6fcd37..c42fd35de 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllBlockCommentsTest.java +++ b/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() { diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllSinglelineCommentsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllSinglelineCommentsTest.java index ed1227f2e..1e514b43c 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllSinglelineCommentsTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/comments/AllSinglelineCommentsTest.java @@ -50,6 +50,12 @@ public class AllSinglelineCommentsTest extends BaseCheckTestSupport return new int[] {TokenTypes.SINGLE_LINE_COMMENT}; } + @Override + public int[] getAcceptableTokens() + { + return new int[] {TokenTypes.SINGLE_LINE_COMMENT}; + } + @Override public void init() {