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 2020/10/25 07:21:52 UTC
svn commit: r1882828 - in /poi/trunk/src:
examples/src/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java
java/org/apache/poi/hssf/model/InternalWorkbook.java
testcases/org/apache/poi/hssf/model/TestWorkbook.java
Author: centic
Date: Sun Oct 25 07:21:52 2020
New Revision: 1882828
URL: http://svn.apache.org/viewvc?rev=1882828&view=rev
Log:
Apply some IDE suggestions
Modified:
poi/trunk/src/examples/src/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java
poi/trunk/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
Modified: poi/trunk/src/examples/src/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java?rev=1882828&r1=1882827&r2=1882828&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java Sun Oct 25 07:21:52 2020
@@ -18,7 +18,6 @@
package org.apache.poi.examples.hssf.eventusermodel;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -55,15 +54,15 @@ import org.apache.poi.poifs.filesystem.P
*/
@SuppressWarnings({"java:S106","java:S4823"})
public class XLS2CSVmra implements HSSFListener {
- private int minColumns;
- private POIFSFileSystem fs;
- private PrintStream output;
+ private final int minColumns;
+ private final POIFSFileSystem fs;
+ private final PrintStream output;
private int lastRowNumber;
private int lastColumnNumber;
/** Should we output the formula, or the value it has? */
- private boolean outputFormulaValues = true;
+ private final boolean outputFormulaValues = true;
/** For parsing Formulas */
private SheetRecordCollectingListener workbookBuildingListener;
@@ -76,7 +75,7 @@ public class XLS2CSVmra implements HSSFL
/** So we known which sheet we're on */
private int sheetIndex = -1;
private BoundSheetRecord[] orderedBSRs;
- private List<BoundSheetRecord> boundSheetRecords = new ArrayList<>();
+ private final List<BoundSheetRecord> boundSheetRecords = new ArrayList<>();
// For handling formulas with string results
private int nextRow;
@@ -100,7 +99,7 @@ public class XLS2CSVmra implements HSSFL
* @param filename The file to process
* @param minColumns The minimum number of columns to output, or -1 for no minimum
*/
- public XLS2CSVmra(String filename, int minColumns) throws IOException, FileNotFoundException {
+ public XLS2CSVmra(String filename, int minColumns) throws IOException {
this(
new POIFSFileSystem(new FileInputStream(filename)),
System.out, minColumns
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=1882828&r1=1882827&r2=1882828&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 Sun Oct 25 07:21:52 2020
@@ -142,7 +142,7 @@ public final class InternalWorkbook {
/** whether 1904 date windowing is being used */
private boolean uses1904datewindowing;
private DrawingManager2 drawingManager;
- private List<EscherBSERecord> escherBSERecords;
+ private final List<EscherBSERecord> escherBSERecords;
private WindowOneRecord windowOne;
private FileSharingRecord fileShare;
private WriteAccessRecord writeAccess;
@@ -248,7 +248,7 @@ public final class InternalWorkbook {
logObj = "format";
FormatRecord fr = (FormatRecord) rec;
retval.formats.add(fr);
- retval.maxformatid = retval.maxformatid >= fr.getIndexCode() ? retval.maxformatid : fr.getIndexCode();
+ retval.maxformatid = Math.max(retval.maxformatid, fr.getIndexCode());
break;
case DateWindow1904Record.sid :
@@ -367,7 +367,7 @@ public final class InternalWorkbook {
// set up format records
for (int i = 0; i <= 7; i++) {
FormatRecord rec = createFormat(i);
- retval.maxformatid = retval.maxformatid >= rec.getIndexCode() ? retval.maxformatid : rec.getIndexCode();
+ retval.maxformatid = Math.max(retval.maxformatid, rec.getIndexCode());
formats.add(rec);
records.add(rec);
}
@@ -1036,7 +1036,7 @@ public final class InternalWorkbook {
}
pos += len;
}
-
+
LOG.log( DEBUG, "Exiting serialize workbook" );
return pos;
}
@@ -1850,7 +1850,7 @@ public final class InternalWorkbook {
drawingManager = findDrawingManager(dg, escherBSERecords);
return drawingManager;
}
-
+
private static DrawingManager2 findDrawingManager(DrawingGroupRecord dg, List<EscherBSERecord> escherBSERecords) {
if (dg == null) {
return null;
@@ -1874,7 +1874,7 @@ public final class InternalWorkbook {
if(dgg == null) {
return null;
}
-
+
DrawingManager2 dm = new DrawingManager2(dgg);
if(bStore != null){
for(EscherRecord bs : bStore.getChildRecords()){
@@ -2110,7 +2110,7 @@ public final class InternalWorkbook {
if(aggLoc == -1) {
return;
}
-
+
EscherAggregate agg = (EscherAggregate) sheet.findFirstRecordBySid(EscherAggregate.sid);
EscherContainerRecord escherContainer = agg.getEscherContainer();
if (escherContainer == null) {
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java?rev=1882828&r1=1882827&r2=1882828&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java Sun Oct 25 07:21:52 2020
@@ -29,10 +29,9 @@ import java.io.IOException;
import org.apache.poi.hssf.record.CountryRecord;
import org.apache.poi.hssf.record.FontRecord;
import org.apache.poi.hssf.record.RecalcIdRecord;
+import org.apache.poi.hssf.record.WriteAccessRecord;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.usermodel.TestHSSFWorkbook;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
-import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.FreeRefFunction;
import org.apache.poi.ss.formula.udf.AggregatingUDFFinder;
import org.apache.poi.ss.formula.udf.DefaultUDFFinder;
@@ -108,11 +107,8 @@ public final class TestWorkbook {
InternalWorkbook wb = TestHSSFWorkbook.getInternalWorkbook(hwb);
assertNotNull(wb.getNameXPtg("ISODD", AggregatingUDFFinder.DEFAULT));
- FreeRefFunction NotImplemented = new FreeRefFunction() {
- @Override
- public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
- throw new RuntimeException("not implemented");
- }
+ FreeRefFunction NotImplemented = (args, ec) -> {
+ throw new RuntimeException("not implemented");
};
/*
@@ -155,7 +151,7 @@ public final class TestWorkbook {
wb.setForceFormulaRecalculation(true); // resets the EngineId flag to zero
assertEquals(0, record.getEngineId());
assertFalse(wb.getForceFormulaRecalculation());
-
+
wb.close();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org