From: Dominik Stadler Date: Sat, 16 Sep 2017 08:21:28 +0000 (+0000) Subject: Let IntelliJ cleanup some code-warnings across the whole code-base: unnecessary casts X-Git-Tag: REL_4_0_0_FINAL~535 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=037800436a6998fbc0c20727a87e928e58a7b163;p=poi.git Let IntelliJ cleanup some code-warnings across the whole code-base: unnecessary casts git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1808508 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java b/src/java/org/apache/poi/hssf/dev/FormulaViewer.java index 4bf221f4de..4ef3ede77a 100644 --- a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java +++ b/src/java/org/apache/poi/hssf/dev/FormulaViewer.java @@ -185,7 +185,7 @@ public class FormulaViewer private static String composeFormula(FormulaRecord record) { - return HSSFFormulaParser.toFormulaString((HSSFWorkbook)null, record.getParsedExpression()); + return HSSFFormulaParser.toFormulaString(null, record.getParsedExpression()); } /** diff --git a/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java b/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java index 107602d1c0..f5475507a5 100644 --- a/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java +++ b/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java @@ -203,7 +203,7 @@ public class EventBasedExcelExtractor extends POIOLE2TextExtractor implements or thisRow = frec.getRow(); if(_formulasNotResults) { - thisText = HSSFFormulaParser.toFormulaString((HSSFWorkbook)null, frec.getParsedExpression()); + thisText = HSSFFormulaParser.toFormulaString(null, frec.getParsedExpression()); } else { if(frec.hasCachedResultString()) { // Formula result is a string diff --git a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java index 9137e69843..72aa94696c 100644 --- a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java +++ b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java @@ -2169,7 +2169,7 @@ public final class InternalWorkbook { sp.setShapeId(shapeId); } else if (recordId == EscherOptRecord.RECORD_ID){ EscherOptRecord opt = (EscherOptRecord)shapeChildRecord; - EscherSimpleProperty prop = (EscherSimpleProperty)opt.lookup( + EscherSimpleProperty prop = opt.lookup( EscherProperties.BLIP__BLIPTODISPLAY ); if (prop != null){ int pictureIndex = prop.getPropertyValue(); diff --git a/src/java/org/apache/poi/hssf/record/EscherAggregate.java b/src/java/org/apache/poi/hssf/record/EscherAggregate.java index 1fe343eb37..033b4a25a6 100644 --- a/src/java/org/apache/poi/hssf/record/EscherAggregate.java +++ b/src/java/org/apache/poi/hssf/record/EscherAggregate.java @@ -522,7 +522,7 @@ public final class EscherAggregate extends AbstractEscherHolderRecord { } for (NoteRecord noteRecord : tailRec.values()) { - Record rec = (Record) noteRecord; + Record rec = noteRecord; pos += rec.serialize(pos, data); } int bytesWritten = pos - offset; @@ -747,9 +747,9 @@ public final class EscherAggregate extends AbstractEscherHolderRecord { */ public void setMainSpRecordId(int shapeId) { EscherContainerRecord dgContainer = getEscherContainer(); - EscherContainerRecord spgrConatiner = (EscherContainerRecord) dgContainer.getChildById(EscherContainerRecord.SPGR_CONTAINER); + EscherContainerRecord spgrConatiner = dgContainer.getChildById(EscherContainerRecord.SPGR_CONTAINER); EscherContainerRecord spContainer = (EscherContainerRecord) spgrConatiner.getChild(0); - EscherSpRecord sp = (EscherSpRecord) spContainer.getChildById(EscherSpRecord.RECORD_ID); + EscherSpRecord sp = spContainer.getChildById(EscherSpRecord.RECORD_ID); sp.setShapeId(shapeId); } diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java index 106da8b998..ac72b997ce 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java @@ -275,7 +275,7 @@ public final class ValueRecordsAggregate implements Iterable, */ public void applyFont(int startIndex, int endIndex, Font font) { - applyFont(startIndex, endIndex, ((HSSFFont) font).getIndex()); + applyFont(startIndex, endIndex, font.getIndex()); } /** diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java index 08f304ad64..3a01126d43 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java @@ -2130,7 +2130,7 @@ public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet { */ @Override public void setDefaultColumnStyle(int column, CellStyle style) { - _sheet.setDefaultColumnStyle(column, ((HSSFCellStyle) style).getIndex()); + _sheet.setDefaultColumnStyle(column, style.getIndex()); } /** diff --git a/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java b/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java index ccb008507b..b38881021b 100644 --- a/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java +++ b/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java @@ -69,7 +69,7 @@ public class DirectoryNode final OPOIFSFileSystem filesystem, final DirectoryNode parent) { - this(property, parent, filesystem, (NPOIFSFileSystem)null); + this(property, parent, filesystem, null); } /** @@ -84,7 +84,7 @@ public class DirectoryNode final NPOIFSFileSystem nfilesystem, final DirectoryNode parent) { - this(property, parent, (OPOIFSFileSystem)null, nfilesystem); + this(property, parent, null, nfilesystem); } private DirectoryNode(final DirectoryProperty property, diff --git a/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java b/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java index 18140d9df8..3d9b9c6615 100644 --- a/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java +++ b/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java @@ -34,25 +34,19 @@ public class EntryUtils */ @Internal public static void copyNodeRecursively( Entry entry, DirectoryEntry target ) - throws IOException - { + throws IOException { // logger.log( POILogger.ERROR, "copyNodeRecursively called with "+entry.getName()+ // ","+target.getName()); - DirectoryEntry newTarget = null; - if ( entry.isDirectoryEntry() ) - { + if ( entry.isDirectoryEntry() ) { DirectoryEntry dirEntry = (DirectoryEntry)entry; - newTarget = target.createDirectory( entry.getName() ); + DirectoryEntry newTarget = target.createDirectory( entry.getName() ); newTarget.setStorageClsid( dirEntry.getStorageClsid() ); Iterator entries = dirEntry.getEntries(); - while ( entries.hasNext() ) - { + while ( entries.hasNext() ) { copyNodeRecursively( entries.next(), newTarget ); } - } - else - { + } else { DocumentEntry dentry = (DocumentEntry) entry; DocumentInputStream dstream = new DocumentInputStream( dentry ); target.createDocument( dentry.getName(), dstream ); @@ -69,27 +63,12 @@ public class EntryUtils * is the target Directory to copy to */ public static void copyNodes(DirectoryEntry sourceRoot, - DirectoryEntry targetRoot) throws IOException - { + DirectoryEntry targetRoot) throws IOException { for (Entry entry : sourceRoot) { copyNodeRecursively( entry, targetRoot ); } } - /** - * Copies nodes from one Directory to the other minus the excepts - * - * @param filteredSource The filtering source Directory to copy from - * @param filteredTarget The filtering target Directory to copy to - */ - public static void copyNodes( FilteringDirectoryNode filteredSource, - FilteringDirectoryNode filteredTarget ) throws IOException - { - // Nothing special here, just overloaded types to make the - // recommended new way to handle this clearer - copyNodes( (DirectoryEntry)filteredSource, (DirectoryEntry)filteredTarget ); - } - /** * Copies all nodes from one POIFS to the other * diff --git a/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java b/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java index 99a104ca80..fdd8647a72 100644 --- a/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java +++ b/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java @@ -927,7 +927,7 @@ public class NPOIFSFileSystem extends BlockStore { if (preferArray()) { - return (( POIFSViewable ) getRoot()).getViewableArray(); + return getRoot().getViewableArray(); } return new Object[ 0 ]; } @@ -944,7 +944,7 @@ public class NPOIFSFileSystem extends BlockStore { if (!preferArray()) { - return (( POIFSViewable ) getRoot()).getViewableIterator(); + return getRoot().getViewableIterator(); } return Collections.emptyList().iterator(); } @@ -959,7 +959,7 @@ public class NPOIFSFileSystem extends BlockStore public boolean preferArray() { - return (( POIFSViewable ) getRoot()).preferArray(); + return getRoot().preferArray(); } /** diff --git a/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java b/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java index 0dc1798328..071288c2ac 100644 --- a/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java +++ b/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java @@ -494,7 +494,7 @@ public class OPOIFSFileSystem Property property = properties.next(); String name = property.getName(); DirectoryNode parent = (dir == null) - ? (( DirectoryNode ) getRoot()) + ? getRoot() : dir; if (property.isDirectory()) @@ -547,7 +547,7 @@ public class OPOIFSFileSystem { if (preferArray()) { - return (( POIFSViewable ) getRoot()).getViewableArray(); + return getRoot().getViewableArray(); } return new Object[ 0 ]; } @@ -564,7 +564,7 @@ public class OPOIFSFileSystem { if (!preferArray()) { - return (( POIFSViewable ) getRoot()).getViewableIterator(); + return getRoot().getViewableIterator(); } return Collections.emptyList().iterator(); } @@ -579,7 +579,7 @@ public class OPOIFSFileSystem public boolean preferArray() { - return (( POIFSViewable ) getRoot()).preferArray(); + return getRoot().preferArray(); } /** diff --git a/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java b/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java index 4b1fc7479e..8f418dba77 100644 --- a/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java +++ b/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java @@ -209,14 +209,14 @@ public final class OperationEvaluationContext { SheetRangeEvaluator sre = new SheetRangeEvaluator(_sheetIndex, se); // ugly typecast - TODO - make spreadsheet version more easily accessible - SpreadsheetVersion ssVersion = ((FormulaParsingWorkbook)_workbook).getSpreadsheetVersion(); + SpreadsheetVersion ssVersion = _workbook.getSpreadsheetVersion(); NameType part1refType = classifyCellReference(refStrPart1, ssVersion); switch (part1refType) { case BAD_CELL_OR_NAMED_RANGE: return ErrorEval.REF_INVALID; case NAMED_RANGE: - EvaluationName nm = ((FormulaParsingWorkbook)_workbook).getName(refStrPart1, _sheetIndex); + EvaluationName nm = _workbook.getName(refStrPart1, _sheetIndex); if(!nm.isRange()){ throw new RuntimeException("Specified name '" + refStrPart1 + "' is not a range as expected."); } diff --git a/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java b/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java index 1dcf023b68..e7e300e5a3 100644 --- a/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java +++ b/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java @@ -191,7 +191,7 @@ public final class ArrayPtg extends Ptg { throw new RuntimeException("Array item cannot be null"); } if (o instanceof String) { - return "\"" + (String)o + "\""; + return "\"" + o + "\""; } if (o instanceof Double) { return NumberToTextConverter.toText(((Double)o).doubleValue()); diff --git a/src/java/org/apache/poi/ss/usermodel/DateUtil.java b/src/java/org/apache/poi/ss/usermodel/DateUtil.java index 8483340393..ffaaa0f1ba 100644 --- a/src/java/org/apache/poi/ss/usermodel/DateUtil.java +++ b/src/java/org/apache/poi/ss/usermodel/DateUtil.java @@ -258,7 +258,7 @@ public class DateUtil { * @return Java representation of the date, or null if date is not a valid Excel date */ public static Calendar getJavaCalendar(double date) { - return getJavaCalendar(date, false, (TimeZone)null, false); + return getJavaCalendar(date, false, null, false); } /** @@ -270,7 +270,7 @@ public class DateUtil { * @return Java representation of the date, or null if date is not a valid Excel date */ public static Calendar getJavaCalendar(double date, boolean use1904windowing) { - return getJavaCalendar(date, use1904windowing, (TimeZone)null, false); + return getJavaCalendar(date, use1904windowing, null, false); } /** diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java index 5405b7f6e3..c3fbac9dae 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java @@ -489,7 +489,7 @@ implements SlideShow { if (relType == null) { throw new IllegalArgumentException("Picture type "+format+" is not supported."); } - img = (XSLFPictureData) createRelationship(relType, XSLFFactory.getInstance(), imageNumber + 1, true).getDocumentPart(); + img = createRelationship(relType, XSLFFactory.getInstance(), imageNumber + 1, true).getDocumentPart(); img.setIndex(imageNumber); _pictures.add(img); try { diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java index 0362404d36..6fce529456 100644 --- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java +++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java @@ -1383,7 +1383,7 @@ public class SXSSFSheet implements Sheet private int findStartOfRowOutlineGroup(int rowIndex) { // Find the start of the group. Row row = getRow(rowIndex); - int level = ((SXSSFRow) row).getOutlineLevel(); + int level = row.getOutlineLevel(); if(level == 0) { throw new IllegalArgumentException("Outline level is zero for the row (" + rowIndex + ")."); } diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java index e3e8f56eb7..08c565a346 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java @@ -521,7 +521,7 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook { @Override public int addPicture(byte[] pictureData, int format) { int imageNumber = getAllPictures().size() + 1; - XSSFPictureData img = (XSSFPictureData)createRelationship(XSSFPictureData.RELATIONS[format], XSSFFactory.getInstance(), imageNumber, true).getDocumentPart(); + XSSFPictureData img = createRelationship(XSSFPictureData.RELATIONS[format], XSSFFactory.getInstance(), imageNumber, true).getDocumentPart(); try { OutputStream out = img.getPackagePart().getOutputStream(); out.write(pictureData); diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java index 01463c64a5..7cdfd6f7b0 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java @@ -637,7 +637,7 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody { * in the body. Otherwise, take the previous paragraph and calculate * the new index for the new paragraph. */ - if ((!(o instanceof CTP)) || (CTP) o == p) { + if ((!(o instanceof CTP)) || o == p) { paragraphs.add(0, newP); } else { int pos = paragraphs.indexOf(getParagraph((CTP) o)) + 1; diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java index 8c89bf7478..e67ed30894 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java @@ -297,7 +297,7 @@ public class XWPFFootnote implements Iterable, IBody { while (!(o instanceof CTP) && (cursor.toPrevSibling())) { o = cursor.getObject(); } - if ((!(o instanceof CTP)) || (CTP) o == p) { + if ((!(o instanceof CTP)) || o == p) { paragraphs.add(0, newP); } else { int pos = paragraphs.indexOf(getParagraph((CTP) o)) + 1; diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java index c5a9365066..62ecfeed5f 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java @@ -400,7 +400,7 @@ public abstract class XWPFHeaderFooter extends POIXMLDocumentPart implements IBo while (!(o instanceof CTP) && (cursor.toPrevSibling())) { o = cursor.getObject(); } - if ((!(o instanceof CTP)) || (CTP) o == p) { + if ((!(o instanceof CTP)) || o == p) { paragraphs.add(0, newP); } else { int pos = paragraphs.indexOf(getParagraph((CTP) o)) + 1; diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java index b75352c51f..9950aa35ac 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java @@ -95,7 +95,7 @@ public class XWPFSDTContent implements ISDTContent { text.append(((XWPFSDT) o).getContent().getText()); addNewLine = true; } else if (o instanceof XWPFRun) { - text.append(((XWPFRun) o)); + text.append(o); addNewLine = false; } if (addNewLine == true && i < bodyElements.size() - 1) { diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java index 27f2c43ad7..d72462ddee 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java @@ -273,7 +273,7 @@ public class XWPFTableCell implements IBody, ICell { while (!(o instanceof CTP) && (cursor.toPrevSibling())) { o = cursor.getObject(); } - if ((!(o instanceof CTP)) || (CTP) o == p) { + if ((!(o instanceof CTP)) || o == p) { paragraphs.add(0, newP); } else { int pos = paragraphs.indexOf(getParagraph((CTP) o)) + 1; diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java index 51c0796198..75a87ddbad 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java @@ -50,7 +50,7 @@ public class TestXSSFDrawing { RelationPart rp = rels.get(0); assertTrue(rp.getDocumentPart() instanceof XSSFDrawing); - XSSFDrawing drawing = (XSSFDrawing)rp.getDocumentPart(); + XSSFDrawing drawing = rp.getDocumentPart(); //sheet.createDrawingPatriarch() should return the same instance of XSSFDrawing assertSame(drawing, sheet.createDrawingPatriarch()); String drawingId = rp.getRelationship().getId(); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java index b9aa8c28c1..70d02d0167 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java @@ -182,7 +182,7 @@ public final class TestXSSFFormulaParser { assertEquals(0, ((NameXPxg)ptgs[0]).getExternalWorkbookNumber()); assertEquals(null, ((NameXPxg)ptgs[0]).getSheetName()); assertEquals("NR_Global_B2",((NameXPxg)ptgs[0]).getNameName()); - assertEquals("[0]!NR_Global_B2",((NameXPxg)ptgs[0]).toFormulaString()); + assertEquals("[0]!NR_Global_B2", ptgs[0].toFormulaString()); wb.close(); } @@ -200,7 +200,7 @@ public final class TestXSSFFormulaParser { assertEquals(Ref3DPxg.class, ptgs[0].getClass()); assertEquals(-1, ((Ref3DPxg)ptgs[0]).getExternalWorkbookNumber()); assertEquals("A1", ((Ref3DPxg)ptgs[0]).format2DRefAsString()); - assertEquals("Uses!A1", ((Ref3DPxg)ptgs[0]).toFormulaString()); + assertEquals("Uses!A1", ptgs[0].toFormulaString()); // Reference to a single cell in a different sheet, which needs quoting ptgs = parse(fpb, "'Testing 47100'!A1"); @@ -209,7 +209,7 @@ public final class TestXSSFFormulaParser { assertEquals(-1, ((Ref3DPxg)ptgs[0]).getExternalWorkbookNumber()); assertEquals("Testing 47100", ((Ref3DPxg)ptgs[0]).getSheetName()); assertEquals("A1", ((Ref3DPxg)ptgs[0]).format2DRefAsString()); - assertEquals("'Testing 47100'!A1", ((Ref3DPxg)ptgs[0]).toFormulaString()); + assertEquals("'Testing 47100'!A1", ptgs[0].toFormulaString()); // Reference to a sheet scoped named range from another sheet ptgs = parse(fpb, "Defines!NR_To_A1"); @@ -218,7 +218,7 @@ public final class TestXSSFFormulaParser { assertEquals(-1, ((NameXPxg)ptgs[0]).getExternalWorkbookNumber()); assertEquals("Defines", ((NameXPxg)ptgs[0]).getSheetName()); assertEquals("NR_To_A1",((NameXPxg)ptgs[0]).getNameName()); - assertEquals("Defines!NR_To_A1",((NameXPxg)ptgs[0]).toFormulaString()); + assertEquals("Defines!NR_To_A1", ptgs[0].toFormulaString()); // Reference to a workbook scoped named range ptgs = parse(fpb, "NR_Global_B2"); @@ -243,7 +243,7 @@ public final class TestXSSFFormulaParser { assertEquals(1, ((Ref3DPxg)ptgs[0]).getExternalWorkbookNumber()); assertEquals("Uses",((Ref3DPxg)ptgs[0]).getSheetName()); assertEquals("$A$1",((Ref3DPxg)ptgs[0]).format2DRefAsString()); - assertEquals("[1]Uses!$A$1",((Ref3DPxg)ptgs[0]).toFormulaString()); + assertEquals("[1]Uses!$A$1", ptgs[0].toFormulaString()); // Reference to a sheet-scoped named range in a different workbook ptgs = parse(fpb, "[1]Defines!NR_To_A1"); @@ -252,7 +252,7 @@ public final class TestXSSFFormulaParser { assertEquals(1, ((NameXPxg)ptgs[0]).getExternalWorkbookNumber()); assertEquals("Defines", ((NameXPxg)ptgs[0]).getSheetName()); assertEquals("NR_To_A1",((NameXPxg)ptgs[0]).getNameName()); - assertEquals("[1]Defines!NR_To_A1",((NameXPxg)ptgs[0]).toFormulaString()); + assertEquals("[1]Defines!NR_To_A1", ptgs[0].toFormulaString()); // Reference to a global named range in a different workbook ptgs = parse(fpb, "[1]!NR_Global_B2"); @@ -261,7 +261,7 @@ public final class TestXSSFFormulaParser { assertEquals(1, ((NameXPxg)ptgs[0]).getExternalWorkbookNumber()); assertEquals(null, ((NameXPxg)ptgs[0]).getSheetName()); assertEquals("NR_Global_B2",((NameXPxg)ptgs[0]).getNameName()); - assertEquals("[1]!NR_Global_B2",((NameXPxg)ptgs[0]).toFormulaString()); + assertEquals("[1]!NR_Global_B2", ptgs[0].toFormulaString()); wb.close(); } diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java index 365ca6a6f2..21c32c651a 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java @@ -714,7 +714,7 @@ public final class TestXSSFWorkbook extends BaseTestXWorkbook { // ensure that a memory based package part does not have lingering data from previous commit() calls if(sheetBack.getPackagePart() instanceof MemoryPackagePart) { - ((MemoryPackagePart)sheetBack.getPackagePart()).clear(); + sheetBack.getPackagePart().clear(); } sheetBack.commit(); diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java index 0e23e49302..e9eb2b1479 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java @@ -59,7 +59,7 @@ public class HSLFEscherRecordFactory extends DefaultEscherRecordFactory { escherRecord.setRecordId(recordId); escherRecord.setOptions(options); if (escherRecord instanceof EscherContainerRecord) { - ((EscherContainerRecord)escherRecord).fillFields(data, offset, this); + escherRecord.fillFields(data, offset, this); } return escherRecord; diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java index 4057acfaa4..ee0a2d0731 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java @@ -262,7 +262,7 @@ public final class HSLFFill { // NOFILLHITTEST can be in the normal escher opt record but also in the tertiary record // the extended bit fields seem to be in the second - opt = (AbstractEscherOptRecord)shape.getEscherChild(RecordTypes.EscherUserDefined); + opt = shape.getEscherChild(RecordTypes.EscherUserDefined); EscherSimpleProperty p = HSLFShape.getEscherProperty(opt, EscherProperties.FILL__NOFILLHITTEST); int propVal = (p == null) ? 0 : p.getPropertyValue(); final boolean rotateWithShape = FILL_USE_USE_SHAPE_ANCHOR.isSet(propVal) && FILL_USE_SHAPE_ANCHOR.isSet(propVal); diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java index 033f3bbebb..c7750d6084 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java @@ -360,7 +360,7 @@ public final class HSLFHyperlink implements Hyperlink lst = new ArrayList(); find(cldata.getHSLFChildRecords(), exobj, lst); - return lst.isEmpty() ? null : (HSLFHyperlink)lst.get(0); + return lst.isEmpty() ? null : lst.get(0); } return null; diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java index 49b7ca5671..1fb0196186 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java @@ -192,13 +192,13 @@ public abstract class HSLFShape implements Shape { EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID); int flags = spRecord.getFlags(); if ((flags & EscherSpRecord.FLAG_CHILD) != 0){ - EscherChildAnchorRecord rec = (EscherChildAnchorRecord)getEscherChild(EscherChildAnchorRecord.RECORD_ID); + EscherChildAnchorRecord rec = getEscherChild(EscherChildAnchorRecord.RECORD_ID); rec.setDx1(x); rec.setDy1(y); rec.setDx2(w); rec.setDy2(h); } else { - EscherClientAnchorRecord rec = (EscherClientAnchorRecord)getEscherChild(EscherClientAnchorRecord.RECORD_ID); + EscherClientAnchorRecord rec = getEscherChild(EscherClientAnchorRecord.RECORD_ID); rec.setCol1((short)x); rec.setFlag((short)y); rec.setDx1((short)w); diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java index a8583bb574..ce809b5518 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java @@ -199,7 +199,7 @@ public abstract class HSLFSheet implements HSLFShapeContainer, Sheet { } public byte[] getRawBytes() { - return ((CharSequence) _buf).toString().getBytes( + return _buf.toString().getBytes( Charset.forName(_usesUnicode ? "UTF-16LE" : "Cp1252") ); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java index 0b186b56b6..7f64b01047 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java @@ -225,19 +225,19 @@ public final class SectionSprmUncompressor extends SprmUncompressor break; case 0x3F: // [MS-DOC], v20140721, 2.6.4, sprmSNFtn - newSEP.setNFtn((int) sprm.getOperand()); + newSEP.setNFtn(sprm.getOperand()); break; case 0x40: // [MS-DOC], v20140721, 2.6.4, sprmSNFtnRef - newSEP.setNfcFtnRef((int) sprm.getOperand()); + newSEP.setNfcFtnRef(sprm.getOperand()); break; case 0x41: // [MS-DOC], v20140721, 2.6.4, sprmSNEdn - newSEP.setNEdn((int) sprm.getOperand()); + newSEP.setNEdn(sprm.getOperand()); break; case 0x42: // [MS-DOC], v20140721, 2.6.4, sprmSNEdnRef - newSEP.setNfcEdnRef((int) sprm.getOperand()); + newSEP.setNfcEdnRef(sprm.getOperand()); break; default: logger.log(POILogger.INFO, "Unsupported Sprm operation: " + operation + " (" + HexDump.byteToHex(operation) + ")"); diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java index 0246501876..4e9c3b012d 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java @@ -1035,7 +1035,7 @@ public final class TestBugs { public void bug60294() throws IOException { HSLFSlideShow ppt = open("60294.ppt"); List shList = ppt.getSlides().get(0).getShapes(); - assertEquals(ShapeType.NOT_PRIMITIVE, ((HSLFAutoShape)shList.get(2)).getShapeType()); + assertEquals(ShapeType.NOT_PRIMITIVE, shList.get(2).getShapeType()); ppt.close(); } } diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java index ca0caf5b0e..1f222b6b27 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java @@ -46,7 +46,7 @@ public class TestOfficeDrawings extends TestCase EscherOptRecord officeArtFOPT = escherContainerRecord .getChildById( (short) 0xF00B ); - EscherComplexProperty gtextUNICODE = (EscherComplexProperty) officeArtFOPT + EscherComplexProperty gtextUNICODE = officeArtFOPT .lookup( 0x00c0 ); String text = StringUtil.getFromUnicodeLE(gtextUNICODE.getComplexData()); diff --git a/src/testcases/org/apache/poi/TestPOIDocumentMain.java b/src/testcases/org/apache/poi/TestPOIDocumentMain.java index 3c06fd346b..83668b5c70 100644 --- a/src/testcases/org/apache/poi/TestPOIDocumentMain.java +++ b/src/testcases/org/apache/poi/TestPOIDocumentMain.java @@ -137,14 +137,14 @@ public final class TestPOIDocumentMain { doc.write(baos); ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - ((HSSFWorkbook)doc).close(); + doc.close(); doc = new HSSFWorkbook(bais); assertNotNull(doc.getSummaryInformation()); assertNotNull(doc.getDocumentSummaryInformation()); - ((HSSFWorkbook)doc).close(); + doc.close(); } @Test @@ -159,7 +159,7 @@ public final class TestPOIDocumentMain { ByteArrayOutputStream baos = new ByteArrayOutputStream(); doc.write(baos); - ((HSSFWorkbook)doc).close(); + doc.close(); ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); doc = new HSSFWorkbook(bais); @@ -176,7 +176,7 @@ public final class TestPOIDocumentMain { baos = new ByteArrayOutputStream(); doc.write(baos); - ((HSSFWorkbook)doc).close(); + doc.close(); bais = new ByteArrayInputStream(baos.toByteArray()); doc = new HSSFWorkbook(bais); @@ -194,6 +194,6 @@ public final class TestPOIDocumentMain { assertEquals("POI Testing", doc.getSummaryInformation().getAuthor()); assertEquals("ASF", doc.getDocumentSummaryInformation().getCompany()); - ((HSSFWorkbook)doc).close(); + doc.close(); } } diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java b/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java index eb8bedea69..b58ccec8e9 100644 --- a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java +++ b/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java @@ -91,12 +91,12 @@ public final class TestFormulaParser { * @return parsed token array already confirmed not null */ /* package */ static Ptg[] parseFormula(String formula) { - Ptg[] result = HSSFFormulaParser.parse(formula, (HSSFWorkbook)null); + Ptg[] result = HSSFFormulaParser.parse(formula, null); assertNotNull("Ptg array should not be null", result); return result; } private static String toFormulaString(Ptg[] ptgs) { - return HSSFFormulaParser.toFormulaString((HSSFWorkbook)null, ptgs); + return HSSFFormulaParser.toFormulaString(null, ptgs); } @Test @@ -1456,7 +1456,7 @@ public final class TestFormulaParser { MemFuncPtg mf = (MemFuncPtg)ptgs[0]; assertEquals(57, mf.getLenRefSubexpression()); - assertEquals("D4:E5", ((AreaPtgBase)ptgs[7]).toFormulaString()); + assertEquals("D4:E5", ptgs[7].toFormulaString()); assertTrue(((AttrPtg)ptgs[16]).isSum()); ptgs = parseFormula("SUM(A1:B2:C3:D4)"); @@ -1567,7 +1567,7 @@ public final class TestFormulaParser { Ptg[] ptgs; try { ptgs = HSSFFormulaParser.parse(leadingZeroCellRef, wb); - assertEquals("B1", ((RefPtg) ptgs[0]).toFormulaString()); + assertEquals("B1", ptgs[0].toFormulaString()); } catch (FormulaParseException e) { confirmParseException(e, "Specified named range '" + leadingZeroCellRef + "' does not exist in the current workbook."); diff --git a/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java b/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java index a0b0b8a9ae..a6e83c77c4 100644 --- a/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java +++ b/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java @@ -33,7 +33,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook; public final class TestOperandClassTransformer extends TestCase { private static Ptg[] parseFormula(String formula) { - Ptg[] result = HSSFFormulaParser.parse(formula, (HSSFWorkbook)null); + Ptg[] result = HSSFFormulaParser.parse(formula, null); assertNotNull("Ptg array should not be null", result); return result; } diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java index ebdbe9ca41..593963b14a 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java @@ -579,6 +579,6 @@ public final class TestFormulaEvaluatorBugs { assertEquals(RefPtg.class, ptg.getClass()); assertEquals(0, ((RefPtg)ptg).getRow()); assertEquals(0, ((RefPtg)ptg).getColumn()); - assertEquals(rv, ((RefPtg)ptg).getRVAType()); + assertEquals(rv, ptg.getRVAType()); } } diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java index f8162fcf28..283d157f83 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java @@ -57,7 +57,7 @@ public final class TestHSSFComment extends BaseTestCellComment { @Test public void defaultShapeType() { - HSSFComment comment = new HSSFComment((HSSFShape)null, new HSSFClientAnchor()); + HSSFComment comment = new HSSFComment(null, new HSSFClientAnchor()); assertEquals(HSSFSimpleShape.OBJECT_TYPE_COMMENT, comment.getShapeType()); } diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java index 6c6631a9b1..5326e759d9 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java @@ -42,7 +42,7 @@ public final class TestHSSFPictureData extends TestCase{ HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SimpleWithImages.xls"); @SuppressWarnings("unchecked") // TODO - add getFormat() to interface PictureData and genericise wb.getAllPictures() - List lst = (List)(List)wb.getAllPictures(); + List lst = wb.getAllPictures(); //assertEquals(2, lst.size()); for (final HSSFPictureData pict : lst) { @@ -74,7 +74,7 @@ public final class TestHSSFPictureData extends TestCase{ HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("53446.xls"); @SuppressWarnings("unchecked") - List lst = (List)(List)wb.getAllPictures(); + List lst = wb.getAllPictures(); assertEquals(1, lst.size()); HSSFPictureData pict = lst.get(0); @@ -98,7 +98,7 @@ public final class TestHSSFPictureData extends TestCase{ HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SheetWithDrawing.xls"); @SuppressWarnings("unchecked") // TODO - add getFormat() to interface PictureData and genericise wb.getAllPictures() - List lst = (List)(List)wb.getAllPictures(); + List lst = wb.getAllPictures(); for(HSSFPictureData pict : lst){ assertNotNull(pict); }