Browse Source

fix several findbugs SF_SWITCH_NO_DEFAULT warnings

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1738782 13f79535-47bb-0310-9956-ffa450edef68
tags/REL_3_15_BETA2
Javen O'Neal 8 years ago
parent
commit
2f703ce676

+ 2
- 0
src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java View File

@@ -259,6 +259,8 @@ public final class HSSFPatriarch implements HSSFShapeContainer, Drawing {
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)

+ 2
- 0
src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java View File

@@ -66,6 +66,8 @@ public class HSSFShapeFactory {
case EscherTextboxRecord.RECORD_ID:
txtRecord = (TextObjectRecord) shapeToObj.get(record);
break;
default:
break;
}
}
if (isEmbeddedObject(objRecord)) {

+ 2
- 0
src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java View File

@@ -49,6 +49,8 @@ public class HSSFShapeGroup extends HSSFShape implements HSSFShapeContainer {
case EscherChildAnchorRecord.RECORD_ID:
anchor = new HSSFChildAnchor((EscherChildAnchorRecord) ch);
break;
default:
break;
}
}
}

+ 10
- 2
src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java View File

@@ -1736,6 +1736,12 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
* @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 POIDocument implements org.apache.poi.ss
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();

+ 2
- 1
src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java View File

@@ -82,8 +82,9 @@ public abstract class FinanceFunction implements Function3Arg, Function4Arg {
}
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 {

+ 6
- 0
src/java/org/apache/poi/ss/formula/functions/Offset.java View File

@@ -179,10 +179,16 @@ public final class Offset implements Function {
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) {

+ 7
- 4
src/java/org/apache/poi/util/HexDump.java View File

@@ -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;
}

+ 2
- 0
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java View File

@@ -110,6 +110,8 @@ public class XSLFFreeformShape extends XSLFAutoShape
numPoints++;
ctPath.addNewClose();
break;
default:
throw new IllegalStateException("Unrecognized path segment type: " + type);
}
it.next();
}

+ 3
- 1
src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java View File

@@ -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>");

+ 2
- 0
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java View File

@@ -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);
}
}
}

+ 4
- 0
src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java View File

@@ -160,6 +160,8 @@ public final class FileInformationBlock implements Cloneable
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 implements Cloneable
case 0x0112:
assertCswNew( "0x0112", 0x0005, "0x0005", _cswNew );
break;
default:
throw new IllegalStateException("Invalid file format version number: " + getNFib());
}
}


Loading…
Cancel
Save