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

Remove redundant if statement. #1538

This commit is contained in:
Michal Kordas 2015-08-02 12:40:34 +02:00 committed by Roman Ivanov
parent 49404dbd70
commit bf64651a0d
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
View File

@ -160,13 +160,7 @@ public final class OneStatementPerLineCheck extends Check {
private static boolean isOnTheSameLine(DetailAST ast, int lastStatementEnd,
int forStatementEnd) {
final boolean onTheSameLine;
if (lastStatementEnd == ast.getLineNo()
&& forStatementEnd != ast.getLineNo()) {
onTheSameLine = true;
}
else {
onTheSameLine = false;
}
onTheSameLine = lastStatementEnd == ast.getLineNo() && forStatementEnd != ast.getLineNo();
return onTheSameLine;
}
@ -179,13 +173,8 @@ public final class OneStatementPerLineCheck extends Check {
final boolean multiline;
if (ast.getPreviousSibling() != null) {
final DetailAST prevSibling = ast.getPreviousSibling();
if (prevSibling.getLineNo() != ast.getLineNo()
&& ast.getParent() != null) {
multiline = true;
}
else {
multiline = false;
}
multiline = prevSibling.getLineNo() != ast.getLineNo()
&& ast.getParent() != null;
}
else {
multiline = false;