Author: centic
Date: Sat Sep 16 08:21:28 2017
New Revision: 1808508
URL: http://svn.apache.org/viewvc?rev=1808508&view=rev
Log:
Let IntelliJ cleanup some code-warnings across the whole code-base: unnecessary
casts
Modified:
poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
poi/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
poi/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
poi/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java
poi/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java Sat Sep 16
08:21:28 2017
@@ -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());
}
/**
Modified:
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
Sat Sep 16 08:21:28 2017
@@ -203,7 +203,7 @@ public class EventBasedExcelExtractor ex
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
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java Sat Sep
16 08:21:28 2017
@@ -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();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java Sat Sep
16 08:21:28 2017
@@ -522,7 +522,7 @@ public final class EscherAggregate exten
}
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 exten
*/
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);
}
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
Sat Sep 16 08:21:28 2017
@@ -275,7 +275,7 @@ public final class ValueRecordsAggregate
short[] xfs = new short[nBlank];
for (int i = 0; i < xfs.length; i++) {
- xfs[i] = ((BlankRecord)cellValues[startIx +
i]).getXFIndex();
+ xfs[i] = cellValues[startIx + i].getXFIndex();
}
int rowIx = cellValues[startIx].getRow();
return new MulBlankRecord(rowIx, startIx, xfs);
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java Sat Sep
16 08:21:28 2017
@@ -247,7 +247,7 @@ public class HSSFPicture extends HSSFSim
* The filename of the embedded image
*/
public String getFileName() {
- EscherComplexProperty propFile = (EscherComplexProperty)
getOptRecord().lookup(
+ EscherComplexProperty propFile = getOptRecord().lookup(
EscherProperties.BLIP__BLIPFILENAME);
return (null == propFile)
? ""
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
Sat Sep 16 08:21:28 2017
@@ -174,7 +174,7 @@ public final class HSSFRichTextString im
*/
public void applyFont(int startIndex, int endIndex, Font font)
{
- applyFont(startIndex, endIndex, ((HSSFFont) font).getIndex());
+ applyFont(startIndex, endIndex, font.getIndex());
}
/**
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Sat Sep 16
08:21:28 2017
@@ -2130,7 +2130,7 @@ public final class HSSFSheet implements
*/
@Override
public void setDefaultColumnStyle(int column, CellStyle style) {
- _sheet.setDefaultColumnStyle(column, ((HSSFCellStyle)
style).getIndex());
+ _sheet.setDefaultColumnStyle(column, style.getIndex());
}
/**
Modified: poi/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java Sat
Sep 16 08:21:28 2017
@@ -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,
Modified: poi/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java Sat Sep
16 08:21:28 2017
@@ -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<Entry> 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,28 +63,13 @@ 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
*
* @param source
Modified:
poi/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/NPOIFSFileSystem.java
Sat Sep 16 08:21:28 2017
@@ -927,7 +927,7 @@ public class NPOIFSFileSystem extends Bl
{
if (preferArray())
{
- return (( POIFSViewable ) getRoot()).getViewableArray();
+ return getRoot().getViewableArray();
}
return new Object[ 0 ];
}
@@ -944,7 +944,7 @@ public class NPOIFSFileSystem extends Bl
{
if (!preferArray())
{
- return (( POIFSViewable ) getRoot()).getViewableIterator();
+ return getRoot().getViewableIterator();
}
return Collections.emptyList().iterator();
}
@@ -959,7 +959,7 @@ public class NPOIFSFileSystem extends Bl
public boolean preferArray()
{
- return (( POIFSViewable ) getRoot()).preferArray();
+ return getRoot().preferArray();
}
/**
Modified:
poi/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/OPOIFSFileSystem.java
Sat Sep 16 08:21:28 2017
@@ -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();
}
/**
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
(original)
+++
poi/trunk/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
Sat Sep 16 08:21:28 2017
@@ -209,14 +209,14 @@ public final class OperationEvaluationCo
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.");
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java Sat Sep 16
08:21:28 2017
@@ -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());
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java [UTF-8]
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/DateUtil.java [UTF-8] Sat
Sep 16 08:21:28 2017
@@ -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);
}
/**
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
Sat Sep 16 08:21:28 2017
@@ -489,7 +489,7 @@ implements SlideShow<XSLFShape,XSLFTextP
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 {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java Sat
Sep 16 08:21:28 2017
@@ -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 + ").");
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
Sat Sep 16 08:21:28 2017
@@ -521,7 +521,7 @@ public class XSSFWorkbook extends POIXML
@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);
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Sat Sep 16 08:21:28 2017
@@ -637,7 +637,7 @@ public class XWPFDocument extends POIXML
* 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;
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
Sat Sep 16 08:21:28 2017
@@ -297,7 +297,7 @@ public class XWPFFootnote implements Ite
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;
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
Sat Sep 16 08:21:28 2017
@@ -400,7 +400,7 @@ public abstract class XWPFHeaderFooter e
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;
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
Sat Sep 16 08:21:28 2017
@@ -95,7 +95,7 @@ public class XWPFSDTContent implements I
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) {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
Sat Sep 16 08:21:28 2017
@@ -273,7 +273,7 @@ public class XWPFTableCell implements IB
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;
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
Sat Sep 16 08:21:28 2017
@@ -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();
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
Sat Sep 16 08:21:28 2017
@@ -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();
}
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
Sat Sep 16 08:21:28 2017
@@ -714,7 +714,7 @@ public final class TestXSSFWorkbook exte
// 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();
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
Sat Sep 16 08:21:28 2017
@@ -59,7 +59,7 @@ public class HSLFEscherRecordFactory ext
escherRecord.setRecordId(recordId);
escherRecord.setOptions(options);
if (escherRecord instanceof EscherContainerRecord) {
- ((EscherContainerRecord)escherRecord).fillFields(data, offset,
this);
+ escherRecord.fillFields(data, offset, this);
}
return escherRecord;
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
Sat Sep 16 08:21:28 2017
@@ -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);
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
Sat Sep 16 08:21:28 2017
@@ -360,7 +360,7 @@ public final class HSLFHyperlink impleme
if (exobj != null && cldata != null) {
List<HSLFHyperlink> lst = new ArrayList<HSLFHyperlink>();
find(cldata.getHSLFChildRecords(), exobj, lst);
- return lst.isEmpty() ? null : (HSLFHyperlink)lst.get(0);
+ return lst.isEmpty() ? null : lst.get(0);
}
return null;
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
Sat Sep 16 08:21:28 2017
@@ -192,13 +192,13 @@ public abstract class HSLFShape implemen
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);
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
Sat Sep 16 08:21:28 2017
@@ -199,7 +199,7 @@ public abstract class HSLFSheet implemen
PPDrawing ppdrawing = getPPDrawing();
EscherContainerRecord dgContainer = ppdrawing.getDgContainer();
- EscherContainerRecord spgr = (EscherContainerRecord)
HSLFShape.getEscherChild(dgContainer, EscherContainerRecord.SPGR_CONTAINER);
+ EscherContainerRecord spgr = HSLFShape.getEscherChild(dgContainer,
EscherContainerRecord.SPGR_CONTAINER);
spgr.addChildRecord(shape.getSpContainer());
shape.setSheet(this);
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
Sat Sep 16 08:21:28 2017
@@ -162,7 +162,7 @@ public final class HSLFSlide extends HSL
//initialize drawing group id
EscherDggRecord dgg =
getSlideShow().getDocumentRecord().getPPDrawingGroup().getEscherDggRecord();
EscherContainerRecord dgContainer =
getSheetContainer().getPPDrawing().getDgContainer();
- EscherDgRecord dg = (EscherDgRecord)
HSLFShape.getEscherChild(dgContainer, EscherDgRecord.RECORD_ID);
+ EscherDgRecord dg = HSLFShape.getEscherChild(dgContainer,
EscherDgRecord.RECORD_ID);
int dgId = dgg.getMaxDrawingGroupId() + 1;
dg.setOptions((short)(dgId << 4));
dgg.setDrawingsSaved(dgg.getDrawingsSaved() + 1);
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
Sat Sep 16 08:21:28 2017
@@ -791,7 +791,7 @@ public final class HSLFSlideShow impleme
EscherContainerRecord bstore;
EscherContainerRecord dggContainer =
_documentRecord.getPPDrawingGroup().getDggContainer();
- bstore = (EscherContainerRecord)
HSLFShape.getEscherChild(dggContainer,
+ bstore = HSLFShape.getEscherChild(dggContainer,
EscherContainerRecord.BSTORE_CONTAINER);
if (bstore == null) {
bstore = new EscherContainerRecord();
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
Sat Sep 16 08:21:28 2017
@@ -1094,7 +1094,7 @@ public final class HSLFTextParagraph imp
RecordContainer _txtbox = headerAtom.getParentRecord();
if (_txtbox instanceof EscherTextboxWrapper) {
try {
- ((EscherTextboxWrapper) _txtbox).writeOut(null);
+ _txtbox.writeOut(null);
} catch (IOException e) {
throw new HSLFException("failed dummy write", e);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java Sat Sep
16 08:21:28 2017
@@ -487,7 +487,7 @@ public class MAPIMessage extends POIRead
public boolean has7BitEncodingStrings() {
for(Chunk c : mainChunks.getChunks()) {
if(c instanceof StringChunk) {
- if( ((StringChunk)c).getType() == Types.ASCII_STRING ) {
+ if( c.getType() == Types.ASCII_STRING ) {
return true;
}
}
@@ -496,7 +496,7 @@ public class MAPIMessage extends POIRead
if (nameIdChunks!=null) {
for(Chunk c : nameIdChunks.getChunks()) {
if(c instanceof StringChunk) {
- if( ((StringChunk)c).getType() == Types.ASCII_STRING ) {
+ if( c.getType() == Types.ASCII_STRING ) {
return true;
}
}
@@ -506,7 +506,7 @@ public class MAPIMessage extends POIRead
for(RecipientChunks rc : recipientChunks) {
for(Chunk c : rc.getAll()) {
if(c instanceof StringChunk) {
- if( ((StringChunk)c).getType() == Types.ASCII_STRING ) {
+ if( c.getType() == Types.ASCII_STRING ) {
return true;
}
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
Sat Sep 16 08:21:28 2017
@@ -93,7 +93,7 @@ public class HwmfDrawProperties {
this.bkMode = other.bkMode;
this.polyfillMode = other.polyfillMode;
if (other.region instanceof Rectangle2D) {
- this.region = ((Rectangle2D)other.region).getBounds2D();
+ this.region = other.region.getBounds2D();
} else if (other.region instanceof Area) {
this.region = new Area(other.region);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
(original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java Sat
Sep 16 08:21:28 2017
@@ -103,7 +103,7 @@ public class TextPiece extends PropertyN
}
public byte[] getRawBytes() {
- return ((CharSequence) _buf).toString().getBytes(
+ return _buf.toString().getBytes(
Charset.forName(_usesUnicode ? "UTF-16LE" : "Cp1252")
);
}
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
(original)
+++
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
Sat Sep 16 08:21:28 2017
@@ -225,19 +225,19 @@ public final class SectionSprmUncompress
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) + ")");
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
Sat Sep 16 08:21:28 2017
@@ -1035,7 +1035,7 @@ public final class TestBugs {
public void bug60294() throws IOException {
HSLFSlideShow ppt = open("60294.ppt");
List<HSLFShape> 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();
}
}
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
Sat Sep 16 08:21:28 2017
@@ -46,7 +46,7 @@ public class TestOfficeDrawings extends
EscherOptRecord officeArtFOPT = escherContainerRecord
.getChildById( (short) 0xF00B );
- EscherComplexProperty gtextUNICODE = (EscherComplexProperty)
officeArtFOPT
+ EscherComplexProperty gtextUNICODE = officeArtFOPT
.lookup( 0x00c0 );
String text =
StringUtil.getFromUnicodeLE(gtextUNICODE.getComplexData());
Modified: poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/TestPOIDocumentMain.java Sat Sep 16
08:21:28 2017
@@ -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();
}
}
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
Sat Sep 16 08:21:28 2017
@@ -91,12 +91,12 @@ public final class TestFormulaParser {
* @return parsed token array already confirmed not <code>null</code>
*/
/* 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.");
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
Sat Sep 16 08:21:28 2017
@@ -33,7 +33,7 @@ import org.apache.poi.hssf.usermodel.HSS
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;
}
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
Sat Sep 16 08:21:28 2017
@@ -579,6 +579,6 @@ public final class TestFormulaEvaluatorB
assertEquals(RefPtg.class, ptg.getClass());
assertEquals(0, ((RefPtg)ptg).getRow());
assertEquals(0, ((RefPtg)ptg).getColumn());
- assertEquals(rv, ((RefPtg)ptg).getRVAType());
+ assertEquals(rv, ptg.getRVAType());
}
}
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
Sat Sep 16 08:21:28 2017
@@ -57,7 +57,7 @@ public final class TestHSSFComment exten
@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());
}
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java?rev=1808508&r1=1808507&r2=1808508&view=diff
==============================================================================
---
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
Sat Sep 16 08:21:28 2017
@@ -42,7 +42,7 @@ public final class TestHSSFPictureData e
HSSFWorkbook wb =
HSSFTestDataSamples.openSampleWorkbook("SimpleWithImages.xls");
@SuppressWarnings("unchecked") // TODO - add getFormat() to interface
PictureData and genericise wb.getAllPictures()
- List<HSSFPictureData> lst =
(List<HSSFPictureData>)(List<?>)wb.getAllPictures();
+ List<HSSFPictureData> lst = wb.getAllPictures();
//assertEquals(2, lst.size());
for (final HSSFPictureData pict : lst) {
@@ -74,7 +74,7 @@ public final class TestHSSFPictureData e
HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("53446.xls");
@SuppressWarnings("unchecked")
- List<HSSFPictureData> lst =
(List<HSSFPictureData>)(List<?>)wb.getAllPictures();
+ List<HSSFPictureData> lst = wb.getAllPictures();
assertEquals(1, lst.size());
HSSFPictureData pict = lst.get(0);
@@ -98,7 +98,7 @@ public final class TestHSSFPictureData e
HSSFWorkbook wb =
HSSFTestDataSamples.openSampleWorkbook("SheetWithDrawing.xls");
@SuppressWarnings("unchecked") // TODO - add getFormat() to interface
PictureData and genericise wb.getAllPictures()
- List<HSSFPictureData> lst =
(List<HSSFPictureData>)(List<?>)wb.getAllPictures();
+ List<HSSFPictureData> lst = wb.getAllPictures();
for(HSSFPictureData pict : lst){
assertNotNull(pict);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
