You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by on...@apache.org on 2016/04/12 14:03:24 UTC
svn commit: r1738782 - in /poi/trunk/src: java/org/apache/poi/hssf/usermodel/
java/org/apache/poi/ss/formula/functions/ java/org/apache/poi/util/
ooxml/java/org/apache/poi/xslf/usermodel/
ooxml/java/org/apache/poi/xssf/streaming/ ooxml/java/org/apache/...
Author: onealj
Date: Tue Apr 12 12:03:24 2016
New Revision: 1738782
URL: http://svn.apache.org/viewvc?rev=1738782&view=rev
Log:
fix several findbugs SF_SWITCH_NO_DEFAULT warnings
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Offset.java
poi/trunk/src/java/org/apache/poi/util/HexDump.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java Tue Apr 12 12:03:24 2016
@@ -259,6 +259,8 @@ public final class HSSFPatriarch impleme
case HSSFWorkbook.PICTURE_TYPE_PICT:
ftCf.setFlags(FtCfSubRecord.BITMAP_BIT);
break;
+ default:
+ throw new IllegalStateException("Invalid picture type: " + pictData.getFormat());
}
obj.addSubRecord(ftCf);
// FtPioGrbit (pictFlags)
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java Tue Apr 12 12:03:24 2016
@@ -66,6 +66,8 @@ public class HSSFShapeFactory {
case EscherTextboxRecord.RECORD_ID:
txtRecord = (TextObjectRecord) shapeToObj.get(record);
break;
+ default:
+ break;
}
}
if (isEmbeddedObject(objRecord)) {
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java Tue Apr 12 12:03:24 2016
@@ -49,6 +49,8 @@ public class HSSFShapeGroup extends HSSF
case EscherChildAnchorRecord.RECORD_ID:
anchor = new HSSFChildAnchor((EscherChildAnchorRecord) ch);
break;
+ default:
+ break;
}
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java Tue Apr 12 12:03:24 2016
@@ -1736,6 +1736,12 @@ public final class HSSFWorkbook extends
* @param format The format of the picture. One of <code>PICTURE_TYPE_*</code>
*
* @return the index to this picture (1 based).
+ * @see #PICTURE_TYPE_WMF
+ * @see #PICTURE_TYPE_EMF
+ * @see #PICTURE_TYPE_PICT
+ * @see #PICTURE_TYPE_PNG
+ * @see #PICTURE_TYPE_JPEG
+ * @see #PICTURE_TYPE_DIB
*/
@Override
public int addPicture(byte[] pictureData, int format)
@@ -1792,12 +1798,14 @@ public final class HSSFWorkbook extends
case PICTURE_TYPE_PNG:
blipRecord.setOptions(HSSFPictureData.MSOBI_PNG);
break;
- case HSSFWorkbook.PICTURE_TYPE_JPEG:
+ case PICTURE_TYPE_JPEG:
blipRecord.setOptions(HSSFPictureData.MSOBI_JPEG);
break;
- case HSSFWorkbook.PICTURE_TYPE_DIB:
+ case PICTURE_TYPE_DIB:
blipRecord.setOptions(HSSFPictureData.MSOBI_DIB);
break;
+ default:
+ throw new IllegalStateException("Unexpected picture format: " + format);
}
EscherBSERecord r = new EscherBSERecord();
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java Tue Apr 12 12:03:24 2016
@@ -82,8 +82,9 @@ public abstract class FinanceFunction im
}
return evaluate(srcRowIndex, srcColumnIndex, args[0], args[1], args[2], arg3, arg4);
}
+ default:
+ return ErrorEval.VALUE_INVALID;
}
- return ErrorEval.VALUE_INVALID;
}
protected double evaluate(double[] ds) throws EvaluationException {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Offset.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Offset.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Offset.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Offset.java Tue Apr 12 12:03:24 2016
@@ -179,10 +179,16 @@ public final class Offset implements Fun
if(!(args[4] instanceof MissingArgEval)) {
width = evaluateIntArg(args[4], srcCellRow, srcCellCol);
}
+ // fall-through to pick up height
case 4:
if(!(args[3] instanceof MissingArgEval)) {
height = evaluateIntArg(args[3], srcCellRow, srcCellCol);
}
+ break;
+ //case 3:
+ // nothing to do
+ default:
+ break;
}
// Zero height or width raises #REF! error
if(height == 0 || width == 0) {
Modified: poi/trunk/src/java/org/apache/poi/util/HexDump.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/HexDump.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/HexDump.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/HexDump.java Tue Apr 12 12:03:24 2016
@@ -172,10 +172,13 @@ public class HexDump {
if (Character.isISOControl(charB)) return '.';
switch (charB) {
- // printable, but not compilable with current compiler encoding
- case 0xFF: case 0xDD:
- charB = '.';
- break;
+ // printable, but not compilable with current compiler encoding
+ case 0xFF:
+ case 0xDD:
+ charB = '.';
+ break;
+ default:
+ break;
}
return charB;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java Tue Apr 12 12:03:24 2016
@@ -110,6 +110,8 @@ public class XSLFFreeformShape extends X
numPoints++;
ctPath.addNewClose();
break;
+ default:
+ throw new IllegalStateException("Unrecognized path segment type: " + type);
}
it.next();
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java Tue Apr 12 12:03:24 2016
@@ -213,6 +213,8 @@ public class SheetDataWriter {
_out.write("<v>" + nval + "</v>");
}
break;
+ default:
+ break;
}
break;
}
@@ -255,7 +257,7 @@ public class SheetDataWriter {
break;
}
default: {
- throw new RuntimeException("Huh?");
+ throw new IllegalStateException("Invalid cell type: " + cellType);
}
}
_out.write("</c>");
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java Tue Apr 12 12:03:24 2016
@@ -505,6 +505,8 @@ public class XSSFFont implements Font {
case Font.SS_SUPER:
offsetProperty.setVal(STVerticalAlignRun.SUPERSCRIPT);
break;
+ default:
+ throw new IllegalStateException("Invalid type offset: " + offset);
}
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java?rev=1738782&r1=1738781&r2=1738782&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java Tue Apr 12 12:03:24 2016
@@ -160,6 +160,8 @@ public final class FileInformationBlock
case 0x0112:
assertCbRgFcLcb( "0x0112", 0x00B7, "0x00B7", _cbRgFcLcb );
break;
+ default:
+ throw new IllegalStateException("Invalid file format version number: " + getNFib());
}
}
@@ -194,6 +196,8 @@ public final class FileInformationBlock
case 0x0112:
assertCswNew( "0x0112", 0x0005, "0x0005", _cswNew );
break;
+ default:
+ throw new IllegalStateException("Invalid file format version number: " + getNFib());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org