Issue #2661: Enforce SingleSpaceSeparatorCheck of sevntu-checkstyle over Checkstyle source code

This commit is contained in:
Andrei Selkin 2015-12-17 23:31:05 +03:00 committed by Roman Ivanov
parent 4ac5e944af
commit e1f20de247
7 changed files with 9 additions and 6 deletions

View File

@ -52,5 +52,8 @@
<property name="targetConstantTypes" value="LITERAL_NULL,LITERAL_TRUE,LITERAL_FALSE,NUM_INT,NUM_DOUBLE,NUM_LONG,NUM_FLOAT"/>
</module>
<module name="EitherLogOrThrowCheck"/>
<module name="SingleSpaceSeparator">
<metadata name="validateCommentNodes" value="false"/>
</module>
</module>
</module>

View File

@ -197,7 +197,7 @@ public abstract class AbstractTypeAwareCheck extends Check {
*/
protected static boolean isSubclass(Class<?> child, Class<?> parent) {
return parent != null && child != null
&& parent.isAssignableFrom(child);
&& parent.isAssignableFrom(child);
}
/**

View File

@ -255,7 +255,7 @@ public class TranslationCheck
boolean missing = false;
for (File file : filesInResourceBundle) {
final String currentFileName = file.getPath();
missing = !currentFileName.equals(fileName);
missing = !currentFileName.equals(fileName);
if (!missing) {
break;
}

View File

@ -140,7 +140,7 @@ public final class MutableExceptionCheck extends Check {
ast.findFirstToken(TokenTypes.MODIFIERS);
if (modifiersAST.findFirstToken(TokenTypes.FINAL) == null) {
log(ast.getLineNo(), ast.getColumnNo(), MSG_KEY,
log(ast.getLineNo(), ast.getColumnNo(), MSG_KEY,
ast.findFirstToken(TokenTypes.IDENT).getText());
}
}

View File

@ -129,7 +129,7 @@ public final class ThrowsCountCheck extends Check {
// Account for all the commas!
final int count = (ast.getChildCount() + 1) / 2;
if (count > max) {
log(ast.getLineNo(), ast.getColumnNo(), MSG_KEY,
log(ast.getLineNo(), ast.getColumnNo(), MSG_KEY,
count, max);
}
}

View File

@ -234,7 +234,7 @@ public class CommentsIndentationCheck extends Check {
destributed = true;
}
}
return destributed;
return destributed;
}
/**

View File

@ -84,7 +84,7 @@ public class ConstantNameCheck
final boolean isStatic = modifiersAST.branchContains(TokenTypes.LITERAL_STATIC);
final boolean isFinal = modifiersAST.branchContains(TokenTypes.FINAL);
if (isStatic && isFinal && shouldCheckInScope(modifiersAST)
if (isStatic && isFinal && shouldCheckInScope(modifiersAST)
|| ScopeUtils.isInAnnotationBlock(ast)
|| ScopeUtils.isInInterfaceOrAnnotationBlock(ast)
&& !ScopeUtils.isInCodeBlock(ast)) {