[github-364] use Math.min/max. Thanks to Arturo Bernal. This closes #364

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

diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java
index c3cdac64a8256559b0dfa3df1ba8f834ff04bbf3..01265de7ca45c7d982d227cd57e39ef920c2dd96 100644 (file)
--- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java
@@ -76,8 +76,7 @@ public final class SLWTListing {
                     }
 
                     // Report the first 5 children, to give a flavour
-                    int upTo = 5;
-                    if(children.length < 5) { upTo = children.length; }
+                    int upTo = Math.min(children.length, 5);
                     for(int k=0; k<upTo; k++) {
                         Record r = children[k];
                         int typeID = (int)r.getRecordType();

diff --git a/poi/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java b/poi/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java
index 96ba6c4e9896126e0ae137fc363ba43067e87513..44d31728c63f2780ed8bceae7c6e994e612fc9f1 100644 (file)
--- a/poi/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java
+++ b/poi/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java
@@ -218,13 +218,8 @@ public final class HeaderBlock implements HeaderBlockConstants {
     }
 
     private static IOException alertShortRead(int pRead) {
-        int read;
-        if (pRead < 0) {
-            //Can't have -1 bytes read in the error message!
-            read = 0;
-        } else {
-            read = pRead;
-        }
+        int read = Math.max(pRead, 0);
+        //Can't have -1 bytes read in the error message!
         String type = " byte" + (read == 1 ? (""): ("s"));
 
         return new IOException("Unable to read entire header; "

diff --git a/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
index 69b5a6e320f91b205952b7fdab631f740f1beac1..7873984377265d96373e1321834b9bc1a72e2640 100644 (file)
--- a/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
@@ -152,8 +152,8 @@ public class WorkdayCalculator {
      */
     protected int pastDaysOfWeek(double start, double end, int dayOfWeek) {
         int pastDaysOfWeek = 0;
-        int startDay = (int) Math.floor(start < end ? start : end);
-        int endDay = (int) Math.floor(end > start ? end : start);
+        int startDay = (int) Math.floor(Math.min(start, end));
+        int endDay = (int) Math.floor(Math.max(end, start));
         for (; startDay <= endDay; startDay++) {
             Calendar today = LocaleUtil.getLocaleCalendar();
             today.setTime(DateUtil.getJavaDate(startDay));
@@ -174,8 +174,8 @@ public class WorkdayCalculator {
      */
     protected int calculateNonWeekendHolidays(double start, double end, double[] holidays) {
         int nonWeekendHolidays = 0;
-        double startDay = start < end ? start : end;
-        double endDay = end > start ? end : start;
+        double startDay = Math.min(start, end);
+        double endDay = Math.max(end, start);
         for (double holiday : holidays) {
             if (isInARange(startDay, endDay, holiday)) {
                 if (!isWeekend(holiday)) {

diff --git a/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
index 4402ed49d7f4ae5fb2c09e256c0c2254ea54aafe..bc0ccfe4820fd7915c72a047d2d68381ee9fdbb9 100644 (file)
--- a/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
@@ -104,7 +104,7 @@ public abstract class NumericFunction implements Function {
             }
 
             DecimalFormat nf = (DecimalFormat) NumberFormat.getCurrencyInstance(LocaleUtil.getUserLocale());
-            int decimalPlaces = nPlaces < 0 ? 0 : nPlaces;
+            int decimalPlaces = Math.max(nPlaces, 0);
             if (LocaleUtil.getUserLocale().getCountry().equalsIgnoreCase("US")) {
                 nf.setNegativePrefix("(" + nf.getDecimalFormatSymbols().getCurrencySymbol());
                 nf.setNegativeSuffix(")");

diff --git a/poi/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java
index da1abe6b6e4eb62ac406abe03699f97fa07fbc29..75c343b33f7bb5cbeba41f5a74f80e0d8974b847 100644 (file)
--- a/poi/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java
@@ -90,7 +90,7 @@ public class FractionFormat extends Format {
                 }
             } else if (m.group(1) != null) {
                 int len = m.group(1).length();
-                len = len > MAX_DENOM_POW ? MAX_DENOM_POW : len;
+                len = Math.min(len, MAX_DENOM_POW);
                 tmpMax = (int)Math.pow(10, len);
             } else {
                 tmpExact = 100;