TouchInstinct
/
checkstyle
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Combine nested if statements, issue #744 

All violations of PMD rule [CollapsibleIfStatements](http://pmd.sourceforge.net/pmd-5.2.3/pmd-java/rules/java/basic.html#CollapsibleIfStatements) are fixed.
This commit is contained in:
Michal Kordas 2015-03-14 01:31:28 +01:00 committed by Roman Ivanov
parent 5cd9806d4b
commit 98a9266a80
2 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyCheck.java
View File

@ -361,17 +361,15 @@ public class LeftCurlyCheck
nextToken = leftCurly.getFirstChild();
}
else {
if (leftCurly.getParent().getParent().getType() == TokenTypes.ENUM_DEF)
if (leftCurly.getParent().getParent().getType() == TokenTypes.ENUM_DEF && !ignoreEnums)
{
if (!ignoreEnums) {
nextToken = leftCurly.getNextSibling();
}
nextToken = leftCurly.getNextSibling();
}
}
if (nextToken != null && nextToken.getType() != TokenTypes.RCURLY) {
if (leftCurly.getLineNo() == nextToken.getLineNo()) {
return false;
}
if (nextToken != null && nextToken.getType() != TokenTypes.RCURLY
&& leftCurly.getLineNo() == nextToken.getLineNo())
{
return false;
}
return true;
}

41
src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/FinalLocalVariableCheck.java
View File

@ -171,28 +171,27 @@ public class FinalLocalVariableCheck extends Check
case TokenTypes.IDENT:
final int parentType = ast.getParent().getType();
if (TokenTypes.POST_DEC == parentType
|| TokenTypes.DEC == parentType
|| TokenTypes.POST_INC == parentType
|| TokenTypes.INC == parentType
|| TokenTypes.ASSIGN == parentType
|| TokenTypes.PLUS_ASSIGN == parentType
|| TokenTypes.MINUS_ASSIGN == parentType
|| TokenTypes.DIV_ASSIGN == parentType
|| TokenTypes.STAR_ASSIGN == parentType
|| TokenTypes.MOD_ASSIGN == parentType
|| TokenTypes.SR_ASSIGN == parentType
|| TokenTypes.BSR_ASSIGN == parentType
|| TokenTypes.SL_ASSIGN == parentType
|| TokenTypes.BXOR_ASSIGN == parentType
|| TokenTypes.BOR_ASSIGN == parentType
|| TokenTypes.BAND_ASSIGN == parentType)
// TODO: is there better way to check is ast
// in left part of assignment?
if ((TokenTypes.POST_DEC == parentType
|| TokenTypes.DEC == parentType
|| TokenTypes.POST_INC == parentType
|| TokenTypes.INC == parentType
|| TokenTypes.ASSIGN == parentType
|| TokenTypes.PLUS_ASSIGN == parentType
|| TokenTypes.MINUS_ASSIGN == parentType
|| TokenTypes.DIV_ASSIGN == parentType
|| TokenTypes.STAR_ASSIGN == parentType
|| TokenTypes.MOD_ASSIGN == parentType
|| TokenTypes.SR_ASSIGN == parentType
|| TokenTypes.BSR_ASSIGN == parentType
|| TokenTypes.SL_ASSIGN == parentType
|| TokenTypes.BXOR_ASSIGN == parentType
|| TokenTypes.BOR_ASSIGN == parentType
|| TokenTypes.BAND_ASSIGN == parentType)
&& ast.getParent().getFirstChild() == ast)
{
// TODO: is there better way to check is ast
// in left part of assignment?
if (ast.getParent().getFirstChild() == ast) {
removeVariable(ast);
}
removeVariable(ast);
}
break;