From bf64651a0db77bdb6b22e5142b5b0b9c0cd03069 Mon Sep 17 00:00:00 2001
From: Michal Kordas <kordas.michal@gmail.com>
Date: Sun, 2 Aug 2015 12:40:34 +0200
Subject: [PATCH] Remove redundant if statement. #1538

---
 .../checks/coding/OneStatementPerLineCheck.java | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
index 7047fbd1a..b65b576dd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/OneStatementPerLineCheck.java
@@ -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;