aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJaven O'Neal <onealj@apache.org>2015-11-24 07:05:11 +0000
committerJaven O'Neal <onealj@apache.org>2015-11-24 07:05:11 +0000
commit6c7a9314db4ca98068e8f557f046a487a1fd4512 (patch)
tree64c9ae03117e6dce6fb6fc23af0115512a02cb6a /src
parent7122ad4549987568e00d64f1f84ebaf70e2c0b29 (diff)
downloadpoi-6c7a9314db4ca98068e8f557f046a487a1fd4512.tar.gz
poi-6c7a9314db4ca98068e8f557f046a487a1fd4512.zip
rewrite ternary expression as simple Math.min call (yes, the ternary expression as written is equivalent to min, not max, despite the variable being called max. I'll leave that fix up to the original author).
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1716044 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
index 39adc25f6d..8419de6e46 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
@@ -141,8 +141,9 @@ public class XSSFTable extends POIXMLDocumentPart {
commonTokens = tokens;
} else {
- int maxLenght = commonTokens.length>tokens.length? tokens.length:commonTokens.length;
- for (int i =0; i<maxLenght;i++) {
+ final int maxLength = Math.min(commonTokens.length, tokens.length);
+
+ for (int i =0; i<maxLength; i++) {
if (!commonTokens[i].equals(tokens[i])) {
List<String> subCommonTokens = Arrays.asList(commonTokens).subList(0, i);