From: Javen O'Neal <onealj@apache.org>
Date: Tue, 17 Oct 2017 07:43:41 +0000 (+0000)
Subject: IntelliJ: simplify boolean logic
X-Git-Tag: REL_4_0_0_FINAL~439
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=63b3a4e491b8a3efe1ffb373570dc34b645d8e4e;p=poi.git

IntelliJ: simplify boolean logic

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1812363 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/java/org/apache/poi/ss/util/AreaReference.java b/src/java/org/apache/poi/ss/util/AreaReference.java
index 309ed51e51..7cf3b73c41 100644
--- a/src/java/org/apache/poi/ss/util/AreaReference.java
+++ b/src/java/org/apache/poi/ss/util/AreaReference.java
@@ -196,11 +196,10 @@ public class AreaReference {
         // These are represented as something like
         //   C$1:C$65535 or D$1:F$0
         // i.e. absolute from 1st row to 0th one
-        if(topLeft.getRow() == 0 && topLeft.isRowAbsolute() &&
-            botRight.getRow() == version.getLastRowIndex() && botRight.isRowAbsolute()) {
-            return true;
-        }
-        return false;
+        return (topLeft.getRow() == 0
+                && topLeft.isRowAbsolute()
+                && botRight.getRow() == version.getLastRowIndex()
+                && botRight.isRowAbsolute());
     }
     public boolean isWholeColumnReference() {
         return isWholeColumnReference(_version, _firstCell, _lastCell);
diff --git a/src/java/org/apache/poi/ss/util/SheetUtil.java b/src/java/org/apache/poi/ss/util/SheetUtil.java
index 2087a9dc7e..ae4ef10576 100644
--- a/src/java/org/apache/poi/ss/util/SheetUtil.java
+++ b/src/java/org/apache/poi/ss/util/SheetUtil.java
@@ -318,11 +318,7 @@ public class SheetUtil {
         copyAttributes(font, str, 0, "1w".length());
 
         TextLayout layout = new TextLayout(str.getIterator(), fontRenderContext);
-        if(layout.getBounds().getWidth() > 0) {
-            return true;
-        }
-
-        return false;
+        return (layout.getBounds().getWidth() > 0);
     }
 
     /**