diff options
author | rnveach <rveach02@gmail.com> | 2015-11-09 22:05:26 -0500 |
---|---|---|
committer | Roman Ivanov <ivanov-jr@mail.ru> | 2015-11-11 12:48:03 -0800 |
commit | 843f05ee25e4a835ab324410470c9322523a9f39 (patch) | |
tree | fd95a62b915dc7b888775d661fe57c338cb913a6 /src/main | |
parent | 3b26b571a8dae611366c481aa1fce606ca1f1cfa (diff) | |
download | checkstyle-843f05ee25e4a835ab324410470c9322523a9f39.tar.gz |
Issue #2451: removed excess hierarchy from MethodTypeParameterNameCheck
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.java index ae0c6ac0e..b41d97173 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/MethodTypeParameterNameCheck.java @@ -19,6 +19,7 @@ package com.puppycrawl.tools.checkstyle.checks.naming; +import com.puppycrawl.tools.checkstyle.api.DetailAST; import com.puppycrawl.tools.checkstyle.api.TokenTypes; /** @@ -47,21 +48,33 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * @author Travis Schneeberger */ public class MethodTypeParameterNameCheck - extends AbstractTypeParameterNameCheck { + extends AbstractNameCheck { /** Creates a new {@code MethodTypeParameterNameCheck} instance. */ public MethodTypeParameterNameCheck() { super("^[A-Z]$"); } @Override - public int[] getRequiredTokens() { + public int[] getDefaultTokens() { + return getAcceptableTokens(); + } + + @Override + public int[] getAcceptableTokens() { return new int[] { TokenTypes.TYPE_PARAMETER, }; } @Override - protected final int getLocation() { - return TokenTypes.METHOD_DEF; + public int[] getRequiredTokens() { + return getAcceptableTokens(); + } + + @Override + protected final boolean mustCheckName(DetailAST ast) { + final DetailAST location = + ast.getParent().getParent(); + return location.getType() == TokenTypes.METHOD_DEF; } } |