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 [4/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/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java Sun Jan 17 17:31:22 2021
@@ -45,8 +45,6 @@ import org.openxmlformats.schemas.spread
* High level representation of a row of a spreadsheet.
*/
public class XSSFRow implements Row, Comparable<XSSFRow> {
- //private static final POILogger _logger = POILogFactory.getLogger(XSSFRow.class);
-
/**
* the xml bean containing all cell definitions for this row
*/
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Sun Jan 17 17:31:22 2021
@@ -103,7 +103,7 @@ import org.openxmlformats.schemas.spread
* </p>
*/
public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
- private static final POILogger logger = POILogFactory.getLogger(XSSFSheet.class);
+ private static final POILogger LOG = POILogFactory.getLogger(XSSFSheet.class);
private static final double DEFAULT_ROW_HEIGHT = 15.0;
private static final double DEFAULT_MARGIN_HEADER = 0.3;
@@ -556,7 +556,7 @@ public class XSSFSheet extends POIXMLDoc
break;
}
}
- logger.log(POILogger.ERROR, "Can't find drawing with id=", ctDrawing.getId(), " in the list of the sheet's relationships");
+ LOG.log(POILogger.ERROR, "Can't find drawing with id=", ctDrawing.getId(), " in the list of the sheet's relationships");
}
return null;
}
@@ -628,7 +628,7 @@ public class XSSFSheet extends POIXMLDoc
}
}
if(drawing == null){
- logger.log(POILogger.ERROR, "Can't find VML drawing with id=", id, " in the list of the sheet's relationships");
+ LOG.log(POILogger.ERROR, "Can't find VML drawing with id=", id, " in the list of the sheet's relationships");
}
}
return drawing;
@@ -4676,12 +4676,12 @@ public class XSSFSheet extends POIXMLDoc
}
coo = coos.getOleObjectArray(0);
} catch (XmlException e) {
- logger.log(POILogger.INFO, "can't parse CTOleObjects", e);
+ LOG.log(POILogger.INFO, "can't parse CTOleObjects", e);
} finally {
try {
reader.close();
} catch (XMLStreamException e) {
- logger.log(POILogger.INFO, "can't close reader", e);
+ LOG.log(POILogger.INFO, "can't close reader", e);
}
}
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java Sun Jan 17 17:31:22 2021
@@ -41,7 +41,7 @@ import org.openxmlformats.schemas.spread
* Also used for built-in styles via dummy XML generated from presetTableStyles.xml.
*/
public class XSSFTableStyle implements TableStyle {
- private static final POILogger logger = POILogFactory.getLogger(XSSFTableStyle.class);
+ private static final POILogger LOG = POILogFactory.getLogger(XSSFTableStyle.class);
private final String name;
private final int index;
@@ -57,7 +57,7 @@ public class XSSFTableStyle implements T
public XSSFTableStyle(int index, CTDxfs dxfs, CTTableStyle tableStyle, IndexedColorMap colorMap) {
this.name = tableStyle.getName();
this.index = index;
-
+
List<CTDxf> dxfList = new ArrayList<>();
// CT* classes don't handle "mc:AlternateContent" elements, so get the Dxf instances manually
@@ -79,7 +79,7 @@ public class XSSFTableStyle implements T
}
if (dxf != null) dxfList.add(dxf);
} catch (XmlException e) {
- logger.log(POILogger.WARN, "Error parsing XSSFTableStyle", e);
+ LOG.log(POILogger.WARN, "Error parsing XSSFTableStyle", e);
}
}
}
@@ -98,7 +98,7 @@ public class XSSFTableStyle implements T
elementMap.put(type, dstyle);
}
}
-
+
public String getName() {
return name;
}
@@ -106,16 +106,16 @@ public class XSSFTableStyle implements T
public int getIndex() {
return index;
}
-
+
/**
* Always false for these, these are user defined styles
*/
public boolean isBuiltin() {
return false;
}
-
+
public DifferentialStyleProvider getStyle(TableStyleType type) {
return elementMap.get(type);
}
-
+
}
\ No newline at end of file
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java Sun Jan 17 17:31:22 2021
@@ -214,7 +214,7 @@ public class XSSFWorkbook extends POIXML
*/
private List<XSSFPictureData> pictures;
- private static final POILogger logger = POILogFactory.getLogger(XSSFWorkbook.class);
+ private static final POILogger LOG = POILogFactory.getLogger(XSSFWorkbook.class);
/**
* cached instance of XSSFCreationHelper for this workbook
@@ -415,7 +415,7 @@ public class XSSFWorkbook extends POIXML
for (CTExternalReference er : this.workbook.getExternalReferences().getExternalReferenceArray()) {
ExternalLinksTable el = elIdMap.get(er.getId());
if(el == null) {
- logger.log(POILogger.WARN, "ExternalLinksTable with r:id ", er.getId(), " was defined, but didn't exist in package, skipping");
+ LOG.log(POILogger.WARN, "ExternalLinksTable with r:id ", er.getId(), " was defined, but didn't exist in package, skipping");
continue;
}
externalLinks.add(el);
@@ -436,7 +436,7 @@ public class XSSFWorkbook extends POIXML
public void parseSheet(Map<String, XSSFSheet> shIdMap, CTSheet ctSheet) {
XSSFSheet sh = shIdMap.get(ctSheet.getId());
if(sh == null) {
- logger.log(POILogger.WARN, "Sheet with name ", ctSheet.getName(), " and r:id ",
+ LOG.log(POILogger.WARN, "Sheet with name ", ctSheet.getName(), " and r:id ",
ctSheet.getId(), " was defined, but didn't exist in package, skipping");
return;
}
@@ -649,11 +649,11 @@ public class XSSFWorkbook extends POIXML
}
CTWorksheet ct = clonedSheet.getCTWorksheet();
if(ct.isSetLegacyDrawing()) {
- logger.log(POILogger.WARN, "Cloning sheets with comments is not yet supported.");
+ LOG.log(POILogger.WARN, "Cloning sheets with comments is not yet supported.");
ct.unsetLegacyDrawing();
}
if (ct.isSetPageSetup()) {
- logger.log(POILogger.WARN, "Cloning sheets with page setup is not yet supported.");
+ LOG.log(POILogger.WARN, "Cloning sheets with page setup is not yet supported.");
ct.unsetPageSetup();
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java Sun Jan 17 17:31:22 2021
@@ -33,7 +33,7 @@ import org.apache.poi.xssf.usermodel.XSS
// {@link org.apache.poi.hssf.usermodel.helpers.HSSFColumnShifter}
@Beta
public final class XSSFColumnShifter extends ColumnShifter {
- private static final POILogger logger = POILogFactory.getLogger(XSSFColumnShifter.class);
+ private static final POILogger LOG = POILogFactory.getLogger(XSSFColumnShifter.class);
public XSSFColumnShifter(XSSFSheet sh) {
super(sh);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java Sun Jan 17 17:31:22 2021
@@ -42,7 +42,7 @@ import java.util.List;
*/
@Internal
/*private*/ final class XSSFRowColShifter {
- private static final POILogger logger = POILogFactory.getLogger(XSSFRowColShifter.class);
+ private static final POILogger LOG = POILogFactory.getLogger(XSSFRowColShifter.class);
private XSSFRowColShifter() { /*no instances for static classes*/}
@@ -151,7 +151,7 @@ import java.util.List;
return shiftedFmla;
} catch (FormulaParseException fpe) {
// Log, but don't change, rather than breaking
- logger.log(POILogger.WARN, "Error shifting formula on row ", row.getRowNum(), fpe);
+ LOG.log(POILogger.WARN, "Error shifting formula on row ", row.getRowNum(), fpe);
return formula;
}
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java Sun Jan 17 17:31:22 2021
@@ -31,7 +31,7 @@ import org.apache.poi.xssf.usermodel.XSS
// non-Javadoc: When possible, code should be implemented in the RowShifter abstract class to avoid duplication with
// {@link org.apache.poi.hssf.usermodel.helpers.HSSFRowShifter}
public final class XSSFRowShifter extends RowShifter {
- private static final POILogger logger = POILogFactory.getLogger(XSSFRowShifter.class);
+ private static final POILogger LOG = POILogFactory.getLogger(XSSFRowShifter.class);
public XSSFRowShifter(XSSFSheet sh) {
super(sh);
@@ -45,7 +45,7 @@ public final class XSSFRowShifter extend
public void updateFormulas(FormulaShifter formulaShifter) {
XSSFRowColShifter.updateFormulas(sheet, formulaShifter);
}
-
+
/**
* Update the formulas in specified row using the formula shifting policy specified by shifter
*
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java Sun Jan 17 17:31:22 2021
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
public final class TestListParts {
- private static final POILogger logger = POILogFactory.getLogger(TestListParts.class);
+ private static final POILogger LOG = POILogFactory.getLogger(TestListParts.class);
private TreeMap<PackagePartName, String> expectedValues;
@@ -91,7 +91,7 @@ public final class TestListParts {
for (PackagePart part : p.getParts()) {
values.put(part.getPartName(), part.getContentType());
- logger.log(POILogger.DEBUG, part.getPartName());
+ LOG.log(POILogger.DEBUG, part.getPartName());
}
// Compare expected values with values return by the package
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java Sun Jan 17 17:31:22 2021
@@ -98,7 +98,7 @@ import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
public final class TestPackage {
- private static final POILogger logger = POILogFactory.getLogger(TestPackage.class);
+ private static final POILogger LOG = POILogFactory.getLogger(TestPackage.class);
private static final String NS_OOXML_WP_MAIN = "http://schemas.openxmlformats.org/wordprocessingml/2006/main";
private static final String CONTENT_EXT_PROPS = "application/vnd.openxmlformats-officedocument.extended-properties+xml";
private static final POIDataSamples xlsSamples = POIDataSamples.getSpreadSheetInstance();
@@ -444,7 +444,7 @@ public final class TestPackage {
for (PackagePart part : p.getParts()) {
values.put(part.getPartName(), part.getContentType());
- logger.log(POILogger.DEBUG, part.getPartName());
+ LOG.log(POILogger.DEBUG, part.getPartName());
}
// Compare expected values with values return by the package
@@ -478,7 +478,7 @@ public final class TestPackage {
for (PackagePart part : p.getParts()) {
values.put(part.getPartName(), part.getContentType());
- logger.log(POILogger.DEBUG, part.getPartName());
+ LOG.log(POILogger.DEBUG, part.getPartName());
}
// Compare expected values with values return by the package
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java Sun Jan 17 17:31:22 2021
@@ -44,7 +44,7 @@ class TestRelationships {
private static final String SHEET_WITH_COMMENTS =
"/xl/worksheets/sheet1.xml";
- private static final POILogger logger = POILogFactory.getLogger(TestPackageCoreProperties.class);
+ private static final POILogger LOG = POILogFactory.getLogger(TestPackageCoreProperties.class);
/**
* Test relationships are correctly loaded. This at the moment fails (as of r499)
@@ -56,7 +56,7 @@ class TestRelationships {
void testLoadRelationships() throws Exception {
InputStream is = openSampleStream("sample.xlsx");
try (OPCPackage pkg = OPCPackage.open(is)) {
- logger.log(POILogger.DEBUG, "1: " + pkg);
+ LOG.log(POILogger.DEBUG, "1: " + pkg);
PackageRelationshipCollection rels = pkg.getRelationshipsByType(PackageRelationshipTypes.CORE_DOCUMENT);
PackageRelationship coreDocRelationship = rels.getRelationship(0);
PackagePart corePart = pkg.getPart(coreDocRelationship);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java Sun Jan 17 17:31:22 2021
@@ -41,7 +41,7 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
class TestDrawPictureShape {
- final static POIDataSamples ssSamples = POIDataSamples.getSlideShowInstance();
+ static final POIDataSamples ssSamples = POIDataSamples.getSlideShowInstance();
private static boolean xslfOnly;
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java Sun Jan 17 17:31:22 2021
@@ -38,12 +38,7 @@ import org.apache.poi.sl.usermodel.TextP
import org.apache.poi.xslf.XSLFTestDataSamples;
import org.junit.jupiter.api.Test;
-/**
- * @author Yegor Kozlov
- */
class TestXSLFTextParagraph {
- // private static POILogger _logger = POILogFactory.getLogger(XSLFTextParagraph.class);
-
static class DrawTextParagraphProxy extends DrawTextParagraph {
DrawTextParagraphProxy(XSLFTextParagraph p) {
super(p);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java Sun Jan 17 17:31:22 2021
@@ -59,8 +59,8 @@ class TestAutoSizeColumnTracker {
_columns.add(3);
columns = Collections.unmodifiableSortedSet(_columns);
}
- private final static String SHORT_MESSAGE = "short";
- private final static String LONG_MESSAGE = "This is a test of a long message! This is a test of a long message!";
+ private static final String SHORT_MESSAGE = "short";
+ private static final String LONG_MESSAGE = "This is a test of a long message! This is a test of a long message!";
@BeforeEach
void setUpSheetAndWorkbook() {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java Sun Jan 17 17:31:22 2021
@@ -58,7 +58,7 @@ import org.junit.jupiter.params.provider
*
*/
public final class TestFormulaEvaluatorOnXSSF {
- private static final POILogger logger = POILogFactory.getLogger(TestFormulaEvaluatorOnXSSF.class);
+ private static final POILogger LOG = POILogFactory.getLogger(TestFormulaEvaluatorOnXSSF.class);
private static XSSFWorkbook workbook;
private static Sheet sheet;
@@ -244,12 +244,12 @@ public final class TestFormulaEvaluatorO
*/
private static String getTargetFunctionName(Row r) {
if(r == null) {
- logger.log(POILogger.WARN, "Warning - given null row, can't figure out function name");
+ LOG.log(POILogger.WARN, "Warning - given null row, can't figure out function name");
return null;
}
Cell cell = r.getCell(SS.COLUMN_INDEX_FUNCTION_NAME);
if(cell == null) {
- logger.log(POILogger.WARN, "Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_FUNCTION_NAME + ", can't figure out function name");
+ LOG.log(POILogger.WARN, "Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_FUNCTION_NAME + ", can't figure out function name");
return null;
}
if(cell.getCellType() == CellType.BLANK) {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java Sun Jan 17 17:31:22 2021
@@ -49,7 +49,7 @@ import org.junit.jupiter.params.provider
* Tests formulas for multi sheet reference (i.e. SUM(Sheet1:Sheet5!A1))
*/
public final class TestMultiSheetFormulaEvaluatorOnXSSF {
- private static final POILogger logger = POILogFactory.getLogger(TestMultiSheetFormulaEvaluatorOnXSSF.class);
+ private static final POILogger LOG = POILogFactory.getLogger(TestMultiSheetFormulaEvaluatorOnXSSF.class);
private static XSSFWorkbook workbook;
private static Sheet sheet;
@@ -211,12 +211,12 @@ public final class TestMultiSheetFormula
*/
private static String getTargetFunctionName(Row r) {
if(r == null) {
- logger.log(POILogger.WARN, "Warning - given null row, can't figure out function name");
+ LOG.log(POILogger.WARN, "Warning - given null row, can't figure out function name");
return null;
}
Cell cell = r.getCell(SS.COLUMN_INDEX_FUNCTION_NAME);
if(cell == null) {
- logger.log(POILogger.WARN, "Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_FUNCTION_NAME + ", can't figure out function name");
+ LOG.log(POILogger.WARN, "Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_FUNCTION_NAME + ", can't figure out function name");
return null;
}
@@ -232,12 +232,12 @@ public final class TestMultiSheetFormula
*/
private static String getTargetTestName(Row r) {
if(r == null) {
- logger.log(POILogger.WARN, "Warning - given null row, can't figure out test name");
+ LOG.log(POILogger.WARN, "Warning - given null row, can't figure out test name");
return null;
}
Cell cell = r.getCell(SS.COLUMN_INDEX_TEST_NAME);
if(cell == null) {
- logger.log(POILogger.WARN, "Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_TEST_NAME + ", can't figure out test name");
+ LOG.log(POILogger.WARN, "Warning - Row " + r.getRowNum() + " has no cell " + SS.COLUMN_INDEX_TEST_NAME + ", can't figure out test name");
return null;
}
CellType ct = cell.getCellType();
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java Sun Jan 17 17:31:22 2021
@@ -43,7 +43,7 @@ import org.openxmlformats.schemas.spread
*/
class TestXSSFColGrouping {
- private static final POILogger logger = POILogFactory.getLogger(TestXSSFColGrouping.class);
+ private static final POILogger LOG = POILogFactory.getLogger(TestXSSFColGrouping.class);
/**
@@ -65,7 +65,7 @@ class TestXSSFColGrouping {
sheet = wb2.getSheet("test");
CTCols cols = sheet.getCTWorksheet().getColsArray(0);
- logger.log(POILogger.DEBUG, "test52186/cols:" + cols);
+ LOG.log(POILogger.DEBUG, "test52186/cols:" + cols);
for (CTCol col : cols.getColArray()) {
assertTrue(col.isSetWidth(), "Col width attribute is unset: " + col);
}
@@ -91,7 +91,7 @@ class TestXSSFColGrouping {
sheet.setColumnGroupCollapsed(4, true);
CTCols cols = sheet.getCTWorksheet().getColsArray(0);
- logger.log(POILogger.DEBUG, "test52186_2/cols:" + cols);
+ LOG.log(POILogger.DEBUG, "test52186_2/cols:" + cols);
try (XSSFWorkbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb1, "testNoColsWithoutWidthWhenGroupingAndCollapsing")) {
sheet = wb2.getSheet("test");
@@ -125,7 +125,7 @@ class TestXSSFColGrouping {
sheet.groupColumn((short) 2, (short) 3);
sheet.getCTWorksheet().getColsArray(0);
- logger.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_2_WRAPS/cols:" + cols);
+ LOG.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_2_WRAPS/cols:" + cols);
assertEquals(0, cols.getColArray(0).getOutlineLevel());
assertEquals(2, cols.getColArray(0).getMin()); // 1 based
@@ -173,7 +173,7 @@ class TestXSSFColGrouping {
sheet.groupColumn((short) 1, (short) 5);
cols = sheet.getCTWorksheet().getColsArray(0);
- logger.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_1_WRAPS/cols:" + cols);
+ LOG.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_1_WRAPS/cols:" + cols);
assertEquals(1, cols.getColArray(0).getOutlineLevel());
assertEquals(2, cols.getColArray(0).getMin()); // 1 based
@@ -221,7 +221,7 @@ class TestXSSFColGrouping {
sheet.groupColumn((short) 3, (short) 5);
cols = sheet.getCTWorksheet().getColsArray(0);
- logger.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_1_MINOR/cols:" + cols);
+ LOG.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_1_MINOR/cols:" + cols);
assertEquals(0, cols.getColArray(0).getOutlineLevel());
assertEquals(3, cols.getColArray(0).getMin()); // 1 based
@@ -270,7 +270,7 @@ class TestXSSFColGrouping {
sheet.groupColumn((short) 1, (short) 3);
cols = sheet.getCTWorksheet().getColsArray(0);
- logger.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_2_MINOR/cols:" + cols);
+ LOG.log(POILogger.DEBUG, "testMergingOverlappingCols_OVERLAPS_2_MINOR/cols:" + cols);
assertEquals(1, cols.getColArray(0).getOutlineLevel());
assertEquals(2, cols.getColArray(0).getMin()); // 1 based
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java Sun Jan 17 17:31:22 2021
@@ -67,7 +67,7 @@ class TestXSSFConditionalFormatting exte
testReadOffice2007("NewStyleConditionalFormattings.xlsx");
}
- private final static java.awt.Color PEAK_ORANGE = new java.awt.Color(255, 239, 221);
+ private static final java.awt.Color PEAK_ORANGE = new java.awt.Color(255, 239, 221);
@Test
void testFontFormattingColor() {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java Sun Jan 17 17:31:22 2021
@@ -58,7 +58,7 @@ import org.apache.poi.util.POILogger;
*/
@SuppressWarnings("WeakerAccess")
public class OLE2ScratchpadExtractorFactory implements ExtractorProvider {
- private static final POILogger logger = POILogFactory.getLogger(OLE2ScratchpadExtractorFactory.class);
+ private static final POILogger LOG = POILogFactory.getLogger(OLE2ScratchpadExtractorFactory.class);
@Override
public boolean accepts(FileMagic fm) {
@@ -169,7 +169,7 @@ public class OLE2ScratchpadExtractorFact
.filter(entry -> entry.getName().startsWith("_"))
.forEach(dirs::add);
} catch(FileNotFoundException e) {
- logger.log(POILogger.INFO, "Ignoring FileNotFoundException while extracting Word document", e.getLocalizedMessage());
+ LOG.log(POILogger.INFO, "Ignoring FileNotFoundException while extracting Word document", e.getLocalizedMessage());
// ignored here
}
//} else if(ext instanceof PowerPointExtractor) {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java Sun Jan 17 17:31:22 2021
@@ -28,16 +28,19 @@ import org.apache.poi.util.POILogger;
* Base of all chunks, which hold data, flags etc
*/
public final class Chunk {
+ /** For logging warnings about the structure of the file */
+ private static final POILogger LOG = POILogFactory.getLogger(Chunk.class);
+
/**
* The contents of the chunk, excluding the header,
* trailer and separator
*/
- private byte[] contents;
- private ChunkHeader header;
+ private final byte[] contents;
+ private final ChunkHeader header;
/** May be null */
- private ChunkTrailer trailer;
+ private final ChunkTrailer trailer;
/** May be null */
- private ChunkSeparator separator;
+ private final ChunkSeparator separator;
/** The possible different commands we can hold */
private CommandDefinition[] commandDefinitions;
/** The command+value pairs we hold */
@@ -47,9 +50,6 @@ public final class Chunk {
/** The name of the chunk, as found from the commandDefinitions */
private String name;
- /** For logging warnings about the structure of the file */
- private POILogger logger = POILogFactory.getLogger(Chunk.class);
-
public Chunk(ChunkHeader header, ChunkTrailer trailer, ChunkSeparator separator, byte[] contents) {
this.header = header;
this.trailer = trailer;
@@ -179,7 +179,7 @@ public final class Chunk {
// Check we seem to have enough data
if(offset >= contents.length) {
- logger.log(POILogger.WARN,
+ LOG.log(POILogger.WARN,
"Command offset ", offset, " past end of data at ", contents.length
);
continue;
@@ -241,12 +241,12 @@ public final class Chunk {
break;
default:
- logger.log(POILogger.INFO,
+ LOG.log(POILogger.INFO,
"Command of type ", type, " not processed!");
}
}
catch (Exception e) {
- logger.log(POILogger.ERROR, "Unexpected error processing command, ignoring and continuing. Command: ", command, e);
+ LOG.log(POILogger.ERROR, "Unexpected error processing command, ignoring and continuing. Command: ", command, e);
}
// Add to the array
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java Sun Jan 17 17:31:22 2021
@@ -59,7 +59,7 @@ public final class ChunkFactory {
"/org/apache/poi/hdgf/chunks_parse_cmds.tbl";
/** For logging problems we spot with the file */
- private static final POILogger logger = POILogFactory.getLogger(ChunkFactory.class);
+ private static final POILogger LOG = POILogFactory.getLogger(ChunkFactory.class);
public ChunkFactory(int version) throws IOException {
this.version = version;
@@ -139,7 +139,7 @@ public final class ChunkFactory {
// Check we have enough data, and tweak the header size
// as required
if(endOfDataPos > data.length) {
- logger.log(POILogger.WARN,
+ LOG.log(POILogger.WARN,
"Header called for ", header.getLength(), " bytes, but that would take us past the end of the data!");
endOfDataPos = data.length;
@@ -165,7 +165,7 @@ public final class ChunkFactory {
data, endOfDataPos);
endOfDataPos += 8;
} else {
- logger.log(POILogger.ERROR, "Header claims a length to ", endOfDataPos, " there's then no space for the trailer in the data (", data.length, ")");
+ LOG.log(POILogger.ERROR, "Header claims a length to ", endOfDataPos, " there's then no space for the trailer in the data (", data.length, ")");
}
}
if(header.hasSeparator()) {
@@ -173,7 +173,7 @@ public final class ChunkFactory {
separator = new ChunkSeparator(
data, endOfDataPos);
} else {
- logger.log(POILogger.ERROR, "Header claims a length to ", endOfDataPos, " there's then no space for the separator in the data (", data.length, ")");
+ LOG.log(POILogger.ERROR, "Header claims a length to ", endOfDataPos, " there's then no space for the separator in the data (", data.length, ")");
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java Sun Jan 17 17:31:22 2021
@@ -35,7 +35,7 @@ import org.apache.poi.poifs.filesystem.P
* of a Visio file
*/
public final class VSDDumper {
- final static String tabs = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+ static final String tabs = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
private final PrintStream ps;
private final HDGFDiagram hdgf;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java Sun Jan 17 17:31:22 2021
@@ -27,13 +27,13 @@ import org.apache.poi.util.POILogFactory
import org.apache.poi.util.POILogger;
public final class ChunkStream extends Stream {
- private final static POILogger logger = POILogFactory.getLogger(ChunkStream.class);
-
- private ChunkFactory chunkFactory;
+ private static final POILogger LOG = POILogFactory.getLogger(ChunkStream.class);
+
+ private final ChunkFactory chunkFactory;
/** All the Chunks we contain */
private Chunk[] chunks;
- protected ChunkStream(Pointer pointer, StreamStore store, ChunkFactory chunkFactory) {
+ ChunkStream(Pointer pointer, StreamStore store, ChunkFactory chunkFactory) {
super(pointer, store);
this.chunkFactory = chunkFactory;
@@ -66,14 +66,14 @@ public final class ChunkStream extends S
pos += chunk.getOnDiskSize();
} else {
- logger.log(POILogger.WARN, "Needed ", headerSize, " bytes to create the next chunk header, but only found ", (contents.length-pos), " bytes, ignoring rest of data");
+ LOG.log(POILogger.WARN, "Needed ", headerSize, " bytes to create the next chunk header, but only found ", (contents.length-pos), " bytes, ignoring rest of data");
pos = contents.length;
}
}
}
catch (Exception e)
{
- logger.log(POILogger.ERROR, "Failed to create chunk at ", pos, ", ignoring rest of data." + e);
+ LOG.log(POILogger.ERROR, "Failed to create chunk at ", pos, ", ignoring rest of data." + e);
}
chunks = chunksA.toArray(new Chunk[0]);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java Sun Jan 17 17:31:22 2021
@@ -52,7 +52,7 @@ import org.apache.poi.util.RecordFormatE
*/
@Internal
public class HemfComment {
- private static final POILogger logger = POILogFactory.getLogger(HemfComment.class);
+ private static final POILogger LOG = POILogFactory.getLogger(HemfComment.class);
private static final int MAX_RECORD_LENGTH = HwmfPicture.MAX_RECORD_LENGTH;
public enum HemfCommentRecordType {
@@ -601,7 +601,7 @@ public class HemfComment {
// some emf comments are truncated, so we don't use readFully here
int readBytes = leis.read(wmfData);
if (readBytes < wmfData.length) {
- logger.log(POILogger.INFO, "Emf comment with WMF: expected ", wmfData.length,
+ LOG.log(POILogger.INFO, "Emf comment with WMF: expected ", wmfData.length,
" bytes - received only ", readBytes, " bytes.");
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java Sun Jan 17 17:31:22 2021
@@ -295,62 +295,62 @@ public class HemfPlusPen {
/**
* If set, a 2x3 transform matrix MUST be specified in the OptionalData field of an EmfPlusPenData object.
*/
- private final static BitField TRANSFORM = BitFieldFactory.getInstance(0x00000001);
+ private static final BitField TRANSFORM = BitFieldFactory.getInstance(0x00000001);
/**
* If set, the style of a starting line cap MUST be specified in the OptionalData field of an
* EmfPlusPenData object.
*/
- private final static BitField START_CAP = BitFieldFactory.getInstance(0x00000002);
+ private static final BitField START_CAP = BitFieldFactory.getInstance(0x00000002);
/**
* Indicates whether the style of an ending line cap MUST be specified in the OptionalData field
* of an EmfPlusPenData object.
*/
- private final static BitField END_CAP = BitFieldFactory.getInstance(0x00000004);
+ private static final BitField END_CAP = BitFieldFactory.getInstance(0x00000004);
/**
* Indicates whether a line join type MUST be specified in the OptionalData
* field of an EmfPlusPenData object.
*/
- private final static BitField JOIN = BitFieldFactory.getInstance(0x00000008);
+ private static final BitField JOIN = BitFieldFactory.getInstance(0x00000008);
/**
* Indicates whether a miter limit MUST be specified in the OptionalData field of an EmfPlusPenData object.
*/
- private final static BitField MITER_LIMIT = BitFieldFactory.getInstance(0x00000010);
+ private static final BitField MITER_LIMIT = BitFieldFactory.getInstance(0x00000010);
/**
* Indicates whether a line style MUST be specified in the OptionalData field of an EmfPlusPenData object.
*/
- private final static BitField LINE_STYLE = BitFieldFactory.getInstance(0x00000020);
+ private static final BitField LINE_STYLE = BitFieldFactory.getInstance(0x00000020);
/**
* Indicates whether a dashed line cap MUST be specified in the OptionalData field of an EmfPlusPenData object.
*/
- private final static BitField DASHED_LINE_CAP = BitFieldFactory.getInstance(0x00000040);
+ private static final BitField DASHED_LINE_CAP = BitFieldFactory.getInstance(0x00000040);
/**
* Indicates whether a dashed line offset MUST be specified in the OptionalData field of an EmfPlusPenData object.
*/
- private final static BitField DASHED_LINE_OFFSET = BitFieldFactory.getInstance(0x00000080);
+ private static final BitField DASHED_LINE_OFFSET = BitFieldFactory.getInstance(0x00000080);
/**
* Indicates whether an EmfPlusDashedLineData object MUST be specified in the
* OptionalData field of an EmfPlusPenData object.
*/
- private final static BitField DASHED_LINE = BitFieldFactory.getInstance(0x00000100);
+ private static final BitField DASHED_LINE = BitFieldFactory.getInstance(0x00000100);
/**
* Indicates whether a pen alignment MUST be specified in the OptionalData field of an EmfPlusPenData object.
*/
- private final static BitField NON_CENTER = BitFieldFactory.getInstance(0x00000200);
+ private static final BitField NON_CENTER = BitFieldFactory.getInstance(0x00000200);
/**
* Indicates whether the length and content of a EmfPlusCompoundLineData object are present in the
* OptionalData field of an EmfPlusPenData object.
*/
- private final static BitField COMPOUND_LINE = BitFieldFactory.getInstance(0x00000400);
+ private static final BitField COMPOUND_LINE = BitFieldFactory.getInstance(0x00000400);
/**
* Indicates whether an EmfPlusCustomStartCapData object MUST be specified
* in the OptionalData field of an EmfPlusPenData object.y
*/
- private final static BitField CUSTOM_START_CAP = BitFieldFactory.getInstance(0x00000800);
+ private static final BitField CUSTOM_START_CAP = BitFieldFactory.getInstance(0x00000800);
/**
* Indicates whether an EmfPlusCustomEndCapData object MUST be specified in
* the OptionalData field of an EmfPlusPenData object.
*/
- private final static BitField CUSTOM_END_CAP = BitFieldFactory.getInstance(0x00001000);
+ private static final BitField CUSTOM_END_CAP = BitFieldFactory.getInstance(0x00001000);
private static final int[] FLAGS_MASKS = {
0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010,
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java Sun Jan 17 17:31:22 2021
@@ -33,25 +33,25 @@ import org.apache.poi.util.POILogFactory
import org.apache.poi.util.POILogger;
/**
- * A pure-MAPI attribute holding a Date, which applies
+ * A pure-MAPI attribute holding a Date, which applies
* to a {@link HMEFMessage} or one of its {@link Attachment}s.
- *
+ *
* Timestamps are usually given in UTC.
- *
+ *
* @see <a href="https://msdn.microsoft.com/en-us/library/cc433482(v=exchg.80).aspx">[MS-OXOMSG]: Email Object Protocol</a>
* @see <a href="https://msdn.microsoft.com/en-us/library/cc433490(v=exchg.80).aspx">[MS-OXPROPS]: Exchange Server Protocols Master Property List</a>
*/
public final class MAPIDateAttribute extends MAPIAttribute {
- private final static POILogger logger = POILogFactory.getLogger(MAPIDateAttribute.class);
- private Date data;
-
+ private static final POILogger LOG = POILogFactory.getLogger(MAPIDateAttribute.class);
+ private final Date data;
+
/**
* Constructs a single new date attribute from the id, type,
* and the contents of the stream
*/
protected MAPIDateAttribute(MAPIProperty property, int type, byte[] data) {
super(property, type, data);
-
+
// The value is a 64 bit Windows Filetime
this.data = Filetime.filetimeToDate(
LittleEndian.getLong(data, 0)
@@ -61,14 +61,14 @@ public final class MAPIDateAttribute ext
public Date getDate() {
return this.data;
}
-
+
public String toString() {
DateFormatSymbols dfs = DateFormatSymbols.getInstance(Locale.ROOT);
DateFormat df = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", dfs);
df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
return getProperty() + " " + df.format(data);
}
-
+
/**
* Returns the Date of a Attribute, converting as appropriate
*/
@@ -79,8 +79,8 @@ public final class MAPIDateAttribute ext
if(attr instanceof MAPIDateAttribute) {
return ((MAPIDateAttribute)attr).getDate();
}
-
- logger.log(POILogger.WARN, "Warning, non date property found: ", attr);
+
+ LOG.log(POILogger.WARN, "Warning, non date property found: ", attr);
return null;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java Sun Jan 17 17:31:22 2021
@@ -28,17 +28,17 @@ import org.apache.poi.util.POILogger;
import org.apache.poi.util.StringUtil;
/**
- * A pure-MAPI attribute holding a String, which applies
+ * A pure-MAPI attribute holding a String, which applies
* to a {@link HMEFMessage} or one of its {@link Attachment}s.
*/
public final class MAPIStringAttribute extends MAPIAttribute {
- private final static POILogger logger = POILogFactory.getLogger(MAPIStringAttribute.class);
+ private static final POILogger LOG = POILogFactory.getLogger(MAPIStringAttribute.class);
private static final String CODEPAGE = "CP1252";
private final String data;
-
+
public MAPIStringAttribute(MAPIProperty property, int type, byte[] data) {
super(property, type, data);
-
+
String tmpData = null;
if(type == Types.ASCII_STRING.getId()) {
tmpData = new String(data, Charset.forName(CODEPAGE));
@@ -47,22 +47,22 @@ public final class MAPIStringAttribute e
} else {
throw new IllegalArgumentException("Not a string type " + type);
}
-
+
// Strip off the null terminator if present
if(tmpData.endsWith("\0")) {
tmpData = tmpData.substring(0, tmpData.length()-1);
}
this.data = tmpData;
}
-
+
public String getDataString() {
return data;
}
-
+
public String toString() {
return getProperty() + " " + data;
}
-
+
/**
* Returns the string of a Attribute, converting as appropriate
*/
@@ -76,8 +76,8 @@ public final class MAPIStringAttribute e
if(attr instanceof MAPIRtfAttribute) {
return ((MAPIRtfAttribute)attr).getDataString();
}
-
- logger.log(POILogger.WARN, "Warning, non string property found: ", attr);
+
+ LOG.log(POILogger.WARN, "Warning, non string property found: ", attr);
return null;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java Sun Jan 17 17:31:22 2021
@@ -39,16 +39,16 @@ import org.apache.poi.util.POILogger;
* or one of its {@link Attachment}s.
*/
public final class TNEFDateAttribute extends TNEFAttribute {
- private final static POILogger logger = POILogFactory.getLogger(TNEFDateAttribute.class);
- private Date data;
-
+ private static final POILogger LOG = POILogFactory.getLogger(TNEFDateAttribute.class);
+ private final Date data;
+
/**
* Constructs a single new date attribute from the id, type,
* and the contents of the stream
*/
protected TNEFDateAttribute(int id, int type, InputStream inp) throws IOException {
super(id, type, inp);
-
+
byte[] binData = getData();
if(binData.length == 8) {
// The value is a 64 bit Windows Filetime
@@ -75,15 +75,15 @@ public final class TNEFDateAttribute ext
public Date getDate() {
return this.data;
}
-
+
public String toString() {
DateFormatSymbols dfs = DateFormatSymbols.getInstance(Locale.ROOT);
DateFormat df = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", dfs);
- df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
+ df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
return "Attribute " + getProperty() + ", type=" + getType() +
- ", date=" + df.format(data);
+ ", date=" + df.format(data);
}
-
+
/**
* Returns the Date of a Attribute, converting as appropriate
*/
@@ -94,8 +94,8 @@ public final class TNEFDateAttribute ext
if(attr instanceof TNEFDateAttribute) {
return ((TNEFDateAttribute)attr).getDate();
}
-
- logger.log(POILogger.WARN, "Warning, non date property found: ", attr);
+
+ LOG.log(POILogger.WARN, "Warning, non date property found: ", attr);
return null;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java Sun Jan 17 17:31:22 2021
@@ -31,16 +31,16 @@ import org.apache.poi.util.StringUtil;
* or one of its {@link Attachment}s.
*/
public final class TNEFStringAttribute extends TNEFAttribute {
- private final static POILogger logger = POILogFactory.getLogger(TNEFStringAttribute.class);
- private String data;
-
+ private static final POILogger LOG = POILogFactory.getLogger(TNEFStringAttribute.class);
+ private final String data;
+
/**
* Constructs a single new string attribute from the id, type,
* and the contents of the stream
*/
protected TNEFStringAttribute(int id, int type, InputStream inp) throws IOException {
super(id, type, inp);
-
+
String tmpData = null;
byte[] data = getData();
if(getType() == TNEFProperty.TYPE_TEXT) {
@@ -50,7 +50,7 @@ public final class TNEFStringAttribute e
data, 0, data.length
);
}
-
+
// Strip off the null terminator if present
if(tmpData.endsWith("\0")) {
tmpData = tmpData.substring(0, tmpData.length()-1);
@@ -61,12 +61,12 @@ public final class TNEFStringAttribute e
public String getString() {
return this.data;
}
-
+
public String toString() {
return "Attribute " + getProperty() + ", type=" + getType() +
- ", data=" + getString();
+ ", data=" + getString();
}
-
+
/**
* Returns the string of a Attribute, converting as appropriate
*/
@@ -77,8 +77,8 @@ public final class TNEFStringAttribute e
if(attr instanceof TNEFStringAttribute) {
return ((TNEFStringAttribute)attr).getString();
}
-
- logger.log(POILogger.WARN, "Warning, non string property found: ", attr);
+
+ LOG.log(POILogger.WARN, "Warning, non string property found: ", attr);
return null;
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java Sun Jan 17 17:31:22 2021
@@ -34,12 +34,12 @@ import org.apache.poi.util.POILogger;
* Read Quill Contents (/Quill/QuillSub/CONTENTS) from an HPBF (Publisher .pub) document
*/
public final class QuillContents extends HPBFPart {
- private static POILogger logger = POILogFactory.getLogger(QuillContents.class);
+ private static final POILogger LOG = POILogFactory.getLogger(QuillContents.class);
//arbitrarily selected; may need to increase
private static final int MAX_RECORD_LENGTH = 1_000_000;
private static final String[] PATH = { "Quill", "QuillSub", "CONTENTS", };
- private QCBit[] bits;
+ private final QCBit[] bits;
public QuillContents(DirectoryNode baseDir) throws IOException {
super(baseDir, PATH);
@@ -79,7 +79,7 @@ public final class QuillContents extends
bits[i] = QCPLCBit.createQCPLCBit(thingType, bitType, bitData);
} catch (ArrayIndexOutOfBoundsException e) {
// bug 60685: fall back so that the rest of the document can be read
- logger.log(POILogger.WARN, "Unable to read Quill Contents PLC Bit record. Ignoring this record.");
+ LOG.log(POILogger.WARN, "Unable to read Quill Contents PLC Bit record. Ignoring this record.");
bits[i] = new UnknownQCBit(thingType, bitType, bitData);
}
} else {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java Sun Jan 17 17:31:22 2021
@@ -44,7 +44,7 @@ import org.apache.poi.util.HexDump;
* @author Nick Burch
*/
public final class SlideShowRecordDumper {
- final static String tabs = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+ static final String tabs = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
private boolean optVerbose;
private boolean optEscher;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java Sun Jan 17 17:31:22 2021
@@ -34,7 +34,7 @@ import org.apache.poi.util.POILogger;
* (but related) properties
*/
public abstract class BitMaskTextProp extends TextProp {
- protected static final POILogger logger = POILogFactory.getLogger(BitMaskTextProp.class);
+ protected static final POILogger LOG = POILogFactory.getLogger(BitMaskTextProp.class);
private String[] subPropNames;
private int[] subPropMasks;
@@ -148,8 +148,8 @@ public abstract class BitMaskTextProp ex
setWriteMask(writeMask);
super.setValue(maskValue(val));
if (val != super.getValue()) {
- logger.log(POILogger.WARN, "Style properties of '", getName(), "' don't match mask - output will be sanitized");
- if (logger.check(POILogger.DEBUG)) {
+ LOG.log(POILogger.WARN, "Style properties of '", getName(), "' don't match mask - output will be sanitized");
+ if (LOG.check(POILogger.DEBUG)) {
StringBuilder sb = new StringBuilder("The following style attributes of the '")
.append(getName()).append("' property will be ignored:\n");
int i=0;
@@ -159,7 +159,7 @@ public abstract class BitMaskTextProp ex
}
i++;
}
- logger.log(POILogger.DEBUG, sb.toString());
+ LOG.log(POILogger.DEBUG, sb.toString());
}
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java Sun Jan 17 17:31:22 2021
@@ -41,8 +41,8 @@ import org.apache.poi.util.LittleEndian;
*/
public class TextPFException9 implements GenericRecord {
- private final static AutoNumberingScheme DEFAULT_AUTONUMBER_SCHEME = AutoNumberingScheme.arabicPeriod;
- private final static Short DEFAULT_START_NUMBER = 1;
+ private static final AutoNumberingScheme DEFAULT_AUTONUMBER_SCHEME = AutoNumberingScheme.arabicPeriod;
+ private static final Short DEFAULT_START_NUMBER = 1;
//private final byte mask1;
//private final byte mask2;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java Sun Jan 17 17:31:22 2021
@@ -58,7 +58,7 @@ public final class AnimationInfo extends
if(_children[0] instanceof AnimationInfoAtom) {
animationAtom = (AnimationInfoAtom)_children[0];
} else {
- logger.log(POILogger.ERROR, "First child record wasn't a AnimationInfoAtom, was of type ", _children[0].getRecordType());
+ LOG.log(POILogger.ERROR, "First child record wasn't a AnimationInfoAtom, was of type ", _children[0].getRecordType());
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java Sun Jan 17 17:31:22 2021
@@ -129,7 +129,7 @@ public final class Comment2000 extends R
} else if (r instanceof Comment2000Atom){
commentAtom = (Comment2000Atom)r;
} else {
- logger.log(POILogger.WARN, "Unexpected record with type=", r.getRecordType(), " in Comment2000: ", r.getClass().getName());
+ LOG.log(POILogger.WARN, "Unexpected record with type=", r.getRecordType(), " in Comment2000: ", r.getClass().getName());
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java Sun Jan 17 17:31:22 2021
@@ -46,7 +46,7 @@ import org.apache.poi.util.StringUtil;
*/
public class CurrentUserAtom
{
- private final static POILogger logger = POILogFactory.getLogger(CurrentUserAtom.class);
+ private static final POILogger LOG = POILogFactory.getLogger(CurrentUserAtom.class);
//arbitrarily selected; may need to increase
private static final int MAX_RECORD_LENGTH = 1_000_000;
@@ -177,7 +177,7 @@ public class CurrentUserAtom
long usernameLen = LittleEndian.getUShort(_contents,20);
if(usernameLen > 512) {
// Handle the case of it being garbage
- logger.log(POILogger.WARN, "Warning - invalid username length ", usernameLen, " found, treating as if there was no username set");
+ LOG.log(POILogger.WARN, "Warning - invalid username length ", usernameLen, " found, treating as if there was no username set");
usernameLen = 0;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java Sun Jan 17 17:31:22 2021
@@ -161,10 +161,10 @@ public final class Document extends Posi
// (normally it's 2, or 3 if you have notes)
// Complain if it's not
if(slwtcount == 0) {
- logger.log(POILogger.WARN, "No SlideListWithText's found - there should normally be at least one!");
+ LOG.log(POILogger.WARN, "No SlideListWithText's found - there should normally be at least one!");
}
if(slwtcount > 3) {
- logger.log(POILogger.WARN, "Found ", slwtcount, " SlideListWithTexts - normally there should only be three!");
+ LOG.log(POILogger.WARN, "Found ", slwtcount, " SlideListWithTexts - normally there should only be three!");
}
// Now grab all the SLWTs
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java Sun Jan 17 17:31:22 2021
@@ -105,14 +105,14 @@ public class ExEmbed extends RecordConta
if(_children[0] instanceof ExEmbedAtom) {
embedAtom = (ExEmbedAtom)_children[0];
} else {
- logger.log(POILogger.ERROR, "First child record wasn't a ExEmbedAtom, was of type ", _children[0].getRecordType());
+ LOG.log(POILogger.ERROR, "First child record wasn't a ExEmbedAtom, was of type ", _children[0].getRecordType());
}
// Second child should be the ExOleObjAtom
if (_children[1] instanceof ExOleObjAtom) {
oleObjAtom = (ExOleObjAtom)_children[1];
} else {
- logger.log(POILogger.ERROR, "Second child record wasn't a ExOleObjAtom, was of type ", _children[1].getRecordType());
+ LOG.log(POILogger.ERROR, "Second child record wasn't a ExOleObjAtom, was of type ", _children[1].getRecordType());
}
for (int i = 2; i < _children.length; i++) {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java Sun Jan 17 17:31:22 2021
@@ -118,7 +118,7 @@ public class ExHyperlink extends RecordC
if(_children[0] instanceof ExHyperlinkAtom) {
linkAtom = (ExHyperlinkAtom)_children[0];
} else {
- logger.log(POILogger.ERROR, "First child record wasn't a ExHyperlinkAtom, was of type ", _children[0].getRecordType());
+ LOG.log(POILogger.ERROR, "First child record wasn't a ExHyperlinkAtom, was of type ", _children[0].getRecordType());
}
for (int i = 1; i < _children.length; i++) {
@@ -126,7 +126,7 @@ public class ExHyperlink extends RecordC
if ( linkDetailsA == null) linkDetailsA = (CString)_children[i];
else linkDetailsB = (CString)_children[i];
} else {
- logger.log(POILogger.ERROR, "Record after ExHyperlinkAtom wasn't a CString, was of type ", _children[1].getRecordType());
+ LOG.log(POILogger.ERROR, "Record after ExHyperlinkAtom wasn't a CString, was of type ", _children[1].getRecordType());
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java Sun Jan 17 17:31:22 2021
@@ -72,7 +72,7 @@ public class ExMCIMovie extends RecordCo
if (_children[0] instanceof ExVideoContainer) {
exVideo = (ExVideoContainer) _children[0];
} else {
- logger.log(POILogger.ERROR, "First child record wasn't a ExVideoContainer, was of type ", _children[0].getRecordType());
+ LOG.log(POILogger.ERROR, "First child record wasn't a ExVideoContainer, was of type ", _children[0].getRecordType());
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java Sun Jan 17 17:31:22 2021
@@ -60,12 +60,12 @@ public final class ExVideoContainer exte
if(_children[0] instanceof ExMediaAtom) {
mediaAtom = (ExMediaAtom)_children[0];
} else {
- logger.log(POILogger.ERROR, "First child record wasn't a ExMediaAtom, was of type ", _children[0].getRecordType());
+ LOG.log(POILogger.ERROR, "First child record wasn't a ExMediaAtom, was of type ", _children[0].getRecordType());
}
if(_children[1] instanceof CString) {
pathAtom = (CString)_children[1];
} else {
- logger.log(POILogger.ERROR, "Second child record wasn't a CString, was of type ", _children[1].getRecordType());
+ LOG.log(POILogger.ERROR, "Second child record wasn't a CString, was of type ", _children[1].getRecordType());
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java Sun Jan 17 17:31:22 2021
@@ -62,7 +62,7 @@ public final class FontCollection extend
HSLFFontInfo fi = addFont(fontHeader);
fi.addFacet(fed);
} else {
- logger.log(POILogger.WARN, "Warning: FontCollection child wasn't a FontEntityAtom, was ", r.getClass().getSimpleName());
+ LOG.log(POILogger.WARN, "Warning: FontCollection child wasn't a FontEntityAtom, was ", r.getClass().getSimpleName());
}
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java Sun Jan 17 17:31:22 2021
@@ -89,11 +89,11 @@ public final class HeadersFootersContain
csFooter = cs;
break;
default:
- logger.log(POILogger.WARN, "Unexpected CString.Options in HeadersFootersContainer: ", opts);
+ LOG.log(POILogger.WARN, "Unexpected CString.Options in HeadersFootersContainer: ", opts);
break;
}
} else {
- logger.log(POILogger.WARN, "Unexpected record in HeadersFootersContainer: ", child);
+ LOG.log(POILogger.WARN, "Unexpected record in HeadersFootersContainer: ", child);
}
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java Sun Jan 17 17:31:22 2021
@@ -61,7 +61,7 @@ public class InteractiveInfo extends Rec
private void findInterestingChildren() {
// First child should be the InteractiveInfoAtom
if (_children == null || _children.length == 0 || !(_children[0] instanceof InteractiveInfoAtom)) {
- logger.log(POILogger.WARN, "First child record wasn't a InteractiveInfoAtom - leaving this atom in an invalid state...");
+ LOG.log(POILogger.WARN, "First child record wasn't a InteractiveInfoAtom - leaving this atom in an invalid state...");
return;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java Sun Jan 17 17:31:22 2021
@@ -85,7 +85,7 @@ public final class MasterTextPropAtom ex
try {
read();
} catch (Exception e){
- logger.log(POILogger.ERROR, "Failed to parse MasterTextPropAtom", e);
+ LOG.log(POILogger.ERROR, "Failed to parse MasterTextPropAtom", e);
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java Sun Jan 17 17:31:22 2021
@@ -201,7 +201,7 @@ public final class PPDrawing extends Rec
// Wind on
int size = r.getRecordSize();
if(size < 8) {
- logger.log(POILogger.WARN, "Hit short DDF record at ", startPos, " - ", size);
+ LOG.log(POILogger.WARN, "Hit short DDF record at ", startPos, " - ", size);
}
/*
@@ -211,7 +211,7 @@ public final class PPDrawing extends Rec
* Sometimes it is not so, see an example in bug #44770. Most likely reason is that one of ddf records calculates wrong size.
*/
if(size != escherBytes){
- logger.log(POILogger.WARN, "Record length=", escherBytes, " but getRecordSize() returned ", r.getRecordSize(), "; record: ", r.getClass());
+ LOG.log(POILogger.WARN, "Record length=", escherBytes, " but getRecordSize() returned ", r.getRecordSize(), "; record: ", r.getClass());
size = escherBytes;
}
startPos += size;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java Sun Jan 17 17:31:22 2021
@@ -176,8 +176,8 @@ public final class PersistPtrHolder exte
if (newPos == null) {
Integer id = me.getKey();
- logger.log(POILogger.WARN, "Couldn't find the new location of the \"slide\" with id " + id + " that used to be at " + oldPos);
- logger.log(POILogger.WARN, "Not updating the position of it, you probably won't be able to find it any more (if you ever could!)");
+ LOG.log(POILogger.WARN, "Couldn't find the new location of the \"slide\" with id " + id + " that used to be at " + oldPos);
+ LOG.log(POILogger.WARN, "Not updating the position of it, you probably won't be able to find it any more (if you ever could!)");
} else {
me.setValue(newPos);
}
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=1885613&r1=1885612&r2=1885613&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 Sun Jan 17 17:31:22 2021
@@ -42,7 +42,7 @@ import org.apache.poi.util.POILogger;
public abstract class Record implements GenericRecord
{
// For logging
- protected static final POILogger logger = POILogFactory.getLogger(Record.class);
+ protected static final POILogger LOG = POILogFactory.getLogger(Record.class);
/**
* Is this record type an Atom record (only has data),
@@ -183,7 +183,7 @@ public abstract class Record implements
// Handle case of a corrupt last record, whose claimed length
// would take us passed the end of the file
if(start + len > b.length ) {
- logger.log(POILogger.WARN, "Warning: Skipping record of type " + type + " at position " + start + " which claims to be longer than the file! (" + len + " vs " + (b.length-start) + ")");
+ LOG.log(POILogger.WARN, "Warning: Skipping record of type " + type + " at position " + start + " which claims to be longer than the file! (" + len + " vs " + (b.length-start) + ")");
return null;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java Sun Jan 17 17:31:22 2021
@@ -68,14 +68,14 @@ public final class Sound extends RecordC
if(_children[0] instanceof CString) {
_name = (CString)_children[0];
} else {
- logger.log(POILogger.ERROR, "First child record wasn't a CString, was of type ", _children[0].getRecordType());
+ LOG.log(POILogger.ERROR, "First child record wasn't a CString, was of type ", _children[0].getRecordType());
}
// Second child should be the ExOleObjAtom
if (_children[1] instanceof CString) {
_type = (CString)_children[1];
} else {
- logger.log(POILogger.ERROR, "Second child record wasn't a CString, was of type ", _children[1].getRecordType());
+ LOG.log(POILogger.ERROR, "Second child record wasn't a CString, was of type ", _children[1].getRecordType());
}
for (int i = 2; i < _children.length; i++) {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java Sun Jan 17 17:31:22 2021
@@ -251,7 +251,7 @@ public final class StyleTextPropAtom ext
}
if (rawContents.length > 0 && textHandled != (size+1)){
- logger.log(POILogger.WARN, "Problem reading paragraph style runs: textHandled = ", textHandled, ", text.size+1 = ", (size+1));
+ LOG.log(POILogger.WARN, "Problem reading paragraph style runs: textHandled = ", textHandled, ", text.size+1 = ", (size+1));
}
// Now do the character stylings
@@ -283,7 +283,7 @@ public final class StyleTextPropAtom ext
}
}
if (rawContents.length > 0 && textHandled != (size+1)){
- logger.log(POILogger.WARN, "Problem reading character style runs: textHandled = ", textHandled, ", text.size+1 = ", (size+1));
+ LOG.log(POILogger.WARN, "Problem reading character style runs: textHandled = ", textHandled, ", text.size+1 = ", (size+1));
}
// Handle anything left over
@@ -296,7 +296,7 @@ public final class StyleTextPropAtom ext
private int checkTextLength(int readLength, int handledSoFar, int overallSize) {
if (readLength + handledSoFar > overallSize + 1) {
- logger.log(POILogger.WARN, "Style length of ", readLength, " at ", handledSoFar,
+ LOG.log(POILogger.WARN, "Style length of ", readLength, " at ", handledSoFar,
" larger than stated size of ", overallSize, ", truncating");
return overallSize + 1 - handledSoFar;
}
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=1885613&r1=1885612&r2=1885613&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 Sun Jan 17 17:31:22 2021
@@ -98,7 +98,7 @@ public final class TextRulerAtom extends
// Get the record data.
read(leis);
} catch (IOException e){
- logger.log(POILogger.ERROR, "Failed to parse TextRulerAtom: ", e.getMessage());
+ LOG.log(POILogger.ERROR, "Failed to parse TextRulerAtom: ", e.getMessage());
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java Sun Jan 17 17:31:22 2021
@@ -36,14 +36,14 @@ import org.apache.poi.util.POILogger;
*/
public final class HSLFNotes extends HSLFSheet implements Notes<HSLFShape,HSLFTextParagraph> {
- protected static final POILogger logger = POILogFactory.getLogger(HSLFNotes.class);
-
- private List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<>();
+ private static final POILogger LOG = POILogFactory.getLogger(HSLFNotes.class);
+
+ private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<>();
/**
* Constructs a Notes Sheet from the given Notes record.
* Initialises TextRuns, to provide easier access to the text
- *
+ *
* @param notes the Notes record to read from
*/
public HSLFNotes(org.apache.poi.hslf.record.Notes notes) {
@@ -55,9 +55,9 @@ public final class HSLFNotes extends HSL
for (List<HSLFTextParagraph> l : HSLFTextParagraph.findTextParagraphs(getPPDrawing(), this)) {
if (!_paragraphs.contains(l)) _paragraphs.add(l);
}
-
+
if (_paragraphs.isEmpty()) {
- logger.log(POILogger.WARN, "No text records found for notes sheet");
+ LOG.log(POILogger.WARN, "No text records found for notes sheet");
}
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java Sun Jan 17 17:31:22 2021
@@ -45,12 +45,10 @@ import org.apache.poi.util.POILogger;
/**
* Create a <code>Shape</code> object depending on its type
- *
- * @author Yegor Kozlov
*/
public final class HSLFShapeFactory {
// For logging
- protected static final POILogger logger = POILogFactory.getLogger(HSLFShapeFactory.class);
+ private static final POILogger LOG = POILogFactory.getLogger(HSLFShapeFactory.class);
/**
* Create a new shape from the data provided.
@@ -79,15 +77,15 @@ public final class HSLFShapeFactory {
}
}
}
-
+
HSLFGroupShape group;
if (isTable) {
group = new HSLFTable(spContainer, parent);
-
+
} else {
group = new HSLFGroupShape(spContainer, parent);
}
-
+
return group;
}
@@ -114,7 +112,7 @@ public final class HSLFShapeFactory {
if (parent instanceof HSLFTable) {
EscherTextboxRecord etr = spContainer.getChildById(EscherTextboxRecord.RECORD_ID);
if (etr == null) {
- logger.log(POILogger.WARN, "invalid ppt - add EscherTextboxRecord to cell");
+ LOG.log(POILogger.WARN, "invalid ppt - add EscherTextboxRecord to cell");
etr = new EscherTextboxRecord();
etr.setRecordId(EscherTextboxRecord.RECORD_ID);
etr.setOptions((short)15);
@@ -141,24 +139,24 @@ public final class HSLFShapeFactory {
break;
}
}
-
+
ExObjRefAtom oes = getClientDataRecord(spContainer, RecordTypes.ExObjRefAtom.typeID);
return (oes != null)
? new HSLFObjectShape(spContainer, parent)
: new HSLFPictureShape(spContainer, parent);
}
-
+
private static HSLFShape createNonPrimitive(EscherContainerRecord spContainer, ShapeContainer<HSLFShape,HSLFTextParagraph> parent) {
AbstractEscherOptRecord opt = HSLFShape.getEscherChild(spContainer, EscherOptRecord.RECORD_ID);
EscherProperty prop = HSLFShape.getEscherProperty(opt, EscherPropertyTypes.GEOMETRY__VERTICES);
if(prop != null) {
return new HSLFFreeformShape(spContainer, parent);
}
-
- logger.log(POILogger.INFO, "Creating AutoShape for a NotPrimitive shape");
+
+ LOG.log(POILogger.INFO, "Creating AutoShape for a NotPrimitive shape");
return new HSLFAutoShape(spContainer, parent);
}
-
+
@SuppressWarnings("unchecked")
protected static <T extends Record> T getClientDataRecord(EscherContainerRecord spContainer, int recordType) {
HSLFEscherClientDataRecord cldata = spContainer.getChildById(EscherClientDataRecord.RECORD_ID);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java Sun Jan 17 17:31:22 2021
@@ -60,7 +60,7 @@ import org.apache.poi.util.Units;
public abstract class HSLFSimpleShape extends HSLFShape implements SimpleShape<HSLFShape,HSLFTextParagraph> {
private static final POILogger LOG = POILogFactory.getLogger(HSLFSimpleShape.class);
- public final static double DEFAULT_LINE_WIDTH = 0.75;
+ public static final double DEFAULT_LINE_WIDTH = 0.75;
protected static final EscherPropertyTypes[] ADJUST_VALUES = {
EscherPropertyTypes.GEOMETRY__ADJUSTVALUE,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org