Skip to content

Commit 32e2b7b

Browse files
subkrishrnveach
subkrish
authored and
rnveach
committed
Issue checkstyle#4581: Reorganize token methods in coding, imports, indentation folders
1 parent c58f720 commit 32e2b7b

40 files changed

+155
-191
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,20 @@ public abstract class AbstractSuperCheck
5757

5858
@Override
5959
public int[] getAcceptableTokens() {
60-
return new int[] {
61-
TokenTypes.METHOD_DEF,
62-
TokenTypes.LITERAL_SUPER,
63-
};
60+
return getRequiredTokens();
6461
}
6562

6663
@Override
6764
public int[] getDefaultTokens() {
68-
return getAcceptableTokens();
65+
return getRequiredTokens();
6966
}
7067

7168
@Override
7269
public int[] getRequiredTokens() {
73-
return getDefaultTokens();
70+
return new int[] {
71+
TokenTypes.METHOD_DEF,
72+
TokenTypes.LITERAL_SUPER,
73+
};
7474
}
7575

7676
@Override

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,17 @@ public class ArrayTrailingCommaCheck extends AbstractCheck {
9999

100100
@Override
101101
public int[] getDefaultTokens() {
102-
return getAcceptableTokens();
102+
return getRequiredTokens();
103103
}
104104

105105
@Override
106106
public int[] getAcceptableTokens() {
107-
return new int[] {TokenTypes.ARRAY_INIT};
107+
return getRequiredTokens();
108108
}
109109

110110
@Override
111111
public int[] getRequiredTokens() {
112-
return getAcceptableTokens();
112+
return new int[] {TokenTypes.ARRAY_INIT};
113113
}
114114

115115
@Override

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ public class AvoidInlineConditionalsCheck extends AbstractCheck {
4848

4949
@Override
5050
public int[] getDefaultTokens() {
51-
return new int[] {TokenTypes.QUESTION};
51+
return getRequiredTokens();
5252
}
5353

5454
@Override
5555
public int[] getRequiredTokens() {
56-
return getDefaultTokens();
56+
return new int[] {TokenTypes.QUESTION};
5757
}
5858

5959
@Override
6060
public int[] getAcceptableTokens() {
61-
return new int[] {TokenTypes.QUESTION};
61+
return getRequiredTokens();
6262
}
6363

6464
@Override

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ public class CovariantEqualsCheck extends AbstractCheck {
5757

5858
@Override
5959
public int[] getDefaultTokens() {
60-
return new int[] {TokenTypes.CLASS_DEF, TokenTypes.LITERAL_NEW, TokenTypes.ENUM_DEF, };
60+
return getRequiredTokens();
6161
}
6262

6363
@Override
6464
public int[] getRequiredTokens() {
65-
return getDefaultTokens();
65+
return new int[] {TokenTypes.CLASS_DEF, TokenTypes.LITERAL_NEW, TokenTypes.ENUM_DEF, };
6666
}
6767

6868
@Override
6969
public int[] getAcceptableTokens() {
70-
return new int[] {TokenTypes.CLASS_DEF, TokenTypes.LITERAL_NEW, TokenTypes.ENUM_DEF, };
70+
return getRequiredTokens();
7171
}
7272

7373
@Override

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,16 @@ public class DeclarationOrderCheck extends AbstractCheck {
163163

164164
@Override
165165
public int[] getDefaultTokens() {
166-
return getAcceptableTokens();
166+
return getRequiredTokens();
167167
}
168168

169169
@Override
170170
public int[] getAcceptableTokens() {
171+
return getRequiredTokens();
172+
}
173+
174+
@Override
175+
public int[] getRequiredTokens() {
171176
return new int[] {
172177
TokenTypes.CTOR_DEF,
173178
TokenTypes.METHOD_DEF,
@@ -177,11 +182,6 @@ public int[] getAcceptableTokens() {
177182
};
178183
}
179184

180-
@Override
181-
public int[] getRequiredTokens() {
182-
return getAcceptableTokens();
183-
}
184-
185185
@Override
186186
public void beginTree(DetailAST rootAST) {
187187
scopeStates = new ArrayDeque<>();

‎src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/DefaultComesLastCheck.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@ public class DefaultComesLastCheck extends AbstractCheck {
6565

6666
@Override
6767
public int[] getAcceptableTokens() {
68-
return new int[] {
69-
TokenTypes.LITERAL_DEFAULT,
70-
};
68+
return getRequiredTokens();
7169
}
7270

7371
@Override
7472
public int[] getDefaultTokens() {
75-
return getAcceptableTokens();
73+
return getRequiredTokens();
7674
}
7775

7876
@Override
7977
public int[] getRequiredTokens() {
80-
return getAcceptableTokens();
78+
return new int[] {
79+
TokenTypes.LITERAL_DEFAULT,
80+
};
8181
}
8282

8383
/**

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ public class EmptyStatementCheck extends AbstractCheck {
5454

5555
@Override
5656
public int[] getDefaultTokens() {
57-
return getAcceptableTokens();
57+
return getRequiredTokens();
5858
}
5959

6060
@Override
6161
public int[] getAcceptableTokens() {
62-
return new int[] {TokenTypes.EMPTY_STAT};
62+
return getRequiredTokens();
6363
}
6464

6565
@Override
6666
public int[] getRequiredTokens() {
67-
return getAcceptableTokens();
67+
return new int[] {TokenTypes.EMPTY_STAT};
6868
}
6969

7070
@Override

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,16 @@ public class EqualsAvoidNullCheck extends AbstractCheck {
8888

8989
@Override
9090
public int[] getDefaultTokens() {
91-
return getAcceptableTokens();
91+
return getRequiredTokens();
9292
}
9393

9494
@Override
9595
public int[] getAcceptableTokens() {
96+
return getRequiredTokens();
97+
}
98+
99+
@Override
100+
public int[] getRequiredTokens() {
96101
return new int[] {
97102
TokenTypes.METHOD_CALL,
98103
TokenTypes.CLASS_DEF,
@@ -113,11 +118,6 @@ public int[] getAcceptableTokens() {
113118
};
114119
}
115120

116-
@Override
117-
public int[] getRequiredTokens() {
118-
return getAcceptableTokens();
119-
}
120-
121121
/**
122122
* Whether to ignore checking {@code String.equalsIgnoreCase(String)}.
123123
* @param newValue whether to ignore checking

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,17 @@ public class EqualsHashCodeCheck
7878

7979
@Override
8080
public int[] getDefaultTokens() {
81-
return getAcceptableTokens();
81+
return getRequiredTokens();
8282
}
8383

8484
@Override
8585
public int[] getAcceptableTokens() {
86-
return new int[] {TokenTypes.METHOD_DEF};
86+
return getRequiredTokens();
8787
}
8888

8989
@Override
9090
public int[] getRequiredTokens() {
91-
return getAcceptableTokens();
91+
return new int[] {TokenTypes.METHOD_DEF};
9292
}
9393

9494
@Override

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ public class ExplicitInitializationCheck extends AbstractCheck {
6363

6464
@Override
6565
public final int[] getDefaultTokens() {
66-
return new int[] {TokenTypes.VARIABLE_DEF};
66+
return getRequiredTokens();
6767
}
6868

6969
@Override
7070
public final int[] getRequiredTokens() {
71-
return getDefaultTokens();
71+
return new int[] {TokenTypes.VARIABLE_DEF};
7272
}
7373

7474
@Override
7575
public final int[] getAcceptableTokens() {
76-
return new int[] {TokenTypes.VARIABLE_DEF};
76+
return getRequiredTokens();
7777
}
7878

7979
/**

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,17 @@ public class FallThroughCheck extends AbstractCheck {
9292

9393
@Override
9494
public int[] getDefaultTokens() {
95-
return new int[] {TokenTypes.CASE_GROUP};
95+
return getRequiredTokens();
9696
}
9797

9898
@Override
9999
public int[] getRequiredTokens() {
100-
return getDefaultTokens();
100+
return new int[] {TokenTypes.CASE_GROUP};
101101
}
102102

103103
@Override
104104
public int[] getAcceptableTokens() {
105-
return new int[] {TokenTypes.CASE_GROUP};
105+
return getRequiredTokens();
106106
}
107107

108108
/**

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,17 @@ public void setIllegalClassNames(final String... classNames) {
6666

6767
@Override
6868
public int[] getDefaultTokens() {
69-
return new int[] {TokenTypes.LITERAL_CATCH};
69+
return getRequiredTokens();
7070
}
7171

7272
@Override
7373
public int[] getRequiredTokens() {
74-
return getDefaultTokens();
74+
return new int[] {TokenTypes.LITERAL_CATCH};
7575
}
7676

7777
@Override
7878
public int[] getAcceptableTokens() {
79-
return new int[] {TokenTypes.LITERAL_CATCH};
79+
return getRequiredTokens();
8080
}
8181

8282
@Override

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,17 @@ public void setIllegalClassNames(final String... classNames) {
9090

9191
@Override
9292
public int[] getDefaultTokens() {
93-
return new int[] {TokenTypes.LITERAL_THROWS};
93+
return getRequiredTokens();
9494
}
9595

9696
@Override
9797
public int[] getRequiredTokens() {
98-
return getDefaultTokens();
98+
return new int[] {TokenTypes.LITERAL_THROWS};
9999
}
100100

101101
@Override
102102
public int[] getAcceptableTokens() {
103-
return new int[] {TokenTypes.LITERAL_THROWS};
103+
return getRequiredTokens();
104104
}
105105

106106
@Override

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,16 @@ public class InnerAssignmentCheck
106106

107107
@Override
108108
public int[] getDefaultTokens() {
109-
return getAcceptableTokens();
109+
return getRequiredTokens();
110110
}
111111

112112
@Override
113113
public int[] getAcceptableTokens() {
114+
return getRequiredTokens();
115+
}
116+
117+
@Override
118+
public int[] getRequiredTokens() {
114119
return new int[] {
115120
TokenTypes.ASSIGN, // '='
116121
TokenTypes.DIV_ASSIGN, // "/="
@@ -127,11 +132,6 @@ public int[] getAcceptableTokens() {
127132
};
128133
}
129134

130-
@Override
131-
public int[] getRequiredTokens() {
132-
return getAcceptableTokens();
133-
}
134-
135135
@Override
136136
public void visitToken(DetailAST ast) {
137137
if (!isInContext(ast, ALLOWED_ASSIGNMENT_CONTEXT)

‎src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingCtorCheck.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ public class MissingCtorCheck extends AbstractCheck {
4949

5050
@Override
5151
public int[] getDefaultTokens() {
52-
return new int[] {TokenTypes.CLASS_DEF};
52+
return getRequiredTokens();
5353
}
5454

5555
@Override
5656
public int[] getAcceptableTokens() {
57-
return getDefaultTokens();
57+
return getRequiredTokens();
5858
}
5959

6060
@Override
6161
public int[] getRequiredTokens() {
62-
return getDefaultTokens();
62+
return new int[] {TokenTypes.CLASS_DEF};
6363
}
6464

6565
@Override

‎src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/MissingSwitchDefaultCheck.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ public class MissingSwitchDefaultCheck extends AbstractCheck {
5656

5757
@Override
5858
public int[] getDefaultTokens() {
59-
return new int[] {TokenTypes.LITERAL_SWITCH};
59+
return getRequiredTokens();
6060
}
6161

6262
@Override
6363
public int[] getAcceptableTokens() {
64-
return getDefaultTokens();
64+
return getRequiredTokens();
6565
}
6666

6767
@Override
6868
public int[] getRequiredTokens() {
69-
return getDefaultTokens();
69+
return new int[] {TokenTypes.LITERAL_SWITCH};
7070
}
7171

7272
@Override

0 commit comments

Comments
 (0)