diff options
author | rnveach <rveach02@gmail.com> | 2015-11-09 21:45:30 -0500 |
---|---|---|
committer | Roman Ivanov <ivanov-jr@mail.ru> | 2015-11-10 05:49:08 -0800 |
commit | 4346d41010a729e14991e30706bdb16ff18ff39a (patch) | |
tree | 57f189137804a0a6fabca7721c941d49da827ca2 /src/main | |
parent | 4fb4529b6f629ec3745f402b11dc3c1d1632a85a (diff) | |
download | checkstyle-4346d41010a729e14991e30706bdb16ff18ff39a.tar.gz |
Issue #2451: removed excess hierarchy from ClassTypeParameterNameCheck
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.java | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.java index 91116a700..96d525dc3 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/ClassTypeParameterNameCheck.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 ClassTypeParameterNameCheck - extends AbstractTypeParameterNameCheck { + extends AbstractNameCheck { /** Creates a new {@code ClassTypeParameterNameCheck} instance. */ public ClassTypeParameterNameCheck() { super("^[A-Z]$"); } @Override - public int[] getRequiredTokens() { + public int[] getDefaultTokens() { + return getAcceptableTokens(); + } + + @Override + public final int[] getAcceptableTokens() { return new int[] { TokenTypes.TYPE_PARAMETER, }; } @Override - protected final int getLocation() { - return TokenTypes.CLASS_DEF; + public int[] getRequiredTokens() { + return getAcceptableTokens(); + } + + @Override + protected final boolean mustCheckName(DetailAST ast) { + final DetailAST location = + ast.getParent().getParent(); + return location.getType() == TokenTypes.CLASS_DEF; } } |