You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2017/09/16 08:28:41 UTC
svn commit: r1808518 [1/2] - in /poi/trunk/src:
examples/src/org/apache/poi/hssf/view/ examples/src/org/apache/poi/hwpf/
examples/src/org/apache/poi/ss/examples/formula/
excelant/java/org/apache/poi/ss/excelant/util/
excelant/testcases/org/apache/poi/s...
Author: centic
Date: Sat Sep 16 08:28:38 2017
New Revision: 1808518
URL: http://svn.apache.org/viewvc?rev=1808518&view=rev
Log:
Remove unnecessary local variables
Modified:
poi/trunk/src/examples/src/org/apache/poi/hssf/view/SViewer.java
poi/trunk/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java
poi/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java
poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
poi/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java
poi/trunk/src/java/org/apache/poi/ddf/EscherColorRef.java
poi/trunk/src/java/org/apache/poi/hpsf/PropertySet.java
poi/trunk/src/java/org/apache/poi/hpsf/Section.java
poi/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java
poi/trunk/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/EscherAggregate.java
poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/NameCommentRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
poi/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java
poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
poi/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java
poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java
poi/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java
poi/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java
poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java
poi/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Finance.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Index.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java
poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java
poi/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java
poi/trunk/src/java/org/apache/poi/ss/util/CellReference.java
poi/trunk/src/java/org/apache/poi/ss/util/ExpandedDouble.java
poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
poi/trunk/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
Modified: poi/trunk/src/examples/src/org/apache/poi/hssf/view/SViewer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hssf/view/SViewer.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hssf/view/SViewer.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hssf/view/SViewer.java Sat Sep 16 08:28:38 2017
@@ -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());
}
Modified: poi/trunk/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hwpf/Word2Forrest.java Sat Sep 16 08:28:38 2017
@@ -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 ();
Modified: poi/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/ss/examples/formula/CalculateMortgage.java Sat Sep 16 08:28:38 2017
@@ -75,11 +75,8 @@ public class CalculateMortgage implement
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
Modified: poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java (original)
+++ poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java Sat Sep 16 08:28:38 2017
@@ -154,9 +154,8 @@ public class ExcelAntWorkbookUtil extend
}
UDFFinder udff1 = new DefaultUDFFinder(names, functions);
- UDFFinder udff = new AggregatingUDFFinder(udff1);
- return udff;
+ return new AggregatingUDFFinder(udff1);
}
Modified: poi/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java (original)
+++ poi/trunk/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java Sat Sep 16 08:28:38 2017
@@ -77,11 +77,8 @@ public class CalculateMortgageFunction i
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
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherColorRef.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherColorRef.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherColorRef.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherColorRef.java Sat Sep 16 08:28:38 2017
@@ -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;
}
/**
Modified: poi/trunk/src/java/org/apache/poi/hpsf/PropertySet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/PropertySet.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/PropertySet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/PropertySet.java Sat Sep 16 08:28:38 2017
@@ -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;
}
Modified: poi/trunk/src/java/org/apache/poi/hpsf/Section.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/Section.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/Section.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/Section.java Sat Sep 16 08:28:38 2017
@@ -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);
}
Modified: poi/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/Thumbnail.java Sat Sep 16 08:28:38 2017
@@ -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;
}
Modified: poi/trunk/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java Sat Sep 16 08:28:38 2017
@@ -143,12 +143,9 @@ public class HPSFPropertiesExtractor ext
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();
}
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java Sat Sep 16 08:28:38 2017
@@ -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 {
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=1808518&r1=1808517&r2=1808518&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:28:38 2017
@@ -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);
}
/**
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CFHeaderBase.java Sat Sep 16 08:28:38 2017
@@ -36,8 +36,7 @@ public abstract class CFHeaderBase exten
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;
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/EndSubRecord.java Sat Sep 16 08:28:38 2017
@@ -77,8 +77,7 @@ public final class EndSubRecord extends
@Override
public EndSubRecord clone() {
- EndSubRecord rec = new EndSubRecord();
-
- return rec;
+
+ return new EndSubRecord();
}
}
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=1808518&r1=1808517&r2=1808518&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:28:38 2017
@@ -522,8 +522,7 @@ public final class EscherAggregate exten
}
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())
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java Sat Sep 16 08:28:38 2017
@@ -128,8 +128,7 @@ public final class FormatRecord extends
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
}
for (int i = 0; i < buf.length; i++) {
char ch;
- if (isCompressedEncoding) {
+ if (pIsCompressedEncoding) {
ch = (char) ris.readUByte();
} else {
ch = (char) ris.readShort();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java Sat Sep 16 08:28:38 2017
@@ -82,8 +82,7 @@ public final class MergeCellsRecord exte
@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);
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/NameCommentRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/NameCommentRecord.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/NameCommentRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/NameCommentRecord.java Sat Sep 16 08:28:38 2017
@@ -84,22 +84,21 @@ public final class NameCommentRecord ext
* @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();
+ 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 (in.readByte() == 0) {
- field_6_name_text = StringUtil.readCompressedUnicode(in, field_4_name_length);
+ 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);
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java Sat Sep 16 08:28:38 2017
@@ -103,13 +103,12 @@ public final class RecordFactoryInputStr
}
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(
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java Sat Sep 16 08:28:38 2017
@@ -363,12 +363,11 @@ public final class ColumnInfoRecordsAggr
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);
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java Sat Sep 16 08:28:38 2017
@@ -46,13 +46,12 @@ public final class MergedCellsTable exte
* @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 exte
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) {
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java Sat Sep 16 08:28:38 2017
@@ -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) {
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java Sat Sep 16 08:28:38 2017
@@ -66,8 +66,7 @@ public final class BeginRecord extends S
@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();
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/EndRecord.java Sat Sep 16 08:28:38 2017
@@ -67,8 +67,7 @@ public final class EndRecord extends Sta
@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();
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java Sat Sep 16 08:28:38 2017
@@ -64,8 +64,6 @@ public final class PlotAreaRecord extend
}
public Object clone() {
- PlotAreaRecord rec = new PlotAreaRecord();
-
- return rec;
+ return new PlotAreaRecord();
}
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java Sat Sep 16 08:28:38 2017
@@ -151,9 +151,8 @@ public class EscherGraphics extends Grap
@Override
public Graphics create()
{
- EscherGraphics g = new EscherGraphics(escherGroup, workbook,
+ return new EscherGraphics(escherGroup, workbook,
foreground, font, verticalPointsPerPixel );
- return g;
}
@Override
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java Sat Sep 16 08:28:38 2017
@@ -127,8 +127,7 @@ public final class EscherGraphics2d exte
public Graphics create()
{
- EscherGraphics2d g2d = new EscherGraphics2d(_escherGraphics);
- return g2d;
+ return new EscherGraphics2d(_escherGraphics);
}
public void dispose()
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=1808518&r1=1808517&r2=1808518&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:28:38 2017
@@ -108,8 +108,7 @@ public final class HSSFRichTextString im
private UnicodeString cloneStringIfRequired() {
if (_book == null)
return _string;
- UnicodeString s = (UnicodeString)_string.clone();
- return s;
+ return (UnicodeString)_string.clone();
}
private void addToSSTIfRequired() {
Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java Sat Sep 16 08:28:38 2017
@@ -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);
}
}
Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java Sat Sep 16 08:28:38 2017
@@ -125,8 +125,7 @@ public class BinaryRC4Decryptor extends
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
Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java Sat Sep 16 08:28:38 2017
@@ -82,8 +82,7 @@ public class BinaryRC4Encryptor extends
@Override
public OutputStream getDataStream(DirectoryNode dir)
throws IOException, GeneralSecurityException {
- OutputStream countStream = new BinaryRC4CipherOutputStream(dir);
- return countStream;
+ return new BinaryRC4CipherOutputStream(dir);
}
@Override
Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java Sat Sep 16 08:28:38 2017
@@ -134,8 +134,7 @@ public class CryptoAPIDecryptor extends
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
Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java Sat Sep 16 08:28:38 2017
@@ -98,8 +98,7 @@ public class StandardDecryptor extends D
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) {
Modified: poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java Sat Sep 16 08:28:38 2017
@@ -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);
}
/**
Modified: poi/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/storage/SmallBlockTableReader.java Sat Sep 16 08:28:38 2017
@@ -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,
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/DrawPaint.java Sat Sep 16 08:28:38 2017
@@ -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);
}
/**
Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java Sat Sep 16 08:28:38 2017
@@ -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) {
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellNumberFormatter.java Sat Sep 16 08:28:38 2017
@@ -245,13 +245,12 @@ public class CellNumberFormatter extends
} 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;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java Sat Sep 16 08:28:38 2017
@@ -132,13 +132,12 @@ public abstract class BaseFormulaEvaluat
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);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java Sat Sep 16 08:28:38 2017
@@ -421,13 +421,12 @@ public class EvaluationConditionalFormat
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 EvaluationConditionalFormat
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 EvaluationConditionalFormat
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 EvaluationConditionalFormat
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;
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java Sat Sep 16 08:28:38 2017
@@ -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() {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java Sat Sep 16 08:28:38 2017
@@ -342,8 +342,7 @@ public final class DStarRunner implement
// 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);
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Finance.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Finance.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Finance.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Finance.java Sat Sep 16 08:28:38 2017
@@ -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);
}
/**
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Index.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Index.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Index.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Index.java Sat Sep 16 08:28:38 2017
@@ -93,18 +93,17 @@ public final class Index implements Func
}
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() + ")");
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java Sat Sep 16 08:28:38 2017
@@ -365,11 +365,10 @@ public abstract class NumericFunction im
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) {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java Sat Sep 16 08:28:38 2017
@@ -78,8 +78,7 @@ public final class AttrPtg extends Contr
_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();
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java Sat Sep 16 08:28:38 2017
@@ -79,9 +79,8 @@ public final class NameXPtg extends Oper
}
public String toString(){
- String retValue = "NameXPtg:[sheetRefIndex:" + _sheetRefIndex +
- " , nameNumber:" + _nameNumber + "]" ;
- return retValue;
+ return "NameXPtg:[sheetRefIndex:" + _sheetRefIndex +
+ " , nameNumber:" + _nameNumber + "]";
}
public byte getDefaultOperandClass() {
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java Sat Sep 16 08:28:38 2017
@@ -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;
}
/*
Modified: poi/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java Sat Sep 16 08:28:38 2017
@@ -299,10 +299,9 @@ public abstract class CellRangeAddressBa
@Override
public int hashCode() {
- int code = (getMinColumn() +
- (getMaxColumn() << 8) +
- (getMinRow() << 16) +
- (getMaxRow() << 24));
- return code;
+ return (getMinColumn() +
+ (getMaxColumn() << 8) +
+ (getMinRow() << 16) +
+ (getMaxRow() << 24));
}
}
Modified: poi/trunk/src/java/org/apache/poi/ss/util/CellReference.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/CellReference.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/CellReference.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/CellReference.java Sat Sep 16 08:28:38 2017
@@ -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) {
Modified: poi/trunk/src/java/org/apache/poi/ss/util/ExpandedDouble.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/ExpandedDouble.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/ExpandedDouble.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/ExpandedDouble.java Sat Sep 16 08:28:38 2017
@@ -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;
}
}
Modified: poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java Sat Sep 16 08:28:38 2017
@@ -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;
}
/**
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java Sat Sep 16 08:28:38 2017
@@ -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) {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java Sat Sep 16 08:28:38 2017
@@ -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) {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java Sat Sep 16 08:28:38 2017
@@ -220,8 +220,7 @@ public class AgileEncryptor extends Encr
public OutputStream getDataStream(DirectoryNode dir)
throws IOException, GeneralSecurityException {
// TODO: initialize headers
- AgileCipherOutputStream countStream = new AgileCipherOutputStream(dir);
- return countStream;
+ return new AgileCipherOutputStream(dir);
}
/**
Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java Sat Sep 16 08:28:38 2017
@@ -357,8 +357,7 @@ public class SignatureInfo implements Si
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);
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java Sat Sep 16 08:28:38 2017
@@ -78,8 +78,7 @@ import org.openxmlformats.schemas.presen
try {
try {
NotesMasterDocument doc = NotesMasterDocument.Factory.parse(is, DEFAULT_XML_OPTIONS);
- CTNotesMaster slide = doc.getNotesMaster();
- return slide;
+ return doc.getNotesMaster();
} finally {
is.close();
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java Sat Sep 16 08:28:38 2017
@@ -90,8 +90,7 @@ public class XSLFShadow extends XSLFShap
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
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java Sat Sep 16 08:28:38 2017
@@ -485,8 +485,7 @@ public abstract class XSLFTextShape exte
@Override
public Insets2D getInsets() {
- Insets2D insets = new Insets2D(getTopInset(), getLeftInset(), getBottomInset(), getRightInset());
- return insets;
+ return new Insets2D(getTopInset(), getLeftInset(), getBottomInset(), getRightInset());
}
@Override
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java Sat Sep 16 08:28:38 2017
@@ -223,8 +223,7 @@ public class XSSFComment implements Comm
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]);
}
/**
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java Sat Sep 16 08:28:38 2017
@@ -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;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java Sat Sep 16 08:28:38 2017
@@ -225,8 +225,7 @@ public class XSSFPivotTable extends POIX
protected AreaReference getPivotArea() {
final Workbook wb = getDataSheet().getWorkbook();
- AreaReference pivotArea = getPivotCacheDefinition().getPivotArea(wb);
- return pivotArea;
+ return getPivotCacheDefinition().getPivotArea(wb);
}
/**
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java Sat Sep 16 08:28:38 2017
@@ -612,8 +612,7 @@ public class XSSFTextParagraph implement
};
fetchParagraphProperty(fetcher);
- double spcBef = fetcher.getValue() == null ? 0 : fetcher.getValue();
- return spcBef;
+ return fetcher.getValue() == null ? 0 : fetcher.getValue();
}
/**
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java Sat Sep 16 08:28:38 2017
@@ -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(){
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=1808518&r1=1808517&r2=1808518&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:28:38 2017
@@ -1431,8 +1431,7 @@ public class XWPFDocument extends POIXML
public XWPFPictureData getPictureDataByID(String blipID) {
POIXMLDocumentPart relatedPart = getRelationById(blipID);
if (relatedPart instanceof XWPFPictureData) {
- XWPFPictureData xwpfPicData = (XWPFPictureData) relatedPart;
- return xwpfPicData;
+ return (XWPFPictureData) relatedPart;
}
return null;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java Sat Sep 16 08:28:38 2017
@@ -1378,9 +1378,8 @@ public class XWPFParagraph implements IB
* a new instance.
*/
private CTPPr getCTPPr() {
- CTPPr pr = paragraph.getPPr() == null ? paragraph.addNewPPr()
+ return paragraph.getPPr() == null ? paragraph.addNewPPr()
: paragraph.getPPr();
- return pr;
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/PkiTestUtils.java Sat Sep 16 08:28:38 2017
@@ -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);
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java Sat Sep 16 08:28:38 2017
@@ -341,8 +341,7 @@ public class TestXSSFDataValidation exte
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
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java Sat Sep 16 08:28:38 2017
@@ -722,8 +722,7 @@ public final class TestXSSFSheet extends
// 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);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java Sat Sep 16 08:28:38 2017
@@ -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);
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java Sat Sep 16 08:28:38 2017
@@ -124,8 +124,6 @@ public final class UserEditAndPersistLis
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);
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java Sat Sep 16 08:28:38 2017
@@ -144,8 +144,7 @@ public final class QuickButCruddyTextExt
// 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
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java Sat Sep 16 08:28:38 2017
@@ -182,8 +182,7 @@ public final class ColorSchemeAtom exten
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);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java Sat Sep 16 08:28:38 2017
@@ -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()] );
}
/**
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java Sat Sep 16 08:28:38 2017
@@ -192,8 +192,7 @@ public final class TextRulerAtom extends
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){
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java?rev=1808518&r1=1808517&r2=1808518&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java Sat Sep 16 08:28:38 2017
@@ -221,14 +221,13 @@ implements HSLFShapeContainer, GroupShap
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;
}
/**
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=1808518&r1=1808517&r2=1808518&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:28:38 2017
@@ -168,14 +168,13 @@ public abstract class HSLFShape implemen
}
// 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;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org