You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/01/17 17:31:24 UTC
svn commit: r1885613 [6/6] - in /poi/trunk/src:
integrationtest/org/apache/poi/stress/ java/org/apache/poi/
java/org/apache/poi/ddf/ java/org/apache/poi/hpsf/
java/org/apache/poi/hssf/dev/ java/org/apache/poi/hssf/eventusermodel/
java/org/apache/poi/hs...
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java Sun Jan 17 17:31:22 2021
@@ -34,8 +34,7 @@ import org.apache.poi.util.POILogger;
@Internal
public final class CharacterSprmUncompressor extends SprmUncompressor
{
- private static final POILogger logger = POILogFactory
- .getLogger( CharacterSprmUncompressor.class );
+ private static final POILogger LOG = POILogFactory.getLogger( CharacterSprmUncompressor.class );
public CharacterSprmUncompressor()
{
@@ -78,7 +77,7 @@ public final class CharacterSprmUncompre
}
catch ( Exception exc )
{
- logger.log( POILogger.ERROR, "Unable to apply all style ",
+ LOG.log( POILogger.ERROR, "Unable to apply all style ",
style, " CHP SPRMs to CHP: ", exc, exc );
}
}
@@ -92,7 +91,7 @@ public final class CharacterSprmUncompre
}
catch ( Exception exc )
{
- logger.log( POILogger.ERROR,
+ LOG.log( POILogger.ERROR,
"Unable to process all direct CHP SPRMs: ", exc, exc );
}
return newProperties;
@@ -112,7 +111,7 @@ public final class CharacterSprmUncompre
{
if ( warnAboutNonChpSprms )
{
- logger.log( POILogger.WARN,
+ LOG.log( POILogger.WARN,
"Non-CHP SPRM returned by SprmIterator: ", sprm );
}
continue;
@@ -141,7 +140,7 @@ public final class CharacterSprmUncompre
}
catch ( Exception exc )
{
- logger.log( POILogger.ERROR,
+ LOG.log( POILogger.ERROR,
"Unable to extract istd from direct CHP SPRM: ", exc, exc );
}
return style;
@@ -175,9 +174,9 @@ public final class CharacterSprmUncompre
// sprmCPicLocation -- 0x6A03
/*
* [MS-DOC]
- *
+ *
* Page 104 of 622
- *
+ *
* A signed 32-bit integer that specifies either the position in the
* Data Stream of a picture or binary data or the name of an OLE
* object storage.
@@ -566,9 +565,9 @@ public final class CharacterSprmUncompre
/*
* Microsoft Office Word 97-2007 Binary File Format (.doc)
* Specification
- *
+ *
* Page 78 of 210
- *
+ *
* sprmCPropRMark (opcode 0xCA57) is interpreted by moving the first
* parameter byte to chp.fPropRMark, the next two bytes to
* chp.ibstPropRMark, and the remaining four bytes to
@@ -601,7 +600,7 @@ public final class CharacterSprmUncompre
// sprmCFtcBi
break;
case 0x5f:
- // sprmCLidBi
+ // sprmCLidBi
break;
case 0x60:
// sprmCIcoBi
@@ -614,9 +613,9 @@ public final class CharacterSprmUncompre
/*
* Microsoft Office Word 97-2007 Binary File Format (.doc)
* Specification
- *
+ *
* Page 78 of 210
- *
+ *
* sprmCDispFldRMark (opcode 0xCA62) is interpreted by moving the
* first parameter byte to chp.fDispFldRMark, the next two bytes to
* chp.ibstDispFldRMark, the next four bytes to
@@ -645,7 +644,7 @@ public final class CharacterSprmUncompre
// sprmCShd80
/*
* "A Shd80 structure that specifies the background shading for the text. By default, text is not shaded."
- *
+ *
* Word (.doc) Binary File Format. Copyright (c) 2011 Microsoft
* Corporation. Release: Tuesday, March 15, 2011
*/
@@ -698,7 +697,7 @@ public final class CharacterSprmUncompre
// sprmCFNoProof -- 0x875
/*
* "A ToggleOperand value that specifies whether the text is excluded from the proofing analysis. By default, text is not excluded from the proofing analysis."
- *
+ *
* Word (.doc) Binary File Format. Copyright (c) 2012 Microsoft
* Corporation. Released: October 8, 2012
*/
@@ -706,7 +705,7 @@ public final class CharacterSprmUncompre
oldCHP.isFNoProof()));
break;
default:
- logger.log( POILogger.DEBUG, "Unknown CHP sprm ignored: ", sprm );
+ LOG.log( POILogger.DEBUG, "Unknown CHP sprm ignored: ", sprm );
break;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java Sun Jan 17 17:31:22 2021
@@ -40,11 +40,9 @@ import org.apache.poi.util.POILogFactory
import org.apache.poi.util.POILogger;
@Internal
-public final class ParagraphSprmUncompressor
- extends SprmUncompressor
-{
- private static final POILogger logger = POILogFactory
- .getLogger( ParagraphSprmUncompressor.class );
+public final class ParagraphSprmUncompressor extends SprmUncompressor {
+
+ private static final POILogger LOG = POILogFactory.getLogger( ParagraphSprmUncompressor.class );
public ParagraphSprmUncompressor()
{
@@ -71,7 +69,7 @@ public final class ParagraphSprmUncompre
}
catch ( Exception exc )
{
- logger.log(
+ LOG.log(
POILogger.ERROR,
"Unable to apply SPRM operation '", sprm.getOperation(), "': ", exc );
}
@@ -413,7 +411,7 @@ public final class ParagraphSprmUncompre
newPAP.setRsid( sprm.getOperand() );
break;
default:
- logger.log( POILogger.DEBUG, "Unknown PAP sprm ignored: ", sprm );
+ LOG.log( POILogger.DEBUG, "Unknown PAP sprm ignored: ", sprm );
break;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java Sun Jan 17 17:31:22 2021
@@ -29,7 +29,7 @@ import org.apache.poi.util.LittleEndianC
@Internal
public final class SectionSprmCompressor
{
- private final static SectionProperties DEFAULT_SEP = new SectionProperties();
+ private static final SectionProperties DEFAULT_SEP = new SectionProperties();
public SectionSprmCompressor()
{
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java Sun Jan 17 17:31:22 2021
@@ -28,9 +28,9 @@ import org.apache.poi.util.POILogger;
@Internal
-public final class SectionSprmUncompressor extends SprmUncompressor
-{
- private static final POILogger logger = POILogFactory.getLogger(SectionSprmUncompressor.class);
+public final class SectionSprmUncompressor extends SprmUncompressor {
+
+ private static final POILogger LOG = POILogFactory.getLogger(SectionSprmUncompressor.class);
public SectionSprmUncompressor()
{
@@ -241,7 +241,7 @@ public final class SectionSprmUncompress
newSEP.setNfcEdnRef(sprm.getOperand());
break;
default:
- logger.log(POILogger.INFO, "Unsupported Sprm operation: ", operation, " (", HexDump.byteToHex(operation), ")");
+ LOG.log(POILogger.INFO, "Unsupported Sprm operation: ", operation, " (", HexDump.byteToHex(operation), ")");
break;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java Sun Jan 17 17:31:22 2021
@@ -41,8 +41,8 @@ public final class SprmOperation
private static final BitField BITFIELD_TYPE = BitFieldFactory
.getInstance( 0x1c00 );
- final static private short SPRM_LONG_PARAGRAPH = (short) 0xc615;
- final static private short SPRM_LONG_TABLE = (short) 0xd608;
+ static final private short SPRM_LONG_PARAGRAPH = (short) 0xc615;
+ static final private short SPRM_LONG_TABLE = (short) 0xd608;
public static final int TYPE_PAP = 1;
public static final int TYPE_CHP = 2;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java Sun Jan 17 17:31:22 2021
@@ -26,10 +26,9 @@ import org.apache.poi.util.POILogFactory
import org.apache.poi.util.POILogger;
@Internal
-public final class TableSprmUncompressor
- extends SprmUncompressor
-{
- private static final POILogger logger = POILogFactory.getLogger( TableSprmUncompressor.class );
+public final class TableSprmUncompressor extends SprmUncompressor {
+
+ private static final POILogger LOG = POILogFactory.getLogger( TableSprmUncompressor.class );
public TableSprmUncompressor()
{
@@ -49,7 +48,7 @@ public final class TableSprmUncompressor
}
else
{
- logger.log( POILogger.WARN,
+ LOG.log( POILogger.WARN,
"Some table rows didn't specify number of columns in SPRMs" );
tableProperties = new TableProperties( (short) 1 );
}
@@ -70,7 +69,7 @@ public final class TableSprmUncompressor
}
catch ( ArrayIndexOutOfBoundsException ex )
{
- logger.log( POILogger.ERROR, "Unable to apply ", sprm,
+ LOG.log( POILogger.ERROR, "Unable to apply ", sprm,
": ", ex, ex );
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java Sun Jan 17 17:31:22 2021
@@ -53,7 +53,7 @@ import org.apache.poi.util.POILogger;
*/
public class Range {
- private static final POILogger logger = POILogFactory.getLogger( Range.class );
+ private static final POILogger LOG = POILogFactory.getLogger( Range.class );
/**
* @deprecated POI 3.8 beta 5
@@ -824,7 +824,7 @@ public class Range {
initAll();
if ( tableEndInclusive >= this._parEnd )
{
- logger.log( POILogger.WARN, "The table's bounds ", "[",
+ LOG.log( POILogger.WARN, "The table's bounds ", "[",
this._parStart, "; ", tableEndInclusive, ")",
" fall outside of this Range paragraphs numbers [",
this._parStart, "; ", this._parEnd, ")" );
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java Sun Jan 17 17:31:22 2021
@@ -27,16 +27,15 @@ import org.apache.poi.util.POILogger;
public final class TableRow extends Range
{
- private static final POILogger logger = POILogFactory
- .getLogger( TableRow.class );
+ private static final POILogger LOG = POILogFactory.getLogger( TableRow.class );
- private final static short SPRM_DXAGAPHALF = (short) 0x9602;
- private final static short SPRM_DYAROWHEIGHT = (short) 0x9407;
- private final static short SPRM_FCANTSPLIT = 0x3403;
- private final static short SPRM_FTABLEHEADER = 0x3404;
- private final static short SPRM_TJC = 0x5400;
+ private static final short SPRM_DXAGAPHALF = (short) 0x9602;
+ private static final short SPRM_DYAROWHEIGHT = (short) 0x9407;
+ private static final short SPRM_FCANTSPLIT = 0x3403;
+ private static final short SPRM_FTABLEHEADER = 0x3404;
+ private static final short SPRM_TJC = 0x5400;
- private final static char TABLE_CELL_MARK = '\u0007';
+ private static final char TABLE_CELL_MARK = '\u0007';
private TableCell[] _cells;
private boolean _cellsFound;
@@ -188,7 +187,7 @@ public final class TableRow extends Rang
if ( cells.size() != expectedCellsCount )
{
- logger.log( POILogger.WARN,
+ LOG.log( POILogger.WARN,
"Number of found table cells (", cells.size(),
") for table row [", getStartOffset(), "c; ",
getEndOffset(), "c] not equals to stored property value ",
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java Sun Jan 17 17:31:22 2021
@@ -43,14 +43,14 @@ public class LittleEndianCP950Reader ext
//https://en.wikipedia.org/wiki/Code_page_950
//see private use area
- private final static char range1Low = '\u8140';
- private final static char range1High = '\u8DFE';
- private final static char range2Low = '\u8E40';
- private final static char range2High = '\uA0FE';
- private final static char range3Low = '\uC6A1';
- private final static char range3High = '\uC8FE';
- private final static char range4Low = '\uFA40';
- private final static char range4High = '\uFEFE';
+ private static final char range1Low = '\u8140';
+ private static final char range1High = '\u8DFE';
+ private static final char range2Low = '\u8E40';
+ private static final char range2High = '\uA0FE';
+ private static final char range3Low = '\uC6A1';
+ private static final char range3High = '\uC8FE';
+ private static final char range4Low = '\uFA40';
+ private static final char range4High = '\uFEFE';
private final byte[] data;
private final int startOffset;
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java Sun Jan 17 17:31:22 2021
@@ -30,8 +30,7 @@ import org.apache.poi.util.POILogger;
public class HWPFTestDataSamples {
- private static final POILogger logger = POILogFactory
- .getLogger( HWPFTestDataSamples.class );
+ private static final POILogger LOG = POILogFactory.getLogger( HWPFTestDataSamples.class );
public static HWPFDocument openSampleFile(String sampleFileName) {
try {
@@ -66,7 +65,7 @@ public class HWPFTestDataSamples {
final long endUnzip = System.currentTimeMillis();
byte[] byteArray = baos.toByteArray();
- logger.log(POILogger.DEBUG, "Unzipped in ",
+ LOG.log(POILogger.DEBUG, "Unzipped in ",
Long.valueOf(endUnzip - start), " ms -- ",
Long.valueOf(byteArray.length), " byte(s)");
@@ -74,7 +73,7 @@ public class HWPFTestDataSamples {
HWPFDocument doc = new HWPFDocument(bais);
final long endParse = System.currentTimeMillis();
- logger.log(POILogger.DEBUG, "Parsed in ",
+ LOG.log(POILogger.DEBUG, "Parsed in ",
Long.valueOf(endParse - start), " ms");
return doc;
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java Sun Jan 17 17:31:22 2021
@@ -63,9 +63,6 @@ import org.w3c.dom.Document;
* against HWPF
*/
class TestBugs {
-
- private static final POILogger logger = POILogFactory.getLogger(TestBugs.class);
-
private static void assertEqualsIgnoreNewline(String expected, String actual) {
String newExpected = expected.replaceAll("\r\n", "\n")
.replaceAll("\r", "\n").trim();
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java Sun Jan 17 17:31:22 2021
@@ -37,9 +37,9 @@ import org.junit.jupiter.api.Test;
*/
final class TestPLVRecord {
- private final static String DV_DEFINITION = "$A$1:$A$5";
- private final static String XLS_FILENAME = "53972.xls";
- private final static String SHEET_NAME = "S2";
+ private static final String DV_DEFINITION = "$A$1:$A$5";
+ private static final String XLS_FILENAME = "53972.xls";
+ private static final String SHEET_NAME = "S2";
@Test
void testPLVRecord() throws Exception {
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java Sun Jan 17 17:31:22 2021
@@ -39,7 +39,6 @@ import org.junit.jupiter.api.Test;
* Tests for {@link HSSFDataFormat}
*/
final class TestHSSFDataFormat extends BaseTestDataFormat {
- private static final POILogger _logger = POILogFactory.getLogger(TestHSSFDataFormat.class);
public TestHSSFDataFormat() {
super(HSSFITestDataProvider.instance);
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java Sun Jan 17 17:31:22 2021
@@ -53,7 +53,7 @@ final class TestMultiSheetEval {
/**
* Name of the test spreadsheet (found in the standard test data folder)
*/
- public final static String FILENAME = "FormulaSheetRange.xls";
+ public static final String FILENAME = "FormulaSheetRange.xls";
/**
* Row (zero-based) in the test spreadsheet where the function examples start.
*/
Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java Sun Jan 17 17:31:22 2021
@@ -52,7 +52,7 @@ import org.junit.jupiter.api.Test;
* A base class for bugzilla issues that can be described in terms of common ss interfaces.
*/
public abstract class BaseTestBugzillaIssues {
- private static final POILogger logger = POILogFactory.getLogger(BaseTestBugzillaIssues.class);
+ private static final POILogger LOG = POILogFactory.getLogger(BaseTestBugzillaIssues.class);
private static final String TEST_32 = "Some text with 32 characters to ";
private static final String TEST_255 = "Some very long text that is exactly 255 characters, which are allowed here, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla.....";
@@ -1387,7 +1387,7 @@ public abstract class BaseTestBugzillaIs
// Create a workbook
try (Workbook wb = _testDataProvider.createWorkbook(nrows+1)) {
final Sheet sh = wb.createSheet();
- logger.log(POILogger.DEBUG, wb.getClass().getName(), " column autosizing timing...");
+ LOG.log(POILogger.DEBUG, wb.getClass().getName(), " column autosizing timing...");
final long t0 = time();
_testDataProvider.trackAllColumnsForAutosizing(sh);
@@ -1400,28 +1400,28 @@ public abstract class BaseTestBugzillaIs
}
final double populateSheetTime = delta(t0);
final double populateSheetTimePerCell_ns = (1000000 * populateSheetTime / (nrows * ncols));
- if (logger.check(POILogger.DEBUG)) {
- logger.log(POILogger.DEBUG, "Populate sheet time: ", populateSheetTime, " ms (", populateSheetTimePerCell_ns, " ns/cell)");
+ if (LOG.check(POILogger.DEBUG)) {
+ LOG.log(POILogger.DEBUG, "Populate sheet time: ", populateSheetTime, " ms (", populateSheetTimePerCell_ns, " ns/cell)");
- logger.log(POILogger.DEBUG, "Autosizing...");
+ LOG.log(POILogger.DEBUG, "Autosizing...");
}
final long t1 = time();
for (int c = 0; c < ncols; c++) {
final long t2 = time();
sh.autoSizeColumn(c);
- logger.log(POILogger.DEBUG, "Column ", c, " took ", delta(t2), " ms");
+ LOG.log(POILogger.DEBUG, "Column ", c, " took ", delta(t2), " ms");
}
final double autoSizeColumnsTime = delta(t1);
final double autoSizeColumnsTimePerColumn = autoSizeColumnsTime / ncols;
final double bestFitWidthTimePerCell_ns = 1000000 * autoSizeColumnsTime / (ncols * nrows);
- if (logger.check(POILogger.DEBUG)) {
- logger.log(POILogger.DEBUG, "Auto sizing columns took a total of ", autoSizeColumnsTime, " ms (", autoSizeColumnsTimePerColumn, " ms per column)");
- logger.log(POILogger.DEBUG, "Best fit width time per cell: ", bestFitWidthTimePerCell_ns, " ns");
+ if (LOG.check(POILogger.DEBUG)) {
+ LOG.log(POILogger.DEBUG, "Auto sizing columns took a total of ", autoSizeColumnsTime, " ms (", autoSizeColumnsTimePerColumn, " ms per column)");
+ LOG.log(POILogger.DEBUG, "Best fit width time per cell: ", bestFitWidthTimePerCell_ns, " ns");
}
final double totalTime_s = (populateSheetTime + autoSizeColumnsTime) / 1000;
- logger.log(POILogger.DEBUG, "Total time: ", totalTime_s, " s");
+ LOG.log(POILogger.DEBUG, "Total time: ", totalTime_s, " s");
}
//if (bestFitWidthTimePerCell_ns > 50000) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org