lgtm issues

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

5 files changed, 23 insertions, 29 deletions

diff --git a/src/examples/src/org/apache/poi/hssf/view/SVBorder.java b/src/examples/src/org/apache/poi/hssf/view/SVBorder.java
index 840a85e5d9..32793bc834 100644
--- a/src/examples/src/org/apache/poi/hssf/view/SVBorder.java
+++ b/src/examples/src/org/apache/poi/hssf/view/SVBorder.java
@@ -348,14 +348,16 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width,
 
                 // if there are borders on the west or east then
                 // the second line shouldn't cross them
-        if (westBorder)
-           leftx = x+3;
+        if (westBorder) {
+            leftx = x + 3;
+        }
 
-        if (eastBorder)
-           rightx = width-3;
+        if (eastBorder) {
+            rightx = width - 3;
+        }
 
-           g.drawLine(x,y,width,y);
-           g.drawLine(leftx,y+2,rightx,y+2);
+        g.drawLine(x,y,width,y);
+        g.drawLine(leftx,y+2,rightx,y+2);
       }
 
       if (eastBorder &&
@@ -370,11 +372,13 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width,
         int topy=y;
         int bottomy=height;
 
-        if (northBorder)
-          topy=y+3;
+        if (northBorder) {
+            topy = y + 3;
+        }
 
-        if (southBorder)
-            bottomy=height-3;
+        if (southBorder) {
+            bottomy = height - 3;
+        }
 
         g.drawLine(width-1,y,width-1,height);
         g.drawLine(width-3,topy,width-3,bottomy);
diff --git a/src/java/org/apache/poi/ddf/EscherRecord.java b/src/java/org/apache/poi/ddf/EscherRecord.java
index c3962b8b77..c25d91902d 100644
--- a/src/java/org/apache/poi/ddf/EscherRecord.java
+++ b/src/java/org/apache/poi/ddf/EscherRecord.java
@@ -336,7 +336,7 @@ public abstract class EscherRecord implements Cloneable {
                 String tagName = capitalizeAndTrim((String)attrs[0]);
                 boolean hasValue = false;
                 boolean lastChildComplex = false;
-                for (int i=0; i<attrs.length; i+=2) {
+                for (int i=0; i<attrs.length-1; i+=2) {
                     Object value = attrs[i+1];
                     if (value == null) {
                         // ignore null values
@@ -384,7 +384,7 @@ public abstract class EscherRecord implements Cloneable {
         if (attrList != null && attrList.length > 0) {
             String childTab = "  ";
             for (Object[] attrs : attrList) {
-                for (int i=0; i<attrs.length; i+=2) {
+                for (int i=0; i<attrs.length-1; i+=2) {
                     Object value = attrs[i+1];
                     if (value == null) {
                         // ignore null values
diff --git a/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java b/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
index 42c626b512..3ca5e71d76 100644
--- a/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
+++ b/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
@@ -21,15 +21,7 @@ import java.text.CollationKey;
 import java.text.Collator;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import org.apache.poi.ss.formula.eval.BlankEval;
 import org.apache.poi.ss.formula.eval.BoolEval;
@@ -900,9 +892,9 @@ public class EvaluationConditionalFormatRule implements Comparable<EvaluationCon
                 return false;
             }
             ValueAndFormat o = (ValueAndFormat) obj;
-            return ( value == o.value || value.equals(o.value))
-                    && ( format == o.format || format.equals(o.format))
-                    && (string == o.string || string.equals(o.string));
+            return (Objects.equals(value, o.value)
+                    && Objects.equals(format, o.format)
+                    && Objects.equals(string, o.string));
         }
         
         /**
diff --git a/src/java/org/apache/poi/ss/formula/FormulaParser.java b/src/java/org/apache/poi/ss/formula/FormulaParser.java
index 5eafdfcca8..3b82daad91 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaParser.java
+++ b/src/java/org/apache/poi/ss/formula/FormulaParser.java
@@ -382,9 +382,6 @@ public final class FormulaParser {
         if (token instanceof OperandPtg) {
             return false;
         }
-        if (token instanceof OperationPtg) {
-            return true;
-        }
 
         return false;
     }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java b/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java
index 0a13d32df8..2f47f71fcb 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java
@@ -187,7 +187,7 @@ public class TextSpecInfoRun {
             smartTagFld, smartTagsBytes, "smart tags"
         };
         
-        for (int i=0; i<flds.length; i+=3) {
+        for (int i=0; i<flds.length-1; i+=3) {
             BitField fld = (BitField)flds[i+0];
             Object valO = flds[i+1];
             if (!fld.isSet(mask)) continue;
@@ -210,7 +210,8 @@ public class TextSpecInfoRun {
                 valid = false;
             }
             if (!valid) {
-                throw new IOException(flds[i+2]+" is activated, but its value is invalid");
+                Object fval = (i + 2) < flds.length ? flds[i + 2] : null;
+                throw new IOException(fval + " is activated, but its value is invalid");
             }
         }
     }