From 44ca7f04bae5332d498f848e7fa89392155d9d7d Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Sat, 12 Nov 2016 18:35:39 +0000 Subject: [PATCH] SonarCube fixes git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1769399 13f79535-47bb-0310-9956-ffa450edef68 --- .../ss/formula/functions/LogicalFunction.java | 11 +++--- .../org/apache/poi/hwpf/dev/HWPFLister.java | 38 ++++++++----------- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java b/src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java index 298de1926..a0825774b 100644 --- a/src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java +++ b/src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java @@ -40,12 +40,11 @@ public abstract class LogicalFunction extends Fixed1ArgFunction { try { ve = OperandResolver.getSingleValue(arg0, srcRowIndex, srcColumnIndex); } catch (EvaluationException e) { - if (false) { - // Note - it is more usual to propagate error codes straight to the result like this: - return e.getErrorEval(); - // but logical functions behave a little differently - } - // this will usually cause a 'FALSE' result except for ISNONTEXT() + // Note - it is more usual to propagate error codes straight to the result like this: + // but logical functions behave a little differently + // return e.getErrorEval(); + + // this will usually cause a 'FALSE' result except for ISNONTEXT() ve = e.getErrorEval(); } return BoolEval.valueOf(evaluate(ve)); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java b/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java index 54be13f14..e89efe735 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java @@ -380,27 +380,24 @@ public final class HWPFLister } } - if ( true ) + String text = new Range( chpx.getStart(), chpx.getEnd(), + _doc.getOverallRange() ) { - String text = new Range( chpx.getStart(), chpx.getEnd(), - _doc.getOverallRange() ) + public String toString() { - public String toString() - { - return "CHPX range (" + super.toString() + ")"; - } - }.text(); - StringBuilder stringBuilder = new StringBuilder(); - for ( char c : text.toCharArray() ) - { - if ( c < 30 ) - stringBuilder - .append( "\\0x" + Integer.toHexString( c ) ); - else - stringBuilder.append( c ); + return "CHPX range (" + super.toString() + ")"; } - System.out.println( stringBuilder ); + }.text(); + StringBuilder stringBuilder = new StringBuilder(); + for ( char c : text.toCharArray() ) + { + if ( c < 30 ) + stringBuilder + .append( "\\0x" + Integer.toHexString( c ) ); + else + stringBuilder.append( c ); } + System.out.println( stringBuilder ); } } @@ -584,11 +581,8 @@ public final class HWPFLister System.out.println( paragraph.getProps() ); } - if ( true ) - { - SprmIterator sprmIt = new SprmIterator( papx.getGrpprl(), 2 ); - dumpSprms( sprmIt, "\t" ); - } + SprmIterator sprmIt = new SprmIterator( papx.getGrpprl(), 2 ); + dumpSprms( sprmIt, "\t" ); } }