Issue #4581: Reorganize token methods in whitespace, sizes, naming folders
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 dcf88a3..b6e40cc 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
@@ -92,7 +92,7 @@
@Override
public int[] getDefaultTokens() {
- return new int[] {TokenTypes.CLASS_DEF};
+ return getRequiredTokens();
}
@Override
@@ -102,7 +102,7 @@
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.CLASS_DEF};
+ return getRequiredTokens();
}
@Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java
index 3204019..c96ae0f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/naming/CatchParameterNameCheck.java
@@ -71,17 +71,17 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.PARAMETER_DEF};
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.PARAMETER_DEF};
}
@Override
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 9ae2fb3..91172d5 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
@@ -56,19 +56,19 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public final int[] getAcceptableTokens() {
- return new int[] {
- TokenTypes.TYPE_PARAMETER,
- };
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {
+ TokenTypes.TYPE_PARAMETER,
+ };
}
@Override
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 2feef3d..520dec8 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
@@ -62,17 +62,17 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.VARIABLE_DEF};
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.VARIABLE_DEF};
}
@Override
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 024e22a..e1abaab 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
@@ -58,17 +58,17 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.VARIABLE_DEF};
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.VARIABLE_DEF};
}
@Override
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 9d79bf6..6cb0dc6 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
@@ -99,17 +99,17 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.METHOD_DEF, };
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.METHOD_DEF, };
}
@Override
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 6ce11b6..6598b75 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
@@ -88,17 +88,17 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.PACKAGE_DEF};
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.PACKAGE_DEF};
}
@Override
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 931e9c5..0b6bc61 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
@@ -107,17 +107,17 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.PARAMETER_DEF};
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.PARAMETER_DEF};
}
@Override
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 e90c1e6..bf36a02 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
@@ -56,17 +56,17 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.VARIABLE_DEF};
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.VARIABLE_DEF};
}
@Override
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 0dbb09b..6f5ff98 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
@@ -74,17 +74,17 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.LITERAL_NEW};
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.LITERAL_NEW};
}
@Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java
index 8e56c70..ede3569 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/sizes/LineLengthCheck.java
@@ -96,12 +96,12 @@
@Override
public int[] getDefaultTokens() {
- return CommonUtils.EMPTY_INT_ARRAY;
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return CommonUtils.EMPTY_INT_ARRAY;
+ return getRequiredTokens();
}
@Override
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 4889c3b..4fa104c 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
@@ -46,18 +46,18 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF,
- TokenTypes.ENUM_DEF, TokenTypes.ANNOTATION_DEF, };
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.CLASS_DEF, TokenTypes.INTERFACE_DEF,
+ TokenTypes.ENUM_DEF, TokenTypes.ANNOTATION_DEF, };
}
@Override
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 a2bfb59..67f68dc 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
@@ -87,17 +87,17 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.FOR_INIT};
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.FOR_INIT};
}
@Override
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 49494d2..d03bc1b 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
@@ -87,17 +87,17 @@
@Override
public int[] getDefaultTokens() {
- return getAcceptableTokens();
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.FOR_ITERATOR};
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getAcceptableTokens();
+ return new int[] {TokenTypes.FOR_ITERATOR};
}
@Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.java
index ebafad3..18564a6 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/SingleSpaceSeparatorCheck.java
@@ -106,17 +106,17 @@
@Override
public int[] getDefaultTokens() {
- return CommonUtils.EMPTY_INT_ARRAY;
+ return getRequiredTokens();
}
@Override
public int[] getAcceptableTokens() {
- return getDefaultTokens();
+ return getRequiredTokens();
}
@Override
public int[] getRequiredTokens() {
- return getDefaultTokens();
+ return CommonUtils.EMPTY_INT_ARRAY;
}
// -@cs[SimpleAccessorNameNotation] Overrides method from base class.
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 87a9e2a..a65fb2d 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
@@ -61,7 +61,7 @@
@Override
public int[] getAcceptableTokens() {
- return new int[] {TokenTypes.RPAREN, TokenTypes.TYPECAST};
+ return getRequiredTokens();
}
@Override
