Skip to content

Commit 69c0dda

Browse files
nrmancusoromani
authored andcommitted
minor: update checks (related to checkstyle#3095)
1 parent 4cdbba4 commit 69c0dda

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/AvoidDefaultSerializableInInnerClassesCheck.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ public int[] getRequiredTokens() {
8080

8181
@Override
8282
public void visitToken(DetailAST detailAST) {
83-
final boolean topLevelClass = detailAST.getParent() == null;
83+
final boolean topLevelClass =
84+
detailAST.getParent().getType() == TokenTypes.COMPILATION_UNIT;
8485
if (!topLevelClass && isSerializable(detailAST)
8586
&& !isStatic(detailAST)
8687
&& !hasSerialazableMethods(detailAST)) {

sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/design/InnerClassCheck.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void visitToken(DetailAST ast) {
8181
@Override
8282
public void leaveToken(DetailAST ast) {
8383
// Is this a root class
84-
if (ast.getParent() == null) {
84+
if (ast.getParent().getType() == TokenTypes.COMPILATION_UNIT) {
8585
rootClass = true;
8686
}
8787
}

sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/design/PublicReferenceToPrivateTypeCheck.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ private boolean isExtendsOrImplementsSmth(DetailAST classOrInterfaceDefAst) {
338338
*/
339339
private static boolean
340340
isDefinedInTopLevelClass(DetailAST methodOrFieldDefAst) {
341-
return methodOrFieldDefAst.getParent().getParent().getParent() == null;
341+
return methodOrFieldDefAst.getParent().getParent()
342+
.getParent().getType() == TokenTypes.COMPILATION_UNIT;
342343
}
343344

344345
}

sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/sizes/LineLengthExtendedCheck.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@ public int[] getRequiredTokens() {
206206

207207
@Override
208208
public void visitToken(DetailAST ast) {
209-
if (ast.getParent() != null
210-
&& ast.getParent().getType() == TokenTypes.OBJBLOCK
209+
if (ast.getParent().getType() == TokenTypes.OBJBLOCK
211210
|| ast.getType() == TokenTypes.CLASS_DEF) {
212211
final int mNumberOfLine = ast.getLineNo();
213212
final DetailAST endOfIgnoreLine = ast.findFirstToken(TokenTypes.SLIST);

0 commit comments

Comments
 (0)