diff options
118 files changed, 196 insertions, 338 deletions
diff --git a/src/examples/src/org/apache/poi/hssf/view/SViewer.java b/src/examples/src/org/apache/poi/hssf/view/SViewer.java index 1d3fefdff3..3d83c6aace 100644 --- a/src/examples/src/org/apache/poi/hssf/view/SViewer.java +++ b/src/examples/src/org/apache/poi/hssf/view/SViewer.java @@ -139,8 +139,7 @@ public String[][] getParameterInfo() { System.out.println(field); field = uc.getHeaderField(i); } - BufferedInputStream is = new BufferedInputStream(uc.getInputStream()); - return is; + return new BufferedInputStream(uc.getInputStream()); } diff --git a/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java b/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java index 3516b88e8d..c187a1b415 100644 --- a/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java +++ b/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java @@ -40,8 +40,7 @@ public final class Word2Forrest @SuppressWarnings("unused") public Word2Forrest(HWPFDocument doc, OutputStream stream) throws IOException { - OutputStreamWriter out = new OutputStreamWriter (stream, Charset.forName("UTF-8")); - _out = out; + _out = new OutputStreamWriter (stream, Charset.forName("UTF-8")); _doc = doc; init (); diff --git a/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java b/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java index 3d6b4423a1..678776c060 100644 --- a/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java +++ b/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java @@ -75,11 +75,8 @@ public class CalculateMortgage implements FreeRefFunction { public double calculateMortgagePayment( double p, double r, double y ) { double i = r / 12 ; double n = y * 12 ; - - double principalAndInterest = - p * (( i * Math.pow((1 + i),n ) ) / ( Math.pow((1 + i),n) - 1)) ; - - return principalAndInterest ; + + return p * (( i * Math.pow((1 + i),n ) ) / ( Math.pow((1 + i),n) - 1)); } /** * Excel does not support infinities and NaNs, rather, it gives a #NUM! error in these cases diff --git a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java b/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java index fa98628eee..2a745dd0ec 100644 --- a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java +++ b/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java @@ -154,9 +154,8 @@ public class ExcelAntWorkbookUtil extends Typedef { } UDFFinder udff1 = new DefaultUDFFinder(names, functions); - UDFFinder udff = new AggregatingUDFFinder(udff1); - return udff; + return new AggregatingUDFFinder(udff1); } diff --git a/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java b/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java index f1c526bf9d..2e2e62bf81 100644 --- a/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java +++ b/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java @@ -77,11 +77,8 @@ public class CalculateMortgageFunction implements FreeRefFunction { public double calculateMortgagePayment( double p, double r, double y ) { double i = r / 12 ; double n = y * 12 ; - - double principalAndInterest = - p * (( i * Math.pow((1 + i),n ) ) / ( Math.pow((1 + i),n) - 1)) ; - - return principalAndInterest ; + + return p * (( i * Math.pow((1 + i),n ) ) / ( Math.pow((1 + i),n) - 1)); } /** * Excel does not support infinities and NaNs, rather, it gives a #NUM! error in these cases diff --git a/src/java/org/apache/poi/ddf/EscherColorRef.java b/src/java/org/apache/poi/ddf/EscherColorRef.java index 949a905c98..0603329b18 100644 --- a/src/java/org/apache/poi/ddf/EscherColorRef.java +++ b/src/java/org/apache/poi/ddf/EscherColorRef.java @@ -218,12 +218,11 @@ public class EscherColorRef { } public int[] getRGB() { - int rgb[] = { + return new int[]{ FLAG_RED.getValue(colorRef), FLAG_GREEN.getValue(colorRef), FLAG_BLUE.getValue(colorRef) }; - return rgb; } /** diff --git a/src/java/org/apache/poi/hpsf/PropertySet.java b/src/java/org/apache/poi/hpsf/PropertySet.java index 0f5fbdbf6c..b21d1a036c 100644 --- a/src/java/org/apache/poi/hpsf/PropertySet.java +++ b/src/java/org/apache/poi/hpsf/PropertySet.java @@ -391,8 +391,7 @@ public class PropertySet { */ try { final byte[] buffer = IOUtils.peekFirstNBytes(stream, BUFFER_SIZE); - final boolean isPropertySetStream = isPropertySetStream(buffer, 0, buffer.length); - return isPropertySetStream; + return isPropertySetStream(buffer, 0, buffer.length); } catch (EmptyFileException e) { return false; } diff --git a/src/java/org/apache/poi/hpsf/Section.java b/src/java/org/apache/poi/hpsf/Section.java index 8ffa541e4d..0669ff34ca 100644 --- a/src/java/org/apache/poi/hpsf/Section.java +++ b/src/java/org/apache/poi/hpsf/Section.java @@ -955,8 +955,7 @@ public class Section { for (int i = 0; i < pa.length; i++) { hashCode += pa[i].hashCode(); } - final int returnHashCode = (int) (hashCode & 0x0ffffffffL); - return returnHashCode; + return (int) (hashCode & 0x0ffffffffL); } diff --git a/src/java/org/apache/poi/hpsf/Thumbnail.java b/src/java/org/apache/poi/hpsf/Thumbnail.java index 87bd68228f..f6e52c0192 100644 --- a/src/java/org/apache/poi/hpsf/Thumbnail.java +++ b/src/java/org/apache/poi/hpsf/Thumbnail.java @@ -198,9 +198,8 @@ public final class Thumbnail { */ public long getClipboardFormatTag() { - long clipboardFormatTag = LittleEndian.getInt(getThumbnail(), + return (long) LittleEndian.getInt(getThumbnail(), OFFSET_CFTAG); - return clipboardFormatTag; } diff --git a/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java b/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java index c3efc21d3d..da85c8a717 100644 --- a/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java +++ b/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java @@ -143,12 +143,9 @@ public class HPSFPropertiesExtractor extends POIOLE2TextExtractor { public static void main(String[] args) throws IOException { for (String file : args) { - HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor( - new NPOIFSFileSystem(new File(file))); - try { + try (HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor( + new NPOIFSFileSystem(new File(file)))) { System.out.println(ext.getText()); - } finally { - ext.close(); } } } diff --git a/src/java/org/apache/poi/hssf/dev/BiffViewer.java b/src/java/org/apache/poi/hssf/dev/BiffViewer.java index 09b57dedb8..9f0aa1323d 100644 --- a/src/java/org/apache/poi/hssf/dev/BiffViewer.java +++ b/src/java/org/apache/poi/hssf/dev/BiffViewer.java @@ -422,8 +422,7 @@ public final class BiffViewer { } else { boolean dumpInterpretedRecords = cmdArgs.shouldDumpRecordInterpretations(); boolean dumpHex = cmdArgs.shouldDumpBiffHex(); - boolean zeroAlignHexDump = dumpInterpretedRecords; // TODO - fix non-zeroAlign - runBiffViewer(pw, is, dumpInterpretedRecords, dumpHex, zeroAlignHexDump, + runBiffViewer(pw, is, dumpInterpretedRecords, dumpHex, dumpInterpretedRecords, cmdArgs.suppressHeader()); } } finally { diff --git a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java index 44c5fb009d..5b9e7c57ae 100644 --- a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java +++ b/src/java/org/apache/poi/hssf/model/InternalWorkbook.java @@ -491,10 +491,8 @@ public final class InternalWorkbook { "There are only " + numfonts + " font records, you asked for " + idx); } - FontRecord retval = - ( FontRecord ) records.get((records.getFontpos() - (numfonts - 1)) + index); - return retval; + return ( FontRecord ) records.get((records.getFontpos() - (numfonts - 1)) + index); } /** @@ -867,10 +865,8 @@ public final class InternalWorkbook { int xfptr = records.getXfpos() - (numxfs - 1); xfptr += index; - ExtendedFormatRecord retval = - ( ExtendedFormatRecord ) records.get(xfptr); - return retval; + return ( ExtendedFormatRecord ) records.get(xfptr); } /** diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java b/src/java/org/apache/poi/hssf/record/CFHeaderBase.java index 8ef254c710..015917e25e 100644 --- a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java +++ b/src/java/org/apache/poi/hssf/record/CFHeaderBase.java @@ -36,8 +36,7 @@ public abstract class CFHeaderBase extends StandardRecord implements Cloneable { protected CFHeaderBase() { } protected CFHeaderBase(CellRangeAddress[] regions, int nRules) { - CellRangeAddress[] unmergedRanges = regions; - CellRangeAddress[] mergeCellRanges = CellRangeUtil.mergeCellRanges(unmergedRanges); + CellRangeAddress[] mergeCellRanges = CellRangeUtil.mergeCellRanges(regions); setCellRanges(mergeCellRanges); field_1_numcf = nRules; } diff --git a/src/java/org/apache/poi/hssf/record/EndSubRecord.java b/src/java/org/apache/poi/hssf/record/EndSubRecord.java index 2143c36b8a..c9e487d592 100644 --- a/src/java/org/apache/poi/hssf/record/EndSubRecord.java +++ b/src/java/org/apache/poi/hssf/record/EndSubRecord.java @@ -77,8 +77,7 @@ public final class EndSubRecord extends SubRecord implements Cloneable { @Override public EndSubRecord clone() { - EndSubRecord rec = new EndSubRecord(); - - return rec; + + return new EndSubRecord(); } } diff --git a/src/java/org/apache/poi/hssf/record/EscherAggregate.java b/src/java/org/apache/poi/hssf/record/EscherAggregate.java index 7fdf83f55a..10381fb5fd 100644 --- a/src/java/org/apache/poi/hssf/record/EscherAggregate.java +++ b/src/java/org/apache/poi/hssf/record/EscherAggregate.java @@ -522,8 +522,7 @@ public final class EscherAggregate extends AbstractEscherHolderRecord { } for (NoteRecord noteRecord : tailRec.values()) { - Record rec = noteRecord; - pos += rec.serialize(pos, data); + pos += noteRecord.serialize(pos, data); } int bytesWritten = pos - offset; if (bytesWritten != getRecordSize()) diff --git a/src/java/org/apache/poi/hssf/record/FormatRecord.java b/src/java/org/apache/poi/hssf/record/FormatRecord.java index 575f709fb1..f16b55d02b 100644 --- a/src/java/org/apache/poi/hssf/record/FormatRecord.java +++ b/src/java/org/apache/poi/hssf/record/FormatRecord.java @@ -128,8 +128,7 @@ public final class FormatRecord extends StandardRecord implements Cloneable { throw new IllegalArgumentException("Bad requested string length (" + requestedLength + ")"); } char[] buf = null; - boolean isCompressedEncoding = pIsCompressedEncoding; - int availableChars = isCompressedEncoding ? ris.remaining() : ris.remaining() / LittleEndianConsts.SHORT_SIZE; + int availableChars = pIsCompressedEncoding ? ris.remaining() : ris.remaining() / LittleEndianConsts.SHORT_SIZE; //everything worked out. Great! int remaining = ris.remaining(); if (requestedLength == availableChars) { @@ -142,7 +141,7 @@ public final class FormatRecord extends StandardRecord implements Cloneable { } for (int i = 0; i < buf.length; i++) { char ch; - if (isCompressedEncoding) { + if (pIsCompressedEncoding) { ch = (char) ris.readUByte(); } else { ch = (char) ris.readShort(); diff --git a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java b/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java index f9ebfd34aa..d1e5121154 100644 --- a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java +++ b/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java @@ -82,8 +82,7 @@ public final class MergeCellsRecord extends StandardRecord implements Cloneable @Override public void serialize(LittleEndianOutput out) { - int nItems = _numberOfRegions; - out.writeShort(nItems); + out.writeShort(_numberOfRegions); for (int i = 0; i < _numberOfRegions; i++) { _regions[_startIndex + i].serialize(out); } diff --git a/src/java/org/apache/poi/hssf/record/NameCommentRecord.java b/src/java/org/apache/poi/hssf/record/NameCommentRecord.java index 0a3323f886..63705cc7f8 100644 --- a/src/java/org/apache/poi/hssf/record/NameCommentRecord.java +++ b/src/java/org/apache/poi/hssf/record/NameCommentRecord.java @@ -84,22 +84,21 @@ public final class NameCommentRecord extends StandardRecord { * @param ris the RecordInputstream to read the record from */ public NameCommentRecord(final RecordInputStream ris) { - final LittleEndianInput in = ris; - field_1_record_type = in.readShort(); - field_2_frt_cell_ref_flag = in.readShort(); - field_3_reserved = in.readLong(); - final int field_4_name_length = in.readShort(); - final int field_5_comment_length = in.readShort(); - - if (in.readByte() == 0) { - field_6_name_text = StringUtil.readCompressedUnicode(in, field_4_name_length); + field_1_record_type = ris.readShort(); + field_2_frt_cell_ref_flag = ris.readShort(); + field_3_reserved = ris.readLong(); + final int field_4_name_length = ris.readShort(); + final int field_5_comment_length = ris.readShort(); + + if (ris.readByte() == 0) { + field_6_name_text = StringUtil.readCompressedUnicode(ris, field_4_name_length); } else { - field_6_name_text = StringUtil.readUnicodeLE(in, field_4_name_length); + field_6_name_text = StringUtil.readUnicodeLE(ris, field_4_name_length); } - if (in.readByte() == 0) { - field_7_comment_text = StringUtil.readCompressedUnicode(in, field_5_comment_length); + if (ris.readByte() == 0) { + field_7_comment_text = StringUtil.readCompressedUnicode(ris, field_5_comment_length); } else { - field_7_comment_text = StringUtil.readUnicodeLE(in, field_5_comment_length); + field_7_comment_text = StringUtil.readUnicodeLE(ris, field_5_comment_length); } } diff --git a/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java b/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java index 2bd79d6427..3a3a4e33b4 100644 --- a/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java +++ b/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java @@ -103,13 +103,12 @@ public final class RecordFactoryInputStream { } public RecordInputStream createDecryptingStream(InputStream original) { - FilePassRecord fpr = _filePassRec; - String userPassword = Biff8EncryptionKey.getCurrentUserPassword(); + String userPassword = Biff8EncryptionKey.getCurrentUserPassword(); if (userPassword == null) { userPassword = Decryptor.DEFAULT_PASSWORD; } - EncryptionInfo info = fpr.getEncryptionInfo(); + EncryptionInfo info = _filePassRec.getEncryptionInfo(); try { if (!info.getDecryptor().verifyPassword(userPassword)) { throw new EncryptedDocumentException( diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java index 4e9a299186..8dc14adb60 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java @@ -363,12 +363,11 @@ public final class ColumnInfoRecordsAggregate extends RecordAggregate implements attemptMergeColInfoRecords(k); } else { //split to 3 records - ColumnInfoRecord ciStart = ci; - ColumnInfoRecord ciMid = copyColInfo(ci); + ColumnInfoRecord ciMid = copyColInfo(ci); ColumnInfoRecord ciEnd = copyColInfo(ci); int lastcolumn = ci.getLastColumn(); - ciStart.setLastColumn(targetColumnIx - 1); + ci.setLastColumn(targetColumnIx - 1); ciMid.setFirstColumn(targetColumnIx); ciMid.setLastColumn(targetColumnIx); diff --git a/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java b/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java index e7859a087a..f85b3375a3 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java @@ -46,13 +46,12 @@ public final class MergedCellsTable extends RecordAggregate { * @param rs */ public void read(RecordStream rs) { - List<CellRangeAddress> temp = _mergedRegions; - while (rs.peekNextClass() == MergeCellsRecord.class) { + while (rs.peekNextClass() == MergeCellsRecord.class) { MergeCellsRecord mcr = (MergeCellsRecord) rs.getNext(); int nRegions = mcr.getNumAreas(); for (int i = 0; i < nRegions; i++) { CellRangeAddress cra = mcr.getAreaAt(i); - temp.add(cra); + _mergedRegions.add(cra); } } } @@ -67,10 +66,9 @@ public final class MergedCellsTable extends RecordAggregate { int nMergedCellsRecords = nRegions / MAX_MERGED_REGIONS; int nLeftoverMergedRegions = nRegions % MAX_MERGED_REGIONS; - int result = nMergedCellsRecords - * (4 + CellRangeAddressList.getEncodedSize(MAX_MERGED_REGIONS)) + 4 - + CellRangeAddressList.getEncodedSize(nLeftoverMergedRegions); - return result; + return nMergedCellsRecords + * (4 + CellRangeAddressList.getEncodedSize(MAX_MERGED_REGIONS)) + 4 + + CellRangeAddressList.getEncodedSize(nLeftoverMergedRegions); } public void visitContainedRecords(RecordVisitor rv) { diff --git a/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java b/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java index ed5b7ecb3a..ff12e1df8c 100644 --- a/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java +++ b/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java @@ -172,8 +172,7 @@ public final class SharedValueManager { _groupsCache.put(getKeyForCache(group._firstCell),group); } } - SharedFormulaGroup sfg = _groupsCache.get(getKeyForCache(cellRef)); - return sfg; + return _groupsCache.get(getKeyForCache(cellRef)); } private Integer getKeyForCache(final CellReference cellRef) { diff --git a/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java b/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java index 88a7efcf28..10e4bd4f88 100644 --- a/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java @@ -66,8 +66,7 @@ public final class BeginRecord extends StandardRecord implements Cloneable { @Override public BeginRecord clone() { - BeginRecord br = new BeginRecord(); - // No data so nothing to copy - return br; + // No data so nothing to copy + return new BeginRecord(); } } diff --git a/src/java/org/apache/poi/hssf/record/chart/EndRecord.java b/src/java/org/apache/poi/hssf/record/chart/EndRecord.java index 23d09d1638..238c5ae11a 100644 --- a/src/java/org/apache/poi/hssf/record/chart/EndRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/EndRecord.java @@ -67,8 +67,7 @@ public final class EndRecord extends StandardRecord implements Cloneable { @Override public EndRecord clone() { - EndRecord er = new EndRecord(); - // No data so nothing to copy - return er; + // No data so nothing to copy + return new EndRecord(); } } diff --git a/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java b/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java index 775354cd13..e33e479ca5 100644 --- a/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java @@ -64,8 +64,6 @@ public final class PlotAreaRecord extends StandardRecord { } public Object clone() { - PlotAreaRecord rec = new PlotAreaRecord(); - - return rec; + return new PlotAreaRecord(); } } diff --git a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java b/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java index 7b10c1ed8a..5fce4c17de 100644 --- a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java +++ b/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java @@ -151,9 +151,8 @@ public class EscherGraphics extends Graphics @Override public Graphics create() { - EscherGraphics g = new EscherGraphics(escherGroup, workbook, + return new EscherGraphics(escherGroup, workbook, foreground, font, verticalPointsPerPixel ); - return g; } @Override diff --git a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java b/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java index 949168aac1..af3eb3463a 100644 --- a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java +++ b/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java @@ -127,8 +127,7 @@ public final class EscherGraphics2d extends Graphics2D { public Graphics create() { - EscherGraphics2d g2d = new EscherGraphics2d(_escherGraphics); - return g2d; + return new EscherGraphics2d(_escherGraphics); } public void dispose() diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java b/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java index 6e029b2385..b164aec685 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java @@ -108,8 +108,7 @@ public final class HSSFRichTextString implements Comparable<HSSFRichTextString>, private UnicodeString cloneStringIfRequired() { if (_book == null) return _string; - UnicodeString s = (UnicodeString)_string.clone(); - return s; + return (UnicodeString)_string.clone(); } private void addToSSTIfRequired() { diff --git a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java b/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java index 5f09b69bea..e305376904 100644 --- a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java +++ b/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java @@ -570,7 +570,6 @@ public class CryptoFunctions { /* * SET Intermediate3 TO Intermediate1 BITWISE OR Intermediate2 */ - short intermediate3 = (short)(intermediate1 | intermediate2); - return intermediate3; + return (short)(intermediate1 | intermediate2); } } diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java b/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java index 8be9ab3faa..4e1964b28c 100644 --- a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java @@ -125,8 +125,7 @@ public class BinaryRC4Decryptor extends Decryptor implements Cloneable { hash = new byte[5]; System.arraycopy(hashAlg.digest(), 0, hash, 0, 5); - SecretKey skey = new SecretKeySpec(hash, ver.getCipherAlgorithm().jceId); - return skey; + return new SecretKeySpec(hash, ver.getCipherAlgorithm().jceId); } @Override diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java b/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java index 743fedb38f..6b40516ef3 100644 --- a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java @@ -82,8 +82,7 @@ public class BinaryRC4Encryptor extends Encryptor implements Cloneable { @Override public OutputStream getDataStream(DirectoryNode dir) throws IOException, GeneralSecurityException { - OutputStream countStream = new BinaryRC4CipherOutputStream(dir); - return countStream; + return new BinaryRC4CipherOutputStream(dir); } @Override diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java b/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java index f1b5e235ac..d383ae4eab 100644 --- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java @@ -134,8 +134,7 @@ public class CryptoAPIDecryptor extends Decryptor implements Cloneable { MessageDigest hashAlg = CryptoFunctions.getMessageDigest(hashAlgo); hashAlg.update(ver.getSalt()); byte hash[] = hashAlg.digest(StringUtil.getToUnicodeLE(password)); - SecretKey skey = new SecretKeySpec(hash, ver.getCipherAlgorithm().jceId); - return skey; + return new SecretKeySpec(hash, ver.getCipherAlgorithm().jceId); } @Override diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java b/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java index d06f9a3738..682d77190b 100644 --- a/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java @@ -98,8 +98,7 @@ public class StandardDecryptor extends Decryptor implements Cloneable { byte[] key = Arrays.copyOf(x3, keySize); - SecretKey skey = new SecretKeySpec(key, ver.getCipherAlgorithm().jceId); - return skey; + return new SecretKeySpec(key, ver.getCipherAlgorithm().jceId); } protected static byte[] fillAndXor(byte hash[], byte fillByte) { diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java b/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java index 2c35ac51eb..7c74d47871 100644 --- a/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java +++ b/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java @@ -256,9 +256,8 @@ public class POIFSDocumentPath } String[] parentComponents = new String[ length ]; System.arraycopy(components, 0, parentComponents, 0, length); - POIFSDocumentPath parent = new POIFSDocumentPath(parentComponents); - - return parent; + + return new POIFSDocumentPath(parentComponents); } /** diff --git a/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java b/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java index 2f9528318d..605b749af6 100644 --- a/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java +++ b/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java @@ -38,10 +38,9 @@ public final class SmallBlockTableReader { blockList.fetchBlocks(root.getStartBlock(), -1); // Turn that into a list - BlockList list =new SmallDocumentBlockList( - SmallDocumentBlock.extract(bigBlockSize, smallBlockBlocks)); - return list; + return new SmallDocumentBlockList( + SmallDocumentBlock.extract(bigBlockSize, smallBlockBlocks)); } private static BlockAllocationTableReader prepareReader( final POIFSBigBlockSize bigBlockSize, diff --git a/src/java/org/apache/poi/sl/draw/DrawPaint.java b/src/java/org/apache/poi/sl/draw/DrawPaint.java index 890638f234..a242149afe 100644 --- a/src/java/org/apache/poi/sl/draw/DrawPaint.java +++ b/src/java/org/apache/poi/sl/draw/DrawPaint.java @@ -256,9 +256,8 @@ public class DrawPaint { LOG.log(POILogger.ERROR, "Can't load image data"); return null; } - Paint paint = new java.awt.TexturePaint(image, textAnchor); - return paint; + return new java.awt.TexturePaint(image, textAnchor); } /** diff --git a/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java b/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java index 1006134d5f..0abd5d62a5 100644 --- a/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java +++ b/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java @@ -174,8 +174,7 @@ public enum AutoNumberingScheme { public String format(int value) { String index = formatIndex(value); String cased = formatCase(index); - String seperated = formatSeperator(cased); - return seperated; + return formatSeperator(cased); } private String formatSeperator(String cased) { diff --git a/src/java/org/apache/poi/ss/format/CellNumberFormatter.java b/src/java/org/apache/poi/ss/format/CellNumberFormatter.java index acd9838821..764456a369 100644 --- a/src/java/org/apache/poi/ss/format/CellNumberFormatter.java +++ b/src/java/org/apache/poi/ss/format/CellNumberFormatter.java @@ -245,13 +245,12 @@ public class CellNumberFormatter extends CellFormatter { } else { StringBuffer fmtBuf = new StringBuffer(); boolean first = true; - List<Special> specialList = integerSpecials; if (integerSpecials.size() == 1) { // If we don't do this, we get ".6e5" instead of "6e4" fmtBuf.append("0"); first = false; } else - for (Special s : specialList) { + for (Special s : integerSpecials) { if (isDigitFmt(s)) { fmtBuf.append(first ? '#' : '0'); first = false; diff --git a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java b/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java index 43160f3e92..cc24a8b1fb 100644 --- a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java +++ b/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java @@ -132,13 +132,12 @@ public abstract class BaseFormulaEvaluator implements FormulaEvaluator, Workbook if (cell == null) { return null; } - Cell result = cell; if (cell.getCellTypeEnum() == CellType.FORMULA) { CellValue cv = evaluateFormulaCellValue(cell); setCellValue(cell, cv); setCellType(cell, cv); // cell will no longer be a formula cell } - return result; + return cell; } protected abstract CellValue evaluateFormulaCellValue(Cell cell); diff --git a/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java b/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java index 8bfe0932c3..6c39634117 100644 --- a/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java +++ b/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java @@ -421,13 +421,12 @@ public class EvaluationConditionalFormatRule implements Comparable<EvaluationCon return getMeaningfulValues(region, false, new ValueFunction() { @Override public Set<ValueAndFormat> evaluate(List<ValueAndFormat> allValues) { - List<ValueAndFormat> values = allValues; final ConditionFilterData conf = rule.getFilterConfiguration(); if (! conf.getBottom()) { - Collections.sort(values, Collections.reverseOrder()); + Collections.sort(allValues, Collections.reverseOrder()); } else { - Collections.sort(values); + Collections.sort(allValues); } int limit = (int) conf.getRank(); @@ -447,15 +446,14 @@ public class EvaluationConditionalFormatRule implements Comparable<EvaluationCon return getMeaningfulValues(region, true, new ValueFunction() { @Override public Set<ValueAndFormat> evaluate(List<ValueAndFormat> allValues) { - List<ValueAndFormat> values = allValues; - Collections.sort(values); + Collections.sort(allValues); final Set<ValueAndFormat> unique = new HashSet<>(); - for (int i=0; i < values.size(); i++) { - final ValueAndFormat v = values.get(i); + for (int i = 0; i < allValues.size(); i++) { + final ValueAndFormat v = allValues.get(i); // skip this if the current value matches the next one, or is the last one and matches the previous one - if ( (i < values.size()-1 && v.equals(values.get(i+1)) ) || ( i > 0 && i == values.size()-1 && v.equals(values.get(i-1)) ) ) { + if ( (i < allValues.size()-1 && v.equals(allValues.get(i+1)) ) || ( i > 0 && i == allValues.size()-1 && v.equals(allValues.get(i-1)) ) ) { // current value matches next value, skip both i++; continue; @@ -472,15 +470,14 @@ public class EvaluationConditionalFormatRule implements Comparable<EvaluationCon return getMeaningfulValues(region, true, new ValueFunction() { @Override public Set<ValueAndFormat> evaluate(List<ValueAndFormat> allValues) { - List<ValueAndFormat> values = allValues; - Collections.sort(values); + Collections.sort(allValues); final Set<ValueAndFormat> dup = new HashSet<>(); - for (int i=0; i < values.size(); i++) { - final ValueAndFormat v = values.get(i); + for (int i = 0; i < allValues.size(); i++) { + final ValueAndFormat v = allValues.get(i); // skip this if the current value matches the next one, or is the last one and matches the previous one - if ( (i < values.size()-1 && v.equals(values.get(i+1)) ) || ( i > 0 && i == values.size()-1 && v.equals(values.get(i-1)) ) ) { + if ( (i < allValues.size()-1 && v.equals(allValues.get(i+1)) ) || ( i > 0 && i == allValues.size()-1 && v.equals(allValues.get(i-1)) ) ) { // current value matches next value, add one dup.add(v); i++; @@ -499,19 +496,18 @@ public class EvaluationConditionalFormatRule implements Comparable<EvaluationCon List<ValueAndFormat> values = new ArrayList<>(getMeaningfulValues(region, false, new ValueFunction() { @Override public Set<ValueAndFormat> evaluate(List<ValueAndFormat> allValues) { - List<ValueAndFormat> values = allValues; double total = 0; - ValueEval[] pop = new ValueEval[values.size()]; - for (int i = 0; i < values.size(); i++) { - ValueAndFormat v = values.get(i); + ValueEval[] pop = new ValueEval[allValues.size()]; + for (int i = 0; i < allValues.size(); i++) { + ValueAndFormat v = allValues.get(i); total += v.value.doubleValue(); pop[i] = new NumberEval(v.value.doubleValue()); } final Set<ValueAndFormat> avgSet = new LinkedHashSet<>(1); - avgSet.add(new ValueAndFormat(new Double(values.size() == 0 ? 0 : total / values.size()), null)); + avgSet.add(new ValueAndFormat(new Double(allValues.size() == 0 ? 0 : total / allValues.size()), null)); - final double stdDev = values.size() <= 1 ? 0 : ((NumberEval) AggregateFunction.STDEV.evaluate(pop, 0, 0)).getNumberValue(); + final double stdDev = allValues.size() <= 1 ? 0 : ((NumberEval) AggregateFunction.STDEV.evaluate(pop, 0, 0)).getNumberValue(); avgSet.add(new ValueAndFormat(new Double(stdDev), null)); return avgSet; } diff --git a/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java b/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java index ed42c297ac..b1fe124d56 100644 --- a/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java +++ b/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java @@ -125,8 +125,7 @@ public final class WorkbookEvaluator { } /* package */ EvaluationName getName(String name, int sheetIndex) { - EvaluationName evalName = _workbook.getName(name, sheetIndex); - return evalName; + return _workbook.getName(name, sheetIndex); } private static boolean isDebugLogEnabled() { diff --git a/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java b/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java index 8418c4f740..f2cc9c2aa0 100644 --- a/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java +++ b/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java @@ -342,8 +342,7 @@ public final class DStarRunner implements Function3Arg { // Construct double from condition. double conditionValue = 0.0; try { - int intValue = Integer.parseInt(condition); - conditionValue = intValue; + conditionValue = Integer.parseInt(condition); } catch (NumberFormatException e) { // It's not an int. try { conditionValue = Double.parseDouble(condition); diff --git a/src/java/org/apache/poi/ss/formula/functions/Finance.java b/src/java/org/apache/poi/ss/formula/functions/Finance.java index 367438bfc2..a1b0604ff0 100644 --- a/src/java/org/apache/poi/ss/formula/functions/Finance.java +++ b/src/java/org/apache/poi/ss/formula/functions/Finance.java @@ -40,8 +40,7 @@ public class Finance { */ // http://arachnoid.com/lutusp/finance.html static public double pmt(double r, int nper, double pv, double fv, int type) { - double pmt = -r * (pv * Math.pow(1 + r, nper) + fv) / ((1 + r*type) * (Math.pow(1 + r, nper) - 1)); - return pmt; + return -r * (pv * Math.pow(1 + r, nper) + fv) / ((1 + r*type) * (Math.pow(1 + r, nper) - 1)); } @@ -153,8 +152,7 @@ public class Finance { */ //http://en.wikipedia.org/wiki/Future_value static public double fv(double r, int nper, double pmt, double pv, int type) { - double fv = -(pv * Math.pow(1 + r, nper) + pmt * (1+r*type) * (Math.pow(1 + r, nper) - 1) / r); - return fv; + return -(pv * Math.pow(1 + r, nper) + pmt * (1+r*type) * (Math.pow(1 + r, nper) - 1) / r); } /** diff --git a/src/java/org/apache/poi/ss/formula/functions/Index.java b/src/java/org/apache/poi/ss/formula/functions/Index.java index 1b6af36d73..2b667026ea 100644 --- a/src/java/org/apache/poi/ss/formula/functions/Index.java +++ b/src/java/org/apache/poi/ss/formula/functions/Index.java @@ -93,18 +93,17 @@ public final class Index implements Function2Arg, Function3Arg, Function4Arg { } private static TwoDEval convertFirstArg(ValueEval arg0) { - ValueEval firstArg = arg0; - if (firstArg instanceof RefEval) { + if (arg0 instanceof RefEval) { // convert to area ref for simpler code in getValueFromArea() - return ((RefEval)firstArg).offset(0, 0, 0, 0); + return ((RefEval) arg0).offset(0, 0, 0, 0); } - if((firstArg instanceof TwoDEval)) { - return (TwoDEval) firstArg; + if((arg0 instanceof TwoDEval)) { + return (TwoDEval) arg0; } // else the other variation of this function takes an array as the first argument // it seems like interface 'ArrayEval' does not even exist yet throw new RuntimeException("Incomplete code - cannot handle first arg of type (" - + firstArg.getClass().getName() + ")"); + + arg0.getClass().getName() + ")"); } diff --git a/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java b/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java index 72be101ca7..184ccdaa4e 100644 --- a/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java +++ b/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java @@ -365,11 +365,10 @@ public abstract class NumericFunction implements Function { double d0 = NumericFunction.singleOperandEvaluate(arg0, srcRowIndex, srcColumnIndex); double d1 = NumericFunction.singleOperandEvaluate(arg1, srcRowIndex, srcColumnIndex); double logE = Math.log(d0); - double base = d1; - if (Double.compare(base, Math.E) == 0) { + if (Double.compare(d1, Math.E) == 0) { result = logE; } else { - result = logE / Math.log(base); + result = logE / Math.log(d1); } NumericFunction.checkValue(result); } catch (EvaluationException e) { diff --git a/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java b/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java index 96da294451..c145dfad36 100644 --- a/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java +++ b/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java @@ -78,8 +78,7 @@ public final class AttrPtg extends ControlPtg { _options = in.readByte(); _data = in.readShort(); if (isOptimizedChoose()) { - int nCases = _data; - int[] jumpTable = new int[nCases]; + int[] jumpTable = new int[(int) _data]; for (int i = 0; i < jumpTable.length; i++) { jumpTable[i] = in.readUShort(); } diff --git a/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java b/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java index de88d1b8c2..4684ef40b7 100644 --- a/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java +++ b/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java @@ -79,9 +79,8 @@ public final class NameXPtg extends OperandPtg implements WorkbookDependentFormu } public String toString(){ - String retValue = "NameXPtg:[sheetRefIndex:" + _sheetRefIndex + - " , nameNumber:" + _nameNumber + "]" ; - return retValue; + return "NameXPtg:[sheetRefIndex:" + _sheetRefIndex + + " , nameNumber:" + _nameNumber + "]"; } public byte getDefaultOperandClass() { diff --git a/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java b/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java index 8a0377b9a8..8aea65ad23 100644 --- a/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java +++ b/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java @@ -153,7 +153,7 @@ public class CellCopyPolicy { } public Builder createBuilder() { - final Builder builder = new Builder() + return new Builder() .cellValue(copyCellValue) .cellStyle(copyCellStyle) .cellFormula(copyCellFormula) @@ -162,7 +162,6 @@ public class CellCopyPolicy { .rowHeight(copyRowHeight) .condenseRows(condenseRows) .mergedRegions(copyMergedRegions); - return builder; } /* diff --git a/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java b/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java index bd9500073e..194c793345 100644 --- a/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java +++ b/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java @@ -299,10 +299,9 @@ public abstract class CellRangeAddressBase { @Override public int hashCode() { - int code = (getMinColumn() + - (getMaxColumn() << 8) + - (getMinRow() << 16) + - (getMaxRow() << 24)); - return code; + return (getMinColumn() + + (getMaxColumn() << 8) + + (getMinRow() << 16) + + (getMaxRow() << 24)); } } diff --git a/src/java/org/apache/poi/ss/util/CellReference.java b/src/java/org/apache/poi/ss/util/CellReference.java index e2f4b3584c..b6be13936d 100644 --- a/src/java/org/apache/poi/ss/util/CellReference.java +++ b/src/java/org/apache/poi/ss/util/CellReference.java @@ -397,8 +397,7 @@ public class CellReference { String col = matcher.group(1); String row = matcher.group(2); - CellRefParts cellRefParts = new CellRefParts(sheetName, row, col); - return cellRefParts; + return new CellRefParts(sheetName, row, col); } private static String parseSheetName(String reference, int indexOfSheetNameDelimiter) { diff --git a/src/java/org/apache/poi/ss/util/ExpandedDouble.java b/src/java/org/apache/poi/ss/util/ExpandedDouble.java index b647adf217..24ef95cacc 100644 --- a/src/java/org/apache/poi/ss/util/ExpandedDouble.java +++ b/src/java/org/apache/poi/ss/util/ExpandedDouble.java @@ -62,8 +62,7 @@ final class ExpandedDouble { _significand = frac.shiftLeft(expAdj); _binaryExponent = (biasedExp & 0x07FF) - 1023 - expAdj; } else { - BigInteger frac = getFrac(rawBits); - _significand = frac; + _significand = getFrac(rawBits); _binaryExponent = (biasedExp & 0x07FF) - 1023; } } diff --git a/src/java/org/apache/poi/ss/util/ImageUtils.java b/src/java/org/apache/poi/ss/util/ImageUtils.java index be83ce838e..af54e26df3 100644 --- a/src/java/org/apache/poi/ss/util/ImageUtils.java +++ b/src/java/org/apache/poi/ss/util/ImageUtils.java @@ -210,12 +210,10 @@ public class ImageUtils { anchor.setRow2(row2); anchor.setDy2(dy2); - Dimension dim = new Dimension( + return new Dimension( (int)Math.round(scaledWidth*EMU_PER_PIXEL), (int)Math.round(scaledHeight*EMU_PER_PIXEL) ); - - return dim; } /** diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java index f44bf73673..03b053132f 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java @@ -209,8 +209,7 @@ public final class PackagingURIHelper { public static URI getPath(URI uri) { if (uri != null) { String path = uri.getPath(); - int len = path.length(); - int num2 = len; + int num2 = path.length(); while (--num2 >= 0) { char ch1 = path.charAt(num2); if (ch1 == PackagingURIHelper.FORWARD_SLASH_CHAR) { diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java index bf7402ea0e..0af90a2380 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java @@ -41,8 +41,7 @@ public final class FileHelper { public static File getDirectory(File f) { if (f != null) { String path = f.getPath(); - int len = path.length(); - int num2 = len; + int num2 = path.length(); while (--num2 >= 0) { char ch1 = path.charAt(num2); if (ch1 == File.separatorChar) { diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java b/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java index 99eb220012..407831a663 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java @@ -220,8 +220,7 @@ public class AgileEncryptor extends Encryptor implements Cloneable { public OutputStream getDataStream(DirectoryNode dir) throws IOException, GeneralSecurityException { // TODO: initialize headers - AgileCipherOutputStream countStream = new AgileCipherOutputStream(dir); - return countStream; + return new AgileCipherOutputStream(dir); } /** diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java index 955dc74453..f150d1046d 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java @@ -357,8 +357,7 @@ public class SignatureInfo implements SignatureConfigurable { digestInfoValueBuf.write(signatureConfig.getHashMagic()); digestInfoValueBuf.write(digest); byte[] digestInfoValue = digestInfoValueBuf.toByteArray(); - byte[] signatureValue = cipher.doFinal(digestInfoValue); - return signatureValue; + return cipher.doFinal(digestInfoValue); } catch (Exception e) { throw new EncryptedDocumentException(e); } diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java index 658047a637..3c96e37795 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java @@ -78,8 +78,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.NotesMasterDocument; try { try { NotesMasterDocument doc = NotesMasterDocument.Factory.parse(is, DEFAULT_XML_OPTIONS); - CTNotesMaster slide = doc.getNotesMaster(); - return slide; + return doc.getNotesMaster(); } finally { is.close(); } diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java index 6ab7711a84..619b10f216 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java @@ -90,8 +90,7 @@ public class XSLFShadow extends XSLFShape implements Shadow<XSLFShape,XSLFTextPa public Color getFillColor() { SolidPaint ps = getFillStyle(); if (ps == null) return null; - Color col = DrawPaint.applyColorTransform(ps.getSolidColor()); - return col; + return DrawPaint.applyColorTransform(ps.getSolidColor()); } @Override diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java index 86aa0b7c88..b6787a9eaa 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java @@ -485,8 +485,7 @@ public abstract class XSLFTextShape extends XSLFSimpleShape @Override public Insets2D getInsets() { - Insets2D insets = new Insets2D(getTopInset(), getLeftInset(), getBottomInset(), getRightInset()); - return insets; + return new Insets2D(getTopInset(), getLeftInset(), getBottomInset(), getRightInset()); } @Override diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java index 5dffccec1e..a98a556274 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java @@ -223,8 +223,7 @@ public class XSSFComment implements Comment { for (String s : position.split(",")) { pos[i++] = Integer.parseInt(s.trim()); } - XSSFClientAnchor ca = new XSSFClientAnchor(pos[1]*EMU_PER_PIXEL, pos[3]*EMU_PER_PIXEL, pos[5]*EMU_PER_PIXEL, pos[7]*EMU_PER_PIXEL, pos[0], pos[2], pos[4], pos[6]); - return ca; + return new XSSFClientAnchor(pos[1]*EMU_PER_PIXEL, pos[3]*EMU_PER_PIXEL, pos[5]*EMU_PER_PIXEL, pos[7]*EMU_PER_PIXEL, pos[0], pos[2], pos[4], pos[6]); } /** diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java index 2bfef58175..6fcbc32ec8 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java @@ -122,8 +122,7 @@ public class XSSFFont implements Font { */ public int getCharSet() { CTIntProperty charset = _ctFont.sizeOfCharsetArray() == 0 ? null : _ctFont.getCharsetArray(0); - int val = charset == null ? FontCharset.ANSI.getValue() : FontCharset.valueOf(charset.getVal()).getValue(); - return val; + return charset == null ? FontCharset.ANSI.getValue() : FontCharset.valueOf(charset.getVal()).getValue(); } @@ -214,8 +213,7 @@ public class XSSFFont implements Font { private double getFontHeightRaw() { CTFontSize size = _ctFont.sizeOfSzArray() == 0 ? null : _ctFont.getSzArray(0); if (size != null) { - double fontHeight = size.getVal(); - return fontHeight; + return size.getVal(); } return DEFAULT_FONT_SIZE; } diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java index acc7afe5f0..9b02e5749f 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java @@ -225,8 +225,7 @@ public class XSSFPivotTable extends POIXMLDocumentPart { protected AreaReference getPivotArea() { final Workbook wb = getDataSheet().getWorkbook(); - AreaReference pivotArea = getPivotCacheDefinition().getPivotArea(wb); - return pivotArea; + return getPivotCacheDefinition().getPivotArea(wb); } /** diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java index 5df01abda2..e59fd706b5 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java @@ -612,8 +612,7 @@ public class XSSFTextParagraph implements Iterable<XSSFTextRun>{ }; fetchParagraphProperty(fetcher); - double spcBef = fetcher.getValue() == null ? 0 : fetcher.getValue(); - return spcBef; + return fetcher.getValue() == null ? 0 : fetcher.getValue(); } /** diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java index b91b20b34e..0435f69bb5 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java @@ -74,8 +74,7 @@ public class XSSFSingleXmlCell { public String getXpath(){ CTXmlCellPr xmlCellPr = singleXmlCell.getXmlCellPr(); CTXmlPr xmlPr = xmlCellPr.getXmlPr(); - String xpath = xmlPr.getXpath(); - return xpath; + return xmlPr.getXpath(); } public long getMapId(){ 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 97c7c76f19..904fb3845d 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java @@ -1431,8 +1431,7 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody { public XWPFPictureData getPictureDataByID(String blipID) { POIXMLDocumentPart relatedPart = getRelationById(blipID); if (relatedPart instanceof XWPFPictureData) { - XWPFPictureData xwpfPicData = (XWPFPictureData) relatedPart; - return xwpfPicData; + return (XWPFPictureData) relatedPart; } return null; } diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java index cb1d089125..dfcbe56c54 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java @@ -1378,9 +1378,8 @@ public class XWPFParagraph implements IBodyElement, IRunBody, ISDTContents, Para * a new instance. */ private CTPPr getCTPPr() { - CTPPr pr = paragraph.getPPr() == null ? paragraph.addNewPPr() + return paragraph.getPPr() == null ? paragraph.addNewPPr() : paragraph.getPPr(); - return pr; } diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java index 2b6ab98380..381c6c202d 100644 --- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java @@ -106,8 +106,7 @@ public class PkiTestUtils { SecureRandom random = new SecureRandom(); keyPairGenerator.initialize(new RSAKeyGenParameterSpec(1024, RSAKeyGenParameterSpec.F4), random); - KeyPair keyPair = keyPairGenerator.generateKeyPair(); - return keyPair; + return keyPairGenerator.generateKeyPair(); } static X509Certificate generateCertificate(PublicKey subjectPublicKey, @@ -218,8 +217,7 @@ public class PkiTestUtils { documentBuilderFactory.setNamespaceAware(true); DocumentBuilder documentBuilder = documentBuilderFactory .newDocumentBuilder(); - Document document = documentBuilder.parse(inputSource); - return document; + return documentBuilder.parse(inputSource); } static String toString(Node dom) throws TransformerException { @@ -310,8 +308,7 @@ public class PkiTestUtils { OCSPRespBuilder ocspRespBuilder = new OCSPRespBuilder(); - OCSPResp ocspResp = ocspRespBuilder.build(OCSPRespBuilder.SUCCESSFUL, basicOCSPResp); - return ocspResp; + return ocspRespBuilder.build(OCSPRespBuilder.SUCCESSFUL, basicOCSPResp); } } diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java index ae234bda28..56339c1e32 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java @@ -341,8 +341,7 @@ public class TestXSSFDataValidation extends BaseTestDataValidation { DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper(); DataValidationConstraint constraint = dataValidationHelper.createCustomConstraint("true"); - final XSSFDataValidation validation = (XSSFDataValidation) dataValidationHelper.createValidation(constraint, new CellRangeAddressList(0, 0, 0, 0)); - return validation; + return (XSSFDataValidation) dataValidationHelper.createValidation(constraint, new CellRangeAddressList(0, 0, 0, 0)); } @Test diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java index 4eff222a24..dee55ab947 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java @@ -722,8 +722,7 @@ public final class TestXSSFSheet extends BaseTestXSheet { // Now check the low level stuff, and check that's all // been set correctly - XSSFSheet xs = sheet; - CTWorksheet cts = xs.getCTWorksheet(); + CTWorksheet cts = sheet.getCTWorksheet(); assertEquals(1, cts.sizeOfColsArray()); CTCols cols = cts.getColsArray(0); diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java index b492f4bda5..a2c8b55ac2 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java @@ -166,8 +166,6 @@ public final class SlideIdListing { long type = LittleEndian.getUShort(fileContents, pos+2); long rlen = LittleEndian.getUInt(fileContents, pos+4); - Record r = Record.createRecordForType(type,fileContents,pos,(int)rlen+8); - - return r; + return Record.createRecordForType(type,fileContents,pos,(int)rlen+8); } } diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java b/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java index 5f83d5688d..af779ede76 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java +++ b/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java @@ -124,8 +124,6 @@ public final class UserEditAndPersistListing { long type = LittleEndian.getUShort(fileContents, pos+2); long rlen = LittleEndian.getUInt(fileContents, pos+4); - Record r = Record.createRecordForType(type,fileContents,pos,(int)rlen+8); - - return r; + return Record.createRecordForType(type,fileContents,pos,(int)rlen+8); } } diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java b/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java index 5b3ca0ac12..4d0a0e90cf 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java +++ b/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java @@ -144,8 +144,7 @@ public final class QuickButCruddyTextExtractor { // Start walking the file, looking for the records while(walkPos != -1) { - int newPos = findTextRecords(walkPos,textV); - walkPos = newPos; + walkPos = findTextRecords(walkPos,textV); } // Return what we find diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java index c720a555ce..02f3c28b66 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java @@ -182,8 +182,7 @@ public final class ColorSchemeAtom extends RecordAtom { byte[] with_zero = new byte[4]; System.arraycopy(rgb,0,with_zero,0,3); with_zero[3] = 0; - int ret = LittleEndian.getInt(with_zero,0); - return ret; + return LittleEndian.getInt(with_zero,0); } diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java b/src/scratchpad/src/org/apache/poi/hslf/record/Record.java index 038ec27f05..97f2eb7d87 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/Record.java @@ -137,8 +137,7 @@ public abstract class Record } // Turn the vector into an array, and return - Record[] cRecords = children.toArray( new Record[children.size()] ); - return cRecords; + return children.toArray( new Record[children.size()] ); } /** diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java index 9b40a9893c..7a9ffbeb80 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java @@ -192,8 +192,7 @@ public final class TextRulerAtom extends RecordAtom { 0x00, 0x00, (byte)0xA6, 0x0F, 0x0A, 0x00, 0x00, 0x00, 0x10, 0x03, 0x00, 0x00, (byte)0xF9, 0x00, 0x41, 0x01, 0x41, 0x01 }; - TextRulerAtom ruler = new TextRulerAtom(data, 0, data.length); - return ruler; + return new TextRulerAtom(data, 0, data.length); } public void setParagraphIndent(short tetxOffset, short bulletOffset){ diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java index 7efe2539da..27f5cbaf5b 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java @@ -221,14 +221,13 @@ implements HSLFShapeContainer, GroupShape<HSLFShape,HSLFTextParagraph> { x2 = clientAnchor.getDx1(); y2 = clientAnchor.getRow1(); } - Rectangle2D anchor= new Rectangle2D.Double( + + return new Rectangle2D.Double( (x1 == -1 ? -1 : Units.masterToPoints(x1)), (y1 == -1 ? -1 : Units.masterToPoints(y1)), (x2 == -1 ? -1 : Units.masterToPoints(x2-x1)), (y2 == -1 ? -1 : Units.masterToPoints(y2-y1)) ); - - return anchor; } /** 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 460b46875e..a61bbaedc6 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java @@ -168,14 +168,13 @@ public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> { } // TODO: find out where this -1 value comes from at #57820 (link to ms docs?) - Rectangle2D anchor = new Rectangle2D.Double( + + return new Rectangle2D.Double( (x1 == -1 ? -1 : Units.masterToPoints(x1)), (y1 == -1 ? -1 : Units.masterToPoints(y1)), (x2 == -1 ? -1 : Units.masterToPoints(x2-x1)), (y2 == -1 ? -1 : Units.masterToPoints(y2-y1)) ); - - return anchor; } /** diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java index dd98a017bf..6152920ade 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java @@ -131,8 +131,7 @@ public abstract class HSLFSimpleShape extends HSLFShape implements SimpleShape<H public double getLineWidth(){ AbstractEscherOptRecord opt = getEscherOptRecord(); EscherSimpleProperty prop = getEscherProperty(opt, EscherProperties.LINESTYLE__LINEWIDTH); - double width = (prop == null) ? DEFAULT_LINE_WIDTH : Units.toPoints(prop.getPropertyValue()); - return width; + return (prop == null) ? DEFAULT_LINE_WIDTH : Units.toPoints(prop.getPropertyValue()); } /** diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java index 884902655c..e9df925d0a 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java @@ -402,8 +402,7 @@ implements HSLFShapeContainer, TableShape<HSLFShape,HSLFTextParagraph> { } // TODO: check for merged cols - double width = cells[0][col].getAnchor().getWidth(); - return width; + return cells[0][col].getAnchor().getWidth(); } @Override diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java index 60c1707ecf..695500eb01 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java @@ -1212,8 +1212,7 @@ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFText * representation */ protected static String toInternalString(String s) { - String ns = s.replaceAll("\\r?\\n", "\r"); - return ns; + return s.replaceAll("\\r?\\n", "\r"); } /** diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java index 8d6a5f0ef5..c33272e05b 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java @@ -415,8 +415,7 @@ public final class HSLFTextRun implements TextRun { return null; } Color color = HSLFTextParagraph.getColorFromColorIndexStruct(tp.getValue(), parentParagraph.getSheet()); - SolidPaint ps = DrawPaint.createSolidPaint(color); - return ps; + return DrawPaint.createSolidPaint(color); } /** diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java index 6dc8c3b557..09a0f4560e 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java @@ -723,8 +723,7 @@ implements TextShape<HSLFShape,HSLFTextParagraph> { @Override public Insets2D getInsets() { - Insets2D insets = new Insets2D(getTopInset(), getLeftInset(), getBottomInset(), getRightInset()); - return insets; + return new Insets2D(getTopInset(), getLeftInset(), getBottomInset(), getRightInset()); } @Override diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java b/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java index 08b4796456..614b749358 100644 --- a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java +++ b/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java @@ -185,11 +185,10 @@ public class AbstractExcelUtils { CellRangeAddress[] mergedRangeRowInfo = rowNumber < mergedRanges.length ? mergedRanges[rowNumber] : null; - CellRangeAddress cellRangeAddress = mergedRangeRowInfo != null + + return mergedRangeRowInfo != null && columnNumber < mergedRangeRowInfo.length ? mergedRangeRowInfo[columnNumber] : null; - - return cellRangeAddress; } static boolean isEmpty( String str ) diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java index a7fe782578..cb831a39a9 100644 --- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java +++ b/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java @@ -154,8 +154,7 @@ public class ExcelToHtmlConverter extends AbstractExcelConverter XMLHelper.getDocumentBuilderFactory().newDocumentBuilder() .newDocument() ); excelToHtmlConverter.processWorkbook( workbook ); - Document doc = excelToHtmlConverter.getDocument(); - return doc; + return excelToHtmlConverter.getDocument(); } private String cssClassContainerCell; diff --git a/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java b/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java index 3e20e9e18b..f91781dc64 100644 --- a/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java +++ b/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java @@ -597,8 +597,7 @@ public final class HSSFChart { private PlotAreaRecord createPlotAreaRecord() { - PlotAreaRecord r = new PlotAreaRecord( ); - return r; + return new PlotAreaRecord( ); } private AxisLineFormatRecord createAxisLineFormatRecord( short format ) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java index 1369841acf..6b372a3760 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java @@ -667,7 +667,6 @@ public final class HWPFDocument extends HWPFDocumentCore { // get fcMin and fcMac because we will be writing the actual text with the // complex table. - int fcMin = mainOffset; /* * clx (encoding of the sprm lists for a complex file and piece table @@ -736,7 +735,7 @@ public final class HWPFDocument extends HWPFDocumentCore { // write out the CHPBinTable. _fib.setFcPlcfbteChpx(tableOffset); - _cbt.writeTo(wordDocumentStream, tableStream, fcMin, _cft.getTextPieceTable()); + _cbt.writeTo(wordDocumentStream, tableStream, mainOffset, _cft.getTextPieceTable()); _fib.setLcbPlcfbteChpx(tableStream.size() - tableOffset); tableOffset = tableStream.size(); @@ -892,7 +891,7 @@ public final class HWPFDocument extends HWPFDocumentCore { tableOffset = tableStream.size(); // set some variables in the FileInformationBlock. - _fib.getFibBase().setFcMin(fcMin); + _fib.getFibBase().setFcMin(mainOffset); _fib.getFibBase().setFcMac(fcMac); _fib.setCbMac(wordDocumentStream.size()); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java index e265ada37b..0a29f0b7dc 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java @@ -194,8 +194,7 @@ public abstract class AbstractWordConverter original.bold = characterRun.isBold(); original.italic = characterRun.isItalic(); original.fontName = characterRun.getFontName(); - Triplet updated = getFontReplacer().update( original ); - return updated; + return getFontReplacer().update( original ); } public abstract Document getDocument(); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java index 792458165c..721c72f7e0 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java @@ -111,8 +111,7 @@ public class HtmlDocumentFacade stringBuilder.append( "}\n" ); } } - final String stylesheetText = stringBuilder.toString(); - return stylesheetText; + return stringBuilder.toString(); } public Element createBlock() @@ -179,8 +178,7 @@ public class HtmlDocumentFacade public Element createSelect() { - Element result = document.createElement( "select" ); - return result; + return document.createElement( "select" ); } public Element createTable() diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java b/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java index a170256ac2..a1b03bb0d5 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java @@ -118,8 +118,7 @@ public class RecordUtil for ( int x = 0; x < parentSize; x++ ) { - int temp = mask; - numBits += ( temp >> x ) & 0x1; + numBits += ( mask >> x ) & 0x1; } if ( numBits == 1 ) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java index b5aff30977..7faba49700 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java @@ -226,8 +226,7 @@ public class CHPBinTable final int boundary = objBoundary.intValue(); final int startInclusive = lastTextRunStart; - final int endExclusive = boundary; - lastTextRunStart = endExclusive; + lastTextRunStart = boundary; int startPosition = binarySearch( oldChpxSortedByStartPos, boundary ); startPosition = Math.abs( startPosition ); @@ -246,7 +245,7 @@ public class CHPBinTable break; int left = Math.max( startInclusive, chpx.getStart() ); - int right = Math.min( endExclusive, chpx.getEnd() ); + int right = Math.min(boundary, chpx.getEnd() ); if ( left < right ) { @@ -258,10 +257,10 @@ public class CHPBinTable { logger.log( POILogger.WARN, "Text piece [", Integer.valueOf( startInclusive ), "; ", - Integer.valueOf( endExclusive ), + Integer.valueOf(boundary), ") has no CHPX. Creating new one." ); // create it manually - CHPX chpx = new CHPX( startInclusive, endExclusive, + CHPX chpx = new CHPX( startInclusive, boundary, new SprmBuffer( 0 ) ); newChpxs.add( chpx ); continue; @@ -272,7 +271,7 @@ public class CHPBinTable // can we reuse existing? CHPX existing = chpxs.get( 0 ); if ( existing.getStart() == startInclusive - && existing.getEnd() == endExclusive ) + && existing.getEnd() == boundary) { newChpxs.add( existing ); continue; @@ -286,7 +285,7 @@ public class CHPBinTable { sprmBuffer.append( chpx.getGrpprl(), 0 ); } - CHPX newChpx = new CHPX( startInclusive, endExclusive, sprmBuffer ); + CHPX newChpx = new CHPX( startInclusive, boundary, sprmBuffer ); newChpxs.add( newChpx ); continue; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java index c7d4a30fd5..62cce2e7af 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java @@ -72,9 +72,8 @@ public final class CHPX extends BytePropertyNode<CHPX> } CharacterProperties baseStyle = ss.getCharacterStyle( istd ); - CharacterProperties props = CharacterSprmUncompressor.uncompressCHP( + return CharacterSprmUncompressor.uncompressCHP( ss, baseStyle, getGrpprl(), 0 ); - return props; } public String toString() { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java index 4b8b4b83bf..00f35d6f1e 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java @@ -151,8 +151,7 @@ public final class ListTables return null; } if(level < lst.numLevels()) { - ListLevel lvl = lst.getLevels()[level]; - return lvl; + return lst.getLevels()[level]; } if (log.check(POILogger.WARN)) { log.log(POILogger.WARN, "Requested level " + level + " which was greater than the maximum defined (" + lst.numLevels() + ")"); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java index 5edf5866b3..2be611a49c 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java @@ -361,8 +361,6 @@ public final class PAPFormattedDiskPage extends FormattedDiskPage { { int pheOffset = _offset + 1 + (((_crun + 1) * 4) + (index * 13)); - ParagraphHeight phe = new ParagraphHeight(_fkp, pheOffset); - - return phe; + return new ParagraphHeight(_fkp, pheOffset); } } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java index c58cbac27c..06f79e8fe6 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java @@ -151,8 +151,7 @@ public final class PAPX extends BytePropertyNode<PAPX> { short istd = getIstd(); ParagraphProperties baseStyle = ss.getParagraphStyle(istd); - ParagraphProperties props = ParagraphSprmUncompressor.uncompressPAP(baseStyle, getGrpprl(), 2); - return props; + return ParagraphSprmUncompressor.uncompressPAP(baseStyle, getGrpprl(), 2); } @Override diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java index 70e9fb1ce1..15793b7a4e 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java @@ -64,8 +64,7 @@ public class PlexOfField } public String toString() { - String str = String.format(Locale.ROOT, "[%d, %d) - FLD - 0x%x; 0x%x" + return String.format(Locale.ROOT, "[%d, %d) - FLD - 0x%x; 0x%x" , getFcStart(), getFcEnd(), fld.getBoundaryType(), fld.getFlt()); - return str; } } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java index 8a484ab180..b8f5acef9a 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java @@ -89,14 +89,13 @@ public class SectionTable // Some files seem to lie about their unicode status, which // is very very pesky. Try to work around these, but this // is getting on for black magic... - int mainEndsAt = mainLength; boolean matchAt = false; boolean matchHalf = false; for (int i=0; i<_sections.size(); i++) { SEPX s = _sections.get(i); - if (s.getEnd() == mainEndsAt) { + if (s.getEnd() == mainLength) { matchAt = true; - } else if(s.getEnd() == mainEndsAt || s.getEnd() == mainEndsAt-1) { + } else if(s.getEnd() == mainLength || s.getEnd() == mainLength -1) { matchHalf = true; } } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java b/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java index d4415c46b7..be419f5f71 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java @@ -107,11 +107,10 @@ public final class StyleDescription implements HDFType _name = StringUtil.getFromUnicodeLE(std, nameStart, (nameLength*multiplier)/2); //length then null terminator. - int grupxStart = ((nameLength + 1) * multiplier) + nameStart; // the spec only refers to two possible upxs but it mentions // that more may be added in the future - int varOffset = grupxStart; + int varOffset = ((nameLength + 1) * multiplier) + nameStart; int countOfUPX = _stdfBase.getCupx(); _upxs = new UPX[countOfUPX]; for(int x = 0; x < countOfUPX; x++) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java b/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java index b186197dac..c4a13e4361 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java @@ -73,12 +73,11 @@ public class TextPiece extends PropertyNode<TextPiece> { * Create the StringBuilder from the text and unicode flag */ private static StringBuilder buildInitSB(byte[] text, PieceDescriptor pd) { - byte[] textBuffer = text; if (StringUtil.BIG5.equals(pd.getCharset())) { return new StringBuilder(CodePageUtil.cp950ToString(text, 0, text.length)); } - String str = new String(textBuffer, 0, textBuffer.length, (pd.isUnicode()) ? StringUtil.UTF16LE : pd.getCharset()); + String str = new String(text, 0, text.length, (pd.isUnicode()) ? StringUtil.UTF16LE : pd.getCharset()); return new StringBuilder(str); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java index 5c2dc47490..a657163e94 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java @@ -657,8 +657,7 @@ public final class CharacterRun extends Range getPicOffset() ); FFData ffData = new FFData( data.getBinData(), 0 ); - String[] values = ffData.getDropList(); - return values; + return ffData.getDropList(); } } return null; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java index b812b66670..cd8572eca9 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java @@ -54,15 +54,14 @@ public final class DateAndTime public Calendar getDate() { // TODO Discover if the timezone is stored somewhere else or not - Calendar cal = LocaleUtil.getLocaleCalendar( - _years.getValue(_info2)+1900, - _months.getValue(_info2)-1, - _dom.getValue(_info), - _hours.getValue(_info), - _minutes.getValue(_info), - 0 - ); - return cal; + return LocaleUtil.getLocaleCalendar( + _years.getValue(_info2)+1900, + _months.getValue(_info2)-1, + _dom.getValue(_info), + _hours.getValue(_info), + _minutes.getValue(_info), + 0 + ); } public void serialize(byte[] buf, int offset) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java index d0c98a7fa8..b4c972d87f 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java @@ -187,11 +187,10 @@ public class FieldsImpl implements Fields { case FieldDescriptor.FIELD_SEPARATOR_MARK: { - PlexOfField separatorPlexOfField = nextPlexOfField; int endNodePositionInList = binarySearch( plexOfFields, nextNodePositionInList, endOffsetExclusive, - separatorPlexOfField.getFcEnd() ); + nextPlexOfField.getFcEnd() ); if ( endNodePositionInList < 0 ) { /* @@ -212,17 +211,17 @@ public class FieldsImpl implements Fields } FieldImpl field = new FieldImpl( startPlexOfField, - separatorPlexOfField, endPlexOfField ); + nextPlexOfField, endPlexOfField ); result.add( field ); // adding included fields - if ( startPlexOfField.getFcStart() + 1 < separatorPlexOfField + if ( startPlexOfField.getFcStart() + 1 < nextPlexOfField .getFcStart() - 1 ) { parseFieldStructureImpl( plexOfFields, next + 1, nextNodePositionInList, result ); } - if ( separatorPlexOfField.getFcStart() + 1 < endPlexOfField + if ( nextPlexOfField.getFcStart() + 1 < endPlexOfField .getFcStart() - 1 ) { parseFieldStructureImpl( plexOfFields, diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java index dff4e56a66..2f100bb658 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java @@ -136,8 +136,7 @@ public final class HWPFList + " is more than number of level for list (" + _listData.numLevels() + ")" ); } - ListLevel lvl = _listData.getLevels()[level]; - return lvl; + return _listData.getLevels()[level]; } /** diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java index 46b88c16a9..d1a6e284db 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java @@ -237,9 +237,8 @@ public class OfficeDrawingsImpl implements OfficeDrawings .lookup( propertyId ); if ( escherProperty == null ) return defaultValue; - int value = escherProperty.getPropertyValue(); - return value; + return escherProperty.getPropertyValue(); } public VerticalPositioning getVerticalPositioning() diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java index 9da19fd3b9..5ad0873ba0 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java @@ -565,9 +565,8 @@ public class Paragraph extends Range implements Cloneable { { throw new IllegalStateException( "Paragraph not in list" ); } - HWPFList hwpfList = new HWPFList( getDocument().getStyleSheet(), + return new HWPFList( getDocument().getStyleSheet(), getDocument().getListTables(), getIlfo() ); - return hwpfList; } public boolean isInList() diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java b/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java index 7dd60b0b8c..cd8ced23c9 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java @@ -57,8 +57,7 @@ public class TestWordToFoConverter new DOMSource( wordToFoConverter.getDocument() ), new StreamResult( stringWriter ) ); - String result = stringWriter.toString(); - return result; + return stringWriter.toString(); } @Test diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheet.java b/src/testcases/org/apache/poi/hssf/model/TestSheet.java index e8e2db0823..7ebb8a401c 100644 --- a/src/testcases/org/apache/poi/hssf/model/TestSheet.java +++ b/src/testcases/org/apache/poi/hssf/model/TestSheet.java @@ -541,8 +541,7 @@ public final class TestSheet { MyIndexRecordListener myIndexListener = new MyIndexRecordListener(); sheet.visitContainedRecords(myIndexListener, 0); IndexRecord indexRecord = myIndexListener.getIndexRecord(); - int dbCellRecordPos = indexRecord.getDbcellAt(0); - return dbCellRecordPos; + return indexRecord.getDbcellAt(0); } private static final class MyIndexRecordListener implements RecordVisitor { diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java index b4e696fe30..305bc5f026 100644 --- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java +++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java @@ -74,9 +74,7 @@ public final class TestColumnInfoRecordsAggregate { public static ColumnInfoRecord[] getRecords(ColumnInfoRecordsAggregate agg) { CIRCollector circ = new CIRCollector(); agg.visitContainedRecords(circ); - ColumnInfoRecord[] result = - circ._list.toArray(new ColumnInfoRecord[circ._list.size()]); - return result; + return circ._list.toArray(new ColumnInfoRecord[circ._list.size()]); } } diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java b/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java index fea681e749..cf1d1ba34e 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java @@ -160,9 +160,8 @@ public final class TestOLE2Embeding { ByteArrayOutputStream bos = new ByteArrayOutputStream(); wb.write(bos); wb.close(); - POIFSFileSystem poifs = new POIFSFileSystem(new ByteArrayInputStream(bos.toByteArray())); - - return poifs; + + return new POIFSFileSystem(new ByteArrayInputStream(bos.toByteArray())); } static byte[] getSampleTXT() { diff --git a/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java b/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java index 1686790255..d9c869e566 100644 --- a/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java +++ b/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java @@ -154,8 +154,7 @@ public class BaseTestSlideShowFactory { } catch (final IOException e) { throw new RuntimeException(e); } - final byte[] bytes = baos.toByteArray(); - return bytes; + return baos.toByteArray(); } /** diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java index f683e5dbf7..be7a6e8303 100644 --- a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java @@ -110,7 +110,6 @@ public final class TestYearFracCalculatorFromSpreadsheet { private static double getDoubleCell(HSSFRow row, int colIx) { HSSFCell cell = row.getCell(colIx); assertNotNull("No cell found at column " + colIx, cell); - double dVal = cell.getNumericCellValue(); - return dVal; + return cell.getNumericCellValue(); } } diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java index a5d991bf70..9481064952 100644 --- a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java @@ -239,9 +239,8 @@ public final class TestFormulaBugs { cell.setCellFormula(formula); FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator(); - CellValue value = evaluator.evaluate(cell); - - return value; + + return evaluator.evaluate(cell); } private void checkFormulaValue(Workbook wb, Cell cell, String formula, double expectedValue) { diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java b/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java index 55ac409b20..8e7af0312d 100644 --- a/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java @@ -97,8 +97,7 @@ public final class TestMinusZeroResult extends TestCase { for (int i = 0; i < evalArgs.length; i++) { evalArgs[i] = new NumberEval(dArgs[i]); } - ValueEval r = instance.evaluate(evalArgs, -1, (short)-1); - return r; + return instance.evaluate(evalArgs, -1, (short)-1); } /** diff --git a/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java b/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java index 609327cd4d..2073d45ff1 100644 --- a/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java +++ b/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java @@ -159,10 +159,9 @@ public final class TestReadMissingBuiltInFuncs { } private String getCellFormula(int rowIx) { - String result = _sheet.getRow(rowIx).getCell(0).getCellFormula(); -// if (false) { + // if (false) { // System.err.println(result); // } - return result; + return _sheet.getRow(rowIx).getCell(0).getCellFormula(); } } diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java b/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java index 0ea6943c0b..12934cff70 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java @@ -97,9 +97,8 @@ public final class TestBin2Dec extends TestCase { return true; } }, null); - OperationEvaluationContext ctx = new OperationEvaluationContext(workbookEvaluator, + return new OperationEvaluationContext(workbookEvaluator, workbook, 0, 0, 0, null); - return ctx; } public void testRefs() { diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java b/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java index 724029d99d..df0dda6bff 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java @@ -117,9 +117,8 @@ public final class TestDec2Bin extends TestCase { return true; } }, null); - OperationEvaluationContext ctx = new OperationEvaluationContext(workbookEvaluator, + return new OperationEvaluationContext(workbookEvaluator, workbook, 0, 0, 0, null); - return ctx; } public void testRefs() { diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java b/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java index ece511035b..84b5c5fa61 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java @@ -142,9 +142,8 @@ public final class TestDec2Hex extends TestCase { return true; } }, null); - OperationEvaluationContext ctx = new OperationEvaluationContext(workbookEvaluator, + return new OperationEvaluationContext(workbookEvaluator, workbook, 0, 0, 0, null); - return ctx; } public void testRefs() { diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java b/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java index b1bcb2f857..238703c529 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java @@ -95,9 +95,8 @@ public final class TestHex2Dec extends TestCase { return true; } }, null); - OperationEvaluationContext ctx = new OperationEvaluationContext(workbookEvaluator, + return new OperationEvaluationContext(workbookEvaluator, workbook, 0, 0, 0, null); - return ctx; } public void testRefs() { diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java b/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java index 559dd8c72c..4c7dadc4c6 100644 --- a/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java +++ b/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java @@ -137,7 +137,6 @@ public final class TestAreaPtg extends TestCase { aptg.setLastColumn((short)(aptg.getLastColumn()+letUsShiftColumn1By1Column)); } } - String newFormula = HSSFFormulaParser.toFormulaString(wb, ptgs); - return newFormula; + return HSSFFormulaParser.toFormulaString(wb, ptgs); } } |