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 [1/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...

Author: kiwiwings
Date: Sun Jan 17 17:31:22 2021
New Revision: 1885613

URL: http://svn.apache.org/viewvc?rev=1885613&view=rev
Log:
Sonar fixes
constant name to match the regular expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'
reorder "final static" -> "static final"

Modified:
    poi/trunk/src/integrationtest/org/apache/poi/stress/TestAllFiles.java
    poi/trunk/src/java/org/apache/poi/POIDocument.java
    poi/trunk/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java
    poi/trunk/src/java/org/apache/poi/hpsf/CodePageString.java
    poi/trunk/src/java/org/apache/poi/hpsf/VariantBool.java
    poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java
    poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
    poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java
    poi/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
    poi/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java
    poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java
    poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/SSTDeserializer.java
    poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java
    poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
    poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtRst.java
    poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java
    poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
    poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java
    poi/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
    poi/trunk/src/java/org/apache/poi/poifs/property/PropertyTable.java
    poi/trunk/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
    poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
    poi/trunk/src/java/org/apache/poi/sl/draw/geom/PresetParser.java
    poi/trunk/src/java/org/apache/poi/ss/format/CellFormat.java
    poi/trunk/src/java/org/apache/poi/ss/format/CellFormatPart.java
    poi/trunk/src/java/org/apache/poi/ss/format/CellFormatter.java
    poi/trunk/src/java/org/apache/poi/ss/formula/FormulaParser.java
    poi/trunk/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
    poi/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java
    poi/trunk/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java
    poi/trunk/src/java/org/apache/poi/ss/formula/functions/Delta.java
    poi/trunk/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java
    poi/trunk/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java
    poi/trunk/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
    poi/trunk/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
    poi/trunk/src/java/org/apache/poi/ss/usermodel/FillPatternType.java
    poi/trunk/src/java/org/apache/poi/ss/usermodel/IndexedColors.java
    poi/trunk/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java
    poi/trunk/src/java/org/apache/poi/ss/util/DateFormatConverter.java
    poi/trunk/src/java/org/apache/poi/ss/util/ImageUtils.java
    poi/trunk/src/java/org/apache/poi/util/Configurator.java
    poi/trunk/src/java/org/apache/poi/util/IOUtils.java
    poi/trunk/src/java/org/apache/poi/util/XMLHelper.java
    poi/trunk/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java
    poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
    poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
    poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/CompoundLine.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/LineCap.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndLength.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndType.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndWidth.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/PathShadeType.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/PenAlignment.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetColor.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetGeometry.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetLineDash.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetPattern.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/SchemeColor.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/SystemColor.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/TileFlipMode.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/Grouping.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/Shape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/text/AnchorType.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/text/CapsType.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/text/StrikeType.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java
    poi/trunk/src/ooxml/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
    poi/trunk/src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Document.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
    poi/trunk/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
    poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java

Modified: poi/trunk/src/integrationtest/org/apache/poi/stress/TestAllFiles.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/TestAllFiles.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/integrationtest/org/apache/poi/stress/TestAllFiles.java (original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/TestAllFiles.java Sun Jan 17 17:31:22 2021
@@ -93,7 +93,6 @@ public class TestAllFiles {
 
         final List<Arguments> result = new ArrayList<>(100);
         for (String file : scanner.getIncludedFiles()) {
-            // if (!file.contains("44958.xls")) continue;
             for (FileHandlerKnown handler : sm.getHandler(file)) {
                 ExcInfo info1 = sm.getExcInfo(file, testName, handler);
                 if (info1 == null || info1.isValid(testName, handler.name())) {

Modified: poi/trunk/src/java/org/apache/poi/POIDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/POIDocument.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/POIDocument.java (original)
+++ poi/trunk/src/java/org/apache/poi/POIDocument.java Sun Jan 17 17:31:22 2021
@@ -60,7 +60,7 @@ public abstract class POIDocument implem
     private DirectoryNode directory;
 
     /** For our own logging use */
-    private static final POILogger logger = POILogFactory.getLogger(POIDocument.class);
+    private static final POILogger LOG = POILogFactory.getLogger(POIDocument.class);
 
     /* Have the property streams been read yet? (Only done on-demand) */
     private boolean initialized;
@@ -162,12 +162,12 @@ public abstract class POIDocument implem
             if (clazz.isInstance(ps)) {
                 return (T)ps;
             } else if (ps != null) {
-                logger.log(POILogger.WARN, localName+" property set came back with wrong class - "+ps.getClass().getName());
+                LOG.log(POILogger.WARN, localName+" property set came back with wrong class - "+ps.getClass().getName());
             } else {
-                logger.log(POILogger.WARN, localName+" property set came back as null");
+                LOG.log(POILogger.WARN, localName+" property set came back as null");
             }
         } catch (IOException e) {
-            logger.log(POILogger.ERROR, "can't retrieve property set", e);
+            LOG.log(POILogger.ERROR, "can't retrieve property set", e);
         }
         return null;
     }
@@ -333,9 +333,9 @@ public abstract class POIDocument implem
             // Create or Update the Property Set stream in the POIFS
             outFS.createOrUpdateDocument(bIn, name);
 
-            logger.log(POILogger.INFO, "Wrote property set ", name, " of size ", data.length);
+            LOG.log(POILogger.INFO, "Wrote property set ", name, " of size ", data.length);
         } catch(WritingNotSupportedException ignored) {
-            logger.log( POILogger.ERROR, "Couldn't write property set with name ", name, " as not supported by HPSF yet");
+            LOG.log( POILogger.ERROR, "Couldn't write property set with name ", name, " as not supported by HPSF yet");
         }
     }
 

Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java Sun Jan 17 17:31:22 2021
@@ -26,12 +26,12 @@ package org.apache.poi.ddf;
 public class EscherPropertyMetaData
 {
     // Escher property types.
-    public final static byte TYPE_UNKNOWN = (byte) 0;
-    public final static byte TYPE_BOOLEAN = (byte) 1;
-    public final static byte TYPE_RGB = (byte) 2;
-    public final static byte TYPE_SHAPEPATH = (byte) 3;
-    public final static byte TYPE_SIMPLE = (byte)4;
-    public final static byte TYPE_ARRAY = (byte)5;
+    public static final byte TYPE_UNKNOWN = (byte) 0;
+    public static final byte TYPE_BOOLEAN = (byte) 1;
+    public static final byte TYPE_RGB = (byte) 2;
+    public static final byte TYPE_SHAPEPATH = (byte) 3;
+    public static final byte TYPE_SIMPLE = (byte)4;
+    public static final byte TYPE_ARRAY = (byte)5;
 
     private String description;
     private byte type;

Modified: poi/trunk/src/java/org/apache/poi/hpsf/CodePageString.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/CodePageString.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/CodePageString.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/CodePageString.java Sun Jan 17 17:31:22 2021
@@ -34,7 +34,7 @@ public class CodePageString {
     //arbitrarily selected; may need to increase
     private static final int MAX_RECORD_LENGTH = 100_000;
 
-    private final static POILogger LOG = POILogFactory.getLogger( CodePageString.class );
+    private static final POILogger LOG = POILogFactory.getLogger( CodePageString.class );
 
     private byte[] _value;
 

Modified: poi/trunk/src/java/org/apache/poi/hpsf/VariantBool.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/VariantBool.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/VariantBool.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/VariantBool.java Sun Jan 17 17:31:22 2021
@@ -23,7 +23,7 @@ import org.apache.poi.util.POILogger;
 
 @Internal
 public class VariantBool {
-    private final static POILogger LOG = POILogFactory.getLogger( VariantBool.class );
+    private static final POILogger LOG = POILogFactory.getLogger( VariantBool.class );
 
     static final int SIZE = 2;
 

Modified: poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java Sun Jan 17 17:31:22 2021
@@ -58,7 +58,7 @@ public class VariantSupport extends Vari
             Variant.VT_CF, Variant.VT_BOOL };
 
 
-    private static final POILogger logger = POILogFactory.getLogger(VariantSupport.class);
+    private static final POILogger LOG = POILogFactory.getLogger(VariantSupport.class);
     //arbitrarily selected; may need to increase
     private static final int MAX_RECORD_LENGTH = 100_000;
 
@@ -114,7 +114,7 @@ public class VariantSupport extends Vari
             Long vt = Long.valueOf(ex.getVariantType());
             if (!unsupportedMessage.contains(vt))
             {
-            	logger.log( POILogger.ERROR, ex.getMessage());
+            	LOG.log( POILogger.ERROR, ex.getMessage());
                 unsupportedMessage.add(vt);
             }
         }

Modified: poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/dev/BiffViewer.java Sun Jan 17 17:31:22 2021
@@ -57,7 +57,7 @@ import org.apache.poi.util.SuppressForbi
  */
 public final class BiffViewer {
     private static final char[] NEW_LINE_CHARS = System.getProperty("line.separator").toCharArray();
-    private static final POILogger logger = POILogFactory.getLogger(BiffViewer.class);
+    private static final POILogger LOG = POILogFactory.getLogger(BiffViewer.class);
 
     private BiffViewer() {
         // no instances of this class
@@ -81,7 +81,7 @@ public final class BiffViewer {
             try {
                 hasNext = recStream.hasNextRecord();
             } catch (LeftoverDataException e) {
-                logger.log(POILogger.ERROR, "Discarding ", recStream.remaining(), " bytes and continuing", e);
+                LOG.log(POILogger.ERROR, "Discarding ", recStream.remaining(), " bytes and continuing", e);
                 recStream.readRemainder();
                 hasNext = recStream.hasNextRecord();
             }

Modified: poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java Sun Jan 17 17:31:22 2021
@@ -28,7 +28,6 @@ import org.apache.poi.hssf.record.Extend
 import org.apache.poi.hssf.record.FormatRecord;
 import org.apache.poi.hssf.record.FormulaRecord;
 import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.hssf.record.Record;
 import org.apache.poi.hssf.usermodel.HSSFDataFormat;
 import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
 import org.apache.poi.util.LocaleUtil;
@@ -41,7 +40,7 @@ import org.apache.poi.util.POILogger;
  * ids.
  */
 public class FormatTrackingHSSFListener implements HSSFListener {
-	private final static POILogger logger = POILogFactory.getLogger(FormatTrackingHSSFListener.class);
+	private static final POILogger LOG = POILogFactory.getLogger(FormatTrackingHSSFListener.class);
 	private final HSSFListener _childListener;
 	private final HSSFDataFormatter _formatter;
 	private final NumberFormat _defaultFormat;
@@ -51,7 +50,7 @@ public class FormatTrackingHSSFListener
 	/**
 	 * Creates a format tracking wrapper around the given listener, using
 	 * the {@link Locale#getDefault() default locale} for the formats.
-	 * 
+	 *
 	 * @param childListener the listener to be wrapped
 	 */
 	public FormatTrackingHSSFListener(HSSFListener childListener) {
@@ -61,7 +60,7 @@ public class FormatTrackingHSSFListener
 	/**
 	 * Creates a format tracking wrapper around the given listener, using
 	 * the given locale for the formats.
-     * 
+     *
      * @param childListener the listener to be wrapped
      * @param locale the locale for the formats
 	 */
@@ -116,9 +115,9 @@ public class FormatTrackingHSSFListener
 	 *
 	 * TODO - move this to a central class in such a way that hssf.usermodel can
 	 * make use of it too
-	 * 
+	 *
 	 * @param cell the cell
-	 * 
+	 *
 	 * @return the given numeric of date cells contents as a String
 	 */
 	public String formatNumberDateCell(CellValueRecordInterface cell) {
@@ -145,9 +144,9 @@ public class FormatTrackingHSSFListener
 
 	/**
 	 * Returns the format string, eg $##.##, for the given number format index.
-	 * 
+	 *
 	 * @param formatIndex the format index
-	 * 
+	 *
 	 * @return the format string
 	 */
 	public String getFormatString(int formatIndex) {
@@ -155,7 +154,7 @@ public class FormatTrackingHSSFListener
 		if (formatIndex >= HSSFDataFormat.getNumberOfBuiltinBuiltinFormats()) {
 			FormatRecord tfr = _customFormatRecords.get(Integer.valueOf(formatIndex));
 			if (tfr == null) {
-				logger.log( POILogger.ERROR, "Requested format at index ", formatIndex,
+				LOG.log( POILogger.ERROR, "Requested format at index ", formatIndex,
 						", but it wasn't found");
 			} else {
 				format = tfr.getFormatString();
@@ -168,9 +167,9 @@ public class FormatTrackingHSSFListener
 
 	/**
 	 * Returns the format string, eg $##.##, used by your cell
-	 * 
+	 *
 	 * @param cell the cell
-	 * 
+	 *
 	 * @return the format string
 	 */
 	public String getFormatString(CellValueRecordInterface cell) {
@@ -184,15 +183,15 @@ public class FormatTrackingHSSFListener
 
 	/**
 	 * Returns the index of the format string, used by your cell, or -1 if none found
-	 * 
+	 *
 	 * @param cell the cell
-	 * 
+	 *
 	 * @return the index of the format string
 	 */
 	public int getFormatIndex(CellValueRecordInterface cell) {
 		ExtendedFormatRecord xfr = _xfRecords.get(cell.getXFIndex());
 		if (xfr == null) {
-			logger.log( POILogger.ERROR, "Cell ", cell.getRow(), ",", cell.getColumn(),
+			LOG.log( POILogger.ERROR, "Cell ", cell.getRow(), ",", cell.getColumn(),
 					" uses XF with index ", cell.getXFIndex(), ", but we don't have that");
 			return -1;
 		}

Modified: poi/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java Sun Jan 17 17:31:22 2021
@@ -61,7 +61,7 @@ import org.apache.poi.util.IOUtils;
  */
 public class OldExcelExtractor implements POITextExtractor {
 
-    private final static int FILE_PASS_RECORD_SID = 0x2f;
+    private static final int FILE_PASS_RECORD_SID = 0x2f;
     //arbitrarily selected; may need to increase
     private static final int MAX_RECORD_LENGTH = 100_000;
 

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/ArrayRecord.java Sun Jan 17 17:31:22 2021
@@ -33,7 +33,7 @@ import org.apache.poi.util.LittleEndianO
  */
 public final class ArrayRecord extends SharedValueRecordBase {
 
-	public final static short sid = 0x0221;
+	public static final short sid = 0x0221;
 	private static final int OPT_ALWAYS_RECALCULATE = 0x0001;
 	private static final int OPT_CALCULATE_ON_OPEN  = 0x0002;
 

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CFRule12Record.java Sun Jan 17 17:31:22 2021
@@ -285,7 +285,7 @@ public final class CFRule12Record extend
             template_params = IOUtils.safelyAllocate(template_param_length, MAX_RECORD_LENGTH);
             in.readFully(template_params);
         } else {
-            logger.log(POILogger.WARN, "CF Rule v12 template params length should be 0 or 16, found " + template_param_length);
+            LOG.log(POILogger.WARN, "CF Rule v12 template params length should be 0 or 16, found " + template_param_length);
             in.readRemainder();
         }
 

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleBase.java Sun Jan 17 17:31:22 2021
@@ -95,7 +95,7 @@ public abstract class CFRuleBase extends
     public static final int TEMPLATE_ABOVE_OR_EQUAL_TO_AVERAGE = 0x001D;
     public static final int TEMPLATE_BELOW_OR_EQUAL_TO_AVERAGE = 0x001E;
 
-    protected static final POILogger logger = POILogFactory.getLogger(CFRuleBase.class);
+    protected static final POILogger LOG = POILogFactory.getLogger(CFRuleBase.class);
 
     static final BitField modificationBits = bf(0x003FFFFF); // Bits: font,align,bord,patt,prot
     static final BitField alignHor         = bf(0x00000001); // 0 = Horizontal alignment modified

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/DimensionsRecord.java Sun Jan 17 17:31:22 2021
@@ -35,7 +35,7 @@ import org.apache.poi.util.POILogger;
 
 public final class DimensionsRecord extends StandardRecord {
 
-    private static final POILogger logger = POILogFactory.getLogger(DimensionsRecord.class);
+    private static final POILogger LOG = POILogFactory.getLogger(DimensionsRecord.class);
 
     public static final short sid = 0x200;
     private int               field_1_first_row;
@@ -63,7 +63,7 @@ public final class DimensionsRecord exte
         field_5_zero      = in.readShort();
         //POI-61045 -- in practice, there can be an extra 2 bytes
         if (in.available() == 2) {
-            logger.log(POILogger.INFO, "DimensionsRecord has extra 2 bytes.");
+            LOG.log(POILogger.INFO, "DimensionsRecord has extra 2 bytes.");
             in.readShort();
         }
     }

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java Sun Jan 17 17:31:22 2021
@@ -43,7 +43,7 @@ import org.apache.poi.util.StringUtil;
  * stored in a separate entry within the OLE2 compound file.
  */
 public final class EmbeddedObjectRefSubRecord extends SubRecord {
-	private static POILogger logger = POILogFactory.getLogger(EmbeddedObjectRefSubRecord.class);
+	private static final POILogger LOG = POILogFactory.getLogger(EmbeddedObjectRefSubRecord.class);
 	//arbitrarily selected; may need to increase
 	private static final int MAX_RECORD_LENGTH = 100_000;
 
@@ -157,7 +157,7 @@ public final class EmbeddedObjectRefSubR
 		int nUnexpectedPadding = remaining - dataLenAfterFormula;
 
 		if (nUnexpectedPadding > 0) {
-			logger.log( POILogger.ERROR, "Discarding ", nUnexpectedPadding, " unexpected padding bytes");
+			LOG.log( POILogger.ERROR, "Discarding ", nUnexpectedPadding, " unexpected padding bytes");
 			readRawData(in, nUnexpectedPadding);
 			remaining-=nUnexpectedPadding;
 		}

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java Sun Jan 17 17:31:22 2021
@@ -39,7 +39,7 @@ import org.apache.poi.util.POILogger;
  *  up with a {@link FeatHdrRecord}.
  */
 public final class FeatRecord extends StandardRecord {
-    private static final POILogger logger = POILogFactory.getLogger(FeatRecord.class);
+    private static final POILogger LOG = POILogFactory.getLogger(FeatRecord.class);
     public static final short sid = 0x0868;
     // SIDs from newer versions
     public static final short v11_sid = 0x0872;
@@ -108,7 +108,7 @@ public final class FeatRecord extends St
 			sharedFeature = new FeatSmartTag(in);
 			break;
 		default:
-			logger.log( POILogger.ERROR, "Unknown Shared Feature ", isf_sharedFeatureType, " found!");
+			LOG.log( POILogger.ERROR, "Unknown Shared Feature ", isf_sharedFeatureType, " found!");
 		}
 	}
 

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FormatRecord.java Sun Jan 17 17:31:22 2021
@@ -33,7 +33,7 @@ import org.apache.poi.util.StringUtil;
  */
 public final class FormatRecord extends StandardRecord {
 
-    private static final POILogger logger = POILogFactory.getLogger(FormatRecord.class);
+    private static final POILogger LOG = POILogFactory.getLogger(FormatRecord.class);
 
     public static final short sid = 0x041E;
 
@@ -149,7 +149,7 @@ public final class FormatRecord extends
         }
 
         if (ris.available() > 0) {
-            logger.log(POILogger.INFO, "FormatRecord has ", ris.available(), " unexplained bytes. Silently skipping");
+            LOG.log(POILogger.INFO, "FormatRecord has ", ris.available(), " unexplained bytes. Silently skipping");
             //swallow what's left
             while (ris.available() > 0) {
                 ris.readByte();

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java Sun Jan 17 17:31:22 2021
@@ -45,7 +45,7 @@ import org.apache.poi.util.StringUtil;
  */
 public final class HyperlinkRecord extends StandardRecord {
     public static final short sid = 0x01B8;
-    private static final POILogger logger = POILogFactory.getLogger(HyperlinkRecord.class);
+    private static final POILogger LOG = POILogFactory.getLogger(HyperlinkRecord.class);
     //arbitrarily selected; may need to increase
     private static final int MAX_RECORD_LENGTH = 100_000;
 
@@ -403,7 +403,7 @@ public final class HyperlinkRecord exten
         }
 
         if (in.remaining() > 0) {
-           logger.log(POILogger.WARN,
+           LOG.log(POILogger.WARN,
                  "Hyperlink data remains: " + in.remaining() +
                  " : " +HexDump.toHex(in.readRemainder())
            );

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/LabelRecord.java Sun Jan 17 17:31:22 2021
@@ -33,7 +33,7 @@ import org.apache.poi.util.RecordFormatE
  * @see org.apache.poi.hssf.record.LabelSSTRecord
  */
 public final class LabelRecord extends Record implements CellValueRecordInterface {
-    private static final POILogger logger = POILogFactory.getLogger(LabelRecord.class);
+    private static final POILogger LOG = POILogFactory.getLogger(LabelRecord.class);
 
     public static final short sid = 0x0204;
 
@@ -77,7 +77,7 @@ public final class LabelRecord extends R
         }
 
         if (in.remaining() > 0) {
-           logger.log(POILogger.INFO,
+           LOG.log(POILogger.INFO,
                    "LabelRecord data remains: ", in.remaining(),
                            " : ", HexDump.toHex(in.readRemainder())
            );

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/OldLabelRecord.java Sun Jan 17 17:31:22 2021
@@ -33,7 +33,7 @@ import org.apache.poi.util.RecordFormatE
  *  didn't use {@link LabelSSTRecord}
  */
 public final class OldLabelRecord extends OldCellRecord {
-    private static final POILogger logger = POILogFactory.getLogger(OldLabelRecord.class);
+    private static final POILogger LOG = POILogFactory.getLogger(OldLabelRecord.class);
     //arbitrarily set, may need to increase
     private static final int MAX_RECORD_LENGTH = 100_000;
 
@@ -62,7 +62,7 @@ public final class OldLabelRecord extend
         in.read(field_5_bytes, 0, field_4_string_len);
 
         if (in.remaining() > 0) {
-            logger.log(POILogger.INFO,
+            LOG.log(POILogger.INFO,
                     "LabelRecord data remains: ", in.remaining(),
                     " : ", HexDump.toHex(in.readRemainder())
                     );

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SSTDeserializer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SSTDeserializer.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/SSTDeserializer.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/SSTDeserializer.java Sun Jan 17 17:31:22 2021
@@ -15,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 
 package org.apache.poi.hssf.record;
 
@@ -32,7 +32,7 @@ import org.apache.poi.util.POILogger;
  */
 class SSTDeserializer
 {
-	private static POILogger logger = POILogFactory.getLogger(SSTDeserializer.class);
+	private static final POILogger LOG = POILogFactory.getLogger(SSTDeserializer.class);
     private IntMapper<UnicodeString> strings;
 
     public SSTDeserializer( IntMapper<UnicodeString> strings )
@@ -51,7 +51,7 @@ class SSTDeserializer
          // Extract exactly the count of strings from the SST record.
          UnicodeString str;
           if (in.available() == 0 && !in.hasNextRecord()) {
-              logger.log(POILogger.ERROR, "Ran out of data before creating all the strings! String at index ", i);
+              LOG.log(POILogger.ERROR, "Ran out of data before creating all the strings! String at index ", i);
               str = new UnicodeString("");
           } else {
               str = new UnicodeString(in);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/SupBookRecord.java Sun Jan 17 17:31:22 2021
@@ -32,7 +32,7 @@ import org.apache.poi.util.StringUtil;
  */
 public final class SupBookRecord extends StandardRecord {
 
-    private static final POILogger logger = POILogFactory.getLogger(SupBookRecord.class);
+    private static final POILogger LOG = POILogFactory.getLogger(SupBookRecord.class);
 
     public static final short sid = 0x01AE;
 
@@ -222,12 +222,12 @@ public final class SupBookRecord extends
         		break;
         	case CH_LONG_VOLUME:
         		//Don't known to handle...
-        		logger.log(POILogger.WARN, "Found unexpected key: ChLongVolume - IGNORING");
+        		LOG.log(POILogger.WARN, "Found unexpected key: ChLongVolume - IGNORING");
         		break;
         	case CH_STARTUP_DIR:
         	case CH_ALT_STARTUP_DIR:
         	case CH_LIB_DIR:
-        		logger.log(POILogger.WARN, "EXCEL.EXE path unkown - using this directoy instead: .");
+        		LOG.log(POILogger.WARN, "EXCEL.EXE path unkown - using this directoy instead: .");
         		sb.append(".").append(PATH_SEPERATOR);
         		break;
         	default:

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java Sun Jan 17 17:31:22 2021
@@ -52,7 +52,7 @@ import org.apache.poi.util.RecordFormatE
 public final class CFRecordsAggregate extends RecordAggregate implements GenericRecord {
     /** Excel 97-2003 allows up to 3 conditional formating rules */
     private static final int MAX_97_2003_CONDTIONAL_FORMAT_RULES = 3;
-    private static final POILogger logger = POILogFactory.getLogger(CFRecordsAggregate.class);
+    private static final POILogger LOG = POILogFactory.getLogger(CFRecordsAggregate.class);
 
     private final CFHeaderBase header;
 
@@ -72,7 +72,7 @@ public final class CFRecordsAggregate ex
             throw new IllegalArgumentException("rules must not be null");
         }
         if(pRules.length > MAX_97_2003_CONDTIONAL_FORMAT_RULES) {
-            logger.log(POILogger.WARN, "Excel versions before 2007 require that "
+            LOG.log(POILogger.WARN, "Excel versions before 2007 require that "
                     + "No more than " + MAX_97_2003_CONDTIONAL_FORMAT_RULES
                     + " rules may be specified, " + pRules.length + " were found,"
                     + " this file will cause problems with old Excel versions");
@@ -181,7 +181,7 @@ public final class CFRecordsAggregate ex
             throw new IllegalArgumentException("r must not be null");
         }
         if(rules.size() >= MAX_97_2003_CONDTIONAL_FORMAT_RULES) {
-            logger.log(POILogger.WARN, "Excel versions before 2007 cannot cope with"
+            LOG.log(POILogger.WARN, "Excel versions before 2007 cannot cope with"
                     + " any more than " + MAX_97_2003_CONDTIONAL_FORMAT_RULES
                     + " - this file will cause problems with old Excel versions");
         }

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtRst.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtRst.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtRst.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/common/ExtRst.java Sun Jan 17 17:31:22 2021
@@ -34,7 +34,7 @@ import org.apache.poi.util.StringUtil;
 
 @Internal
 public class ExtRst implements Comparable<ExtRst>, GenericRecord {
-    private static final POILogger _logger = POILogFactory.getLogger(ExtRst.class);
+    private static final POILogger LOG = POILogFactory.getLogger(ExtRst.class);
     //arbitrarily selected; may need to increase
     private static final int MAX_RECORD_LENGTH = 100_000;
 
@@ -78,7 +78,7 @@ public class ExtRst implements Comparabl
 
         // Spot corrupt records
         if(reserved != 1) {
-            _logger.log(POILogger.WARN, "Warning - ExtRst has wrong magic marker, expecting 1 but found ", reserved, " - ignoring");
+            LOG.log(POILogger.WARN, "Warning - ExtRst has wrong magic marker, expecting 1 but found ", reserved, " - ignoring");
             // Grab all the remaining data, and ignore it
             for(int i=0; i<expectedLength-2; i++) {
                 in.readByte();
@@ -121,7 +121,7 @@ public class ExtRst implements Comparabl
 
         int extraDataLength = runData - (numRuns*6);
         if(extraDataLength < 0) {
-            _logger.log( POILogger.WARN, "Warning - ExtRst overran by ",  (0-extraDataLength), " bytes");
+            LOG.log( POILogger.WARN, "Warning - ExtRst overran by ",  (0-extraDataLength), " bytes");
             extraDataLength = 0;
         }
         extraData = IOUtils.safelyAllocate(extraDataLength, MAX_RECORD_LENGTH);

Modified: poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/common/UnicodeString.java Sun Jan 17 17:31:22 2021
@@ -43,7 +43,7 @@ import org.apache.poi.util.POILogger;
  * This is often called a XLUnicodeRichExtendedString in MS documentation.<p>
  */
 public class UnicodeString implements Comparable<UnicodeString>, Duplicatable, GenericRecord {
-    private static final POILogger _logger = POILogFactory.getLogger(UnicodeString.class);
+    private static final POILogger LOG = POILogFactory.getLogger(UnicodeString.class);
 
     private static final BitField highByte  = BitFieldFactory.getInstance(0x1);
     // 0x2 is reserved
@@ -102,7 +102,7 @@ public class UnicodeString implements Co
         if (isExtendedText() && (extensionLength > 0)) {
           field_5_ext_rst = new ExtRst(new ContinuableRecordInput(in), extensionLength);
           if(field_5_ext_rst.getDataSize()+4 != extensionLength) {
-             _logger.log(POILogger.WARN, "ExtRst was supposed to be " + extensionLength + " bytes long, but seems to actually be " + (field_5_ext_rst.getDataSize() + 4));
+             LOG.log(POILogger.WARN, "ExtRst was supposed to be " + extensionLength + " bytes long, but seems to actually be " + (field_5_ext_rst.getDataSize() + 4));
           }
         }
     }

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java Sun Jan 17 17:31:22 2021
@@ -59,8 +59,9 @@ import java.text.AttributedCharacterIter
  * <code>HSSFClientAnchor.getAnchorHeightInPoints()</code>.
  * </blockquote>
  */
-public class EscherGraphics extends Graphics
-{
+public class EscherGraphics extends Graphics {
+    private static final POILogger LOG = POILogFactory.getLogger(EscherGraphics.class);
+
     private final HSSFShapeGroup escherGroup;
     private final HSSFWorkbook workbook;
     private float verticalPointsPerPixel = 1.0f;
@@ -68,7 +69,6 @@ public class EscherGraphics extends Grap
     private Color foreground;
     private Color background = Color.white;
     private Font font;
-    private static final POILogger logger = POILogFactory.getLogger(EscherGraphics.class);
 
     /**
      * Construct an escher graphics object.
@@ -135,14 +135,14 @@ public class EscherGraphics extends Grap
     @NotImplemented
     public void clipRect(int x, int y, int width, int height)
     {
-        logger.log(POILogger.WARN,"clipRect not supported");
+        LOG.log(POILogger.WARN,"clipRect not supported");
     }
 
     @Override
     @NotImplemented
     public void copyArea(int x, int y, int width, int height, int dx, int dy)
     {
-        logger.log(POILogger.WARN,"copyArea not supported");
+        LOG.log(POILogger.WARN,"copyArea not supported");
     }
 
     @Override
@@ -162,7 +162,7 @@ public class EscherGraphics extends Grap
     public void drawArc(int x, int y, int width, int height,
 				 int startAngle, int arcAngle)
     {
-        logger.log(POILogger.WARN,"drawArc not supported");
+        LOG.log(POILogger.WARN,"drawArc not supported");
     }
 
     @Override
@@ -173,7 +173,7 @@ public class EscherGraphics extends Grap
 				      Color bgcolor,
 				      ImageObserver observer)
     {
-        logger.log(POILogger.WARN,"drawImage not supported");
+        LOG.log(POILogger.WARN,"drawImage not supported");
 
         return true;
     }
@@ -185,7 +185,7 @@ public class EscherGraphics extends Grap
 				      int sx1, int sy1, int sx2, int sy2,
 				      ImageObserver observer)
     {
-        logger.log(POILogger.WARN,"drawImage not supported");
+        LOG.log(POILogger.WARN,"drawImage not supported");
         return true;
     }
 
@@ -266,14 +266,14 @@ public class EscherGraphics extends Grap
     public void drawPolyline(int[] xPoints, int[] yPoints,
                              int nPoints)
     {
-        logger.log(POILogger.WARN,"drawPolyline not supported");
+        LOG.log(POILogger.WARN,"drawPolyline not supported");
     }
 
     @Override
     @NotImplemented
     public void drawRect(int x, int y, int width, int height)
     {
-        logger.log(POILogger.WARN,"drawRect not supported");
+        LOG.log(POILogger.WARN,"drawRect not supported");
     }
 
     @Override
@@ -281,7 +281,7 @@ public class EscherGraphics extends Grap
     public void drawRoundRect(int x, int y, int width, int height,
 				       int arcWidth, int arcHeight)
     {
-        logger.log(POILogger.WARN,"drawRoundRect not supported");
+        LOG.log(POILogger.WARN,"drawRoundRect not supported");
     }
 
     @Override
@@ -349,16 +349,16 @@ public class EscherGraphics extends Grap
     public void drawString(AttributedCharacterIterator iterator,
                                     int x, int y)
     {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawString not supported");
+        if (LOG.check( POILogger.WARN ))
+            LOG.log(POILogger.WARN,"drawString not supported");
     }
 
     @Override
     public void fillArc(int x, int y, int width, int height,
 				 int startAngle, int arcAngle)
     {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"fillArc not supported");
+        if (LOG.check( POILogger.WARN ))
+            LOG.log(POILogger.WARN,"fillArc not supported");
     }
 
     @Override
@@ -442,8 +442,8 @@ public class EscherGraphics extends Grap
     public void fillRoundRect(int x, int y, int width, int height,
 				       int arcWidth, int arcHeight)
     {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"fillRoundRect not supported");
+        if (LOG.check( POILogger.WARN ))
+            LOG.log(POILogger.WARN,"fillRoundRect not supported");
     }
 
     @Override
@@ -488,7 +488,7 @@ public class EscherGraphics extends Grap
     @NotImplemented
     public void setClip(Shape shape)
     {
-        logger.log(POILogger.WARN,"setClip not supported");
+        LOG.log(POILogger.WARN,"setClip not supported");
     }
 
     @Override
@@ -507,21 +507,21 @@ public class EscherGraphics extends Grap
     @NotImplemented
     public void setPaintMode()
     {
-        logger.log(POILogger.WARN,"setPaintMode not supported");
+        LOG.log(POILogger.WARN,"setPaintMode not supported");
     }
 
     @Override
     @NotImplemented
     public void setXORMode(Color color)
     {
-        logger.log(POILogger.WARN,"setXORMode not supported");
+        LOG.log(POILogger.WARN,"setXORMode not supported");
     }
 
     @Override
     @NotImplemented
     public void translate(int x, int y)
     {
-        logger.log(POILogger.WARN,"translate not supported");
+        LOG.log(POILogger.WARN,"translate not supported");
     }
 
     public Color getBackground()

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java Sun Jan 17 17:31:22 2021
@@ -69,13 +69,14 @@ import java.util.Map;
  * </blockquote>
  */
 public final class EscherGraphics2d extends Graphics2D {
+    private static final POILogger LOG = POILogFactory.getLogger(EscherGraphics2d.class);
+
     private EscherGraphics _escherGraphics;
     private BufferedImage _img;
     private AffineTransform _trans;
     private Stroke _stroke;
     private Paint _paint;
     private Shape _deviceclip;
-    private POILogger logger = POILogFactory.getLogger(getClass());
 
     /**
      * Constructs one escher graphics object from an escher graphics object.
@@ -152,8 +153,8 @@ public final class EscherGraphics2d exte
         }
         else
         {
-            if (logger.check(POILogger.WARN))
-                logger.log(POILogger.WARN, "draw not fully supported");
+            if (LOG.check(POILogger.WARN))
+                LOG.log(POILogger.WARN, "draw not fully supported");
         }
     }
 
@@ -171,22 +172,22 @@ public final class EscherGraphics2d exte
     public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1,
             int sx2, int sy2, Color bgColor, ImageObserver imageobserver)
     {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawImage() not supported");
+        if (LOG.check( POILogger.WARN ))
+            LOG.log(POILogger.WARN,"drawImage() not supported");
         return true;
     }
 
     public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1,
             int sx2, int sy2, ImageObserver imageobserver)
     {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawImage() not supported");
+        if (LOG.check( POILogger.WARN ))
+            LOG.log(POILogger.WARN,"drawImage() not supported");
         return drawImage(image, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null, imageobserver);
     }
     public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, Color bgColor, ImageObserver imageobserver)
     {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"drawImage() not supported");
+        if (LOG.check( POILogger.WARN ))
+            LOG.log(POILogger.WARN,"drawImage() not supported");
         return true;
     }
 
@@ -310,8 +311,8 @@ public final class EscherGraphics2d exte
 
     public void fill(Shape shape)
     {
-        if (logger.check( POILogger.WARN ))
-            logger.log(POILogger.WARN,"fill(Shape) not supported");
+        if (LOG.check( POILogger.WARN ))
+            LOG.log(POILogger.WARN,"fill(Shape) not supported");
     }
 
     public void fillArc(int i, int j, int k, int l, int i1, int j1)

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java Sun Jan 17 17:31:22 2021
@@ -78,9 +78,9 @@ public class HSSFCell extends CellBase {
     public static final int LAST_COLUMN_NUMBER  = SpreadsheetVersion.EXCEL97.getLastColumnIndex(); // 2^8 - 1
     private static final String LAST_COLUMN_NAME  = SpreadsheetVersion.EXCEL97.getLastColumnName();
 
-    public final static short        ENCODING_UNCHANGED          = -1;
-    public final static short        ENCODING_COMPRESSED_UNICODE = 0;
-    public final static short        ENCODING_UTF_16             = 1;
+    public static final short        ENCODING_UNCHANGED          = -1;
+    public static final short        ENCODING_COMPRESSED_UNICODE = 0;
+    public static final short        ENCODING_UTF_16             = 1;
 
     private final HSSFWorkbook       _book;
     private final HSSFSheet          _sheet;

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java Sun Jan 17 17:31:22 2021
@@ -39,12 +39,12 @@ import org.apache.poi.ss.util.CellAddres
  */
 public class HSSFComment extends HSSFTextbox implements Comment {
 
-    private final static int FILL_TYPE_SOLID = 0;
-    private final static int FILL_TYPE_PICTURE = 3;
+    private static final int FILL_TYPE_SOLID = 0;
+    private static final int FILL_TYPE_PICTURE = 3;
 
-    private final static int GROUP_SHAPE_PROPERTY_DEFAULT_VALUE = 655362;
-    private final static int GROUP_SHAPE_HIDDEN_MASK = 0x1000002;
-    private final static int GROUP_SHAPE_NOT_HIDDEN_MASK = 0xFEFFFFFD;
+    private static final int GROUP_SHAPE_PROPERTY_DEFAULT_VALUE = 655362;
+    private static final int GROUP_SHAPE_HIDDEN_MASK = 0x1000002;
+    private static final int GROUP_SHAPE_NOT_HIDDEN_MASK = 0xFEFFFFFD;
 
     /*
       * TODO - make HSSFComment more consistent when created vs read from file.

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java Sun Jan 17 17:31:22 2021
@@ -36,17 +36,17 @@ public final class HSSFFont implements F
     /**
      * Normal boldness (not bold)
      */
-    final static short BOLDWEIGHT_NORMAL = 0x190;
+    static final short BOLDWEIGHT_NORMAL = 0x190;
 
     /**
      * Bold boldness (bold)
      */
-    final static short BOLDWEIGHT_BOLD = 0x2bc;
+    static final short BOLDWEIGHT_BOLD = 0x2bc;
 
     /**
      * Arial font
      */
-    public final static String FONT_ARIAL = "Arial";
+    public static final String FONT_ARIAL = "Arial";
 
 
     private FontRecord font;

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java Sun Jan 17 17:31:22 2021
@@ -38,11 +38,12 @@ import org.apache.poi.util.POILogFactory
 import org.apache.poi.util.POILogger;
 
 /**
- * 
+ *
  */
 public class HSSFPolygon  extends HSSFSimpleShape {
-	private static POILogger logger = POILogFactory.getLogger(HSSFPolygon.class);
-    public final static short OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 0x1E;
+    public static final short OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 0x1E;
+
+    private static final POILogger LOG = POILogFactory.getLogger(HSSFPolygon.class);
 
     public HSSFPolygon(EscherContainerRecord spContainer, ObjRecord objRecord, TextObjectRecord _textObjectRecord) {
         super(spContainer, objRecord, _textObjectRecord);
@@ -173,11 +174,11 @@ public class HSSFPolygon  extends HSSFSi
      */
     public void setPoints(int[] xPoints, int[] yPoints) {
         if (xPoints.length != yPoints.length){
-        	logger.log( POILogger.ERROR, "xPoint.length must be equal to yPoints.length");
+        	LOG.log( POILogger.ERROR, "xPoint.length must be equal to yPoints.length");
             return;
         }
         if (xPoints.length == 0){
-        	logger.log( POILogger.ERROR, "HSSFPolygon must have at least one point");
+        	LOG.log( POILogger.ERROR, "HSSFPolygon must have at least one point");
         }
         EscherArrayProperty verticesProp = new EscherArrayProperty(EscherPropertyTypes.GEOMETRY__VERTICES, false, 0);
         verticesProp.setNumberOfElementsInArray(xPoints.length+1);

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java Sun Jan 17 17:31:22 2021
@@ -39,7 +39,7 @@ import org.apache.poi.util.Configurator;
 public final class HSSFRow implements Row, Comparable<HSSFRow> {
 
     // used for collections
-    public final static int INITIAL_CAPACITY = Configurator.getIntValue("HSSFRow.ColInitialCapacity", 5);
+    public static final int INITIAL_CAPACITY = Configurator.getIntValue("HSSFRow.ColInitialCapacity", 5);
 
     private int rowNum;
     private HSSFCell[] cells;

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java Sun Jan 17 17:31:22 2021
@@ -41,15 +41,15 @@ import org.apache.poi.util.StringUtil;
 
 /**
  * An abstract shape.
- * 
- * Note: Microsoft Excel seems to sometimes disallow 
- * higher y1 than y2 or higher x1 than x2 in the anchor, you might need to 
+ *
+ * Note: Microsoft Excel seems to sometimes disallow
+ * higher y1 than y2 or higher x1 than x2 in the anchor, you might need to
  * reverse them and draw shapes vertically or horizontally flipped via
- * setFlipVertical() or setFlipHorizontally(). 
+ * setFlipVertical() or setFlipHorizontally().
  */
 public abstract class HSSFShape implements Shape {
     private static final POILogger LOG = POILogFactory.getLogger(HSSFShape.class);
-    
+
     public static final int LINEWIDTH_ONE_PT = 12700;
     public static final int LINEWIDTH_DEFAULT = 9525;
     public static final int LINESTYLE__COLOR_DEFAULT = 0x08000040;
@@ -79,9 +79,9 @@ public abstract class HSSFShape implemen
     private final EscherContainerRecord _escherContainer;
     private final ObjRecord _objRecord;
     private final EscherOptRecord _optRecord;
-    
-    public final static int NO_FILLHITTEST_TRUE = 0x00110000;
-    public final static int NO_FILLHITTEST_FALSE = 0x00010000;
+
+    public static final int NO_FILLHITTEST_TRUE = 0x00110000;
+    public static final int NO_FILLHITTEST_FALSE = 0x00010000;
 
     /**
      * creates shapes from existing file
@@ -147,7 +147,7 @@ public abstract class HSSFShape implemen
     }
 
     /**
-     * Return the low-level EscherOptRecord to read/modify not yet wrapped escher properties  
+     * Return the low-level EscherOptRecord to read/modify not yet wrapped escher properties
      *
      * @return the low-level EscherOptRecord
      */

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Sun Jan 17 17:31:22 2021
@@ -101,7 +101,7 @@ public final class HSSFSheet implements
      * rows.  It is currently set to 20.  If you generate larger sheets you may benefit
      * by setting this to a higher number and recompiling a custom edition of HSSFSheet.
      */
-    public final static int INITIAL_CAPACITY = Configurator.getIntValue("HSSFSheet.RowInitialCapacity", 20);
+    public static final int INITIAL_CAPACITY = Configurator.getIntValue("HSSFSheet.RowInitialCapacity", 20);
 
     /**
      * reference to the low level {@link InternalSheet} object

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java Sun Jan 17 17:31:22 2021
@@ -47,32 +47,32 @@ public class HSSFSimpleShape extends HSS
     // The commented out ones haven't been tested yet or aren't supported
     // by HSSFSimpleShape.
 
-    public final static short       OBJECT_TYPE_LINE               = HSSFShapeTypes.Line;
-    public final static short       OBJECT_TYPE_RECTANGLE          = HSSFShapeTypes.Rectangle;
-    public final static short       OBJECT_TYPE_OVAL               = HSSFShapeTypes.Ellipse;
-    public final static short       OBJECT_TYPE_ARC                = HSSFShapeTypes.Arc;
-    //    public final static short       OBJECT_TYPE_CHART              = 5;
-//    public final static short       OBJECT_TYPE_TEXT               = 6;
-//    public final static short       OBJECT_TYPE_BUTTON             = 7;
-    public final static short       OBJECT_TYPE_PICTURE            = HSSFShapeTypes.PictureFrame;
-
-//    public final static short       OBJECT_TYPE_POLYGON            = 9;
-//    public final static short       OBJECT_TYPE_CHECKBOX           = 11;
-//    public final static short       OBJECT_TYPE_OPTION_BUTTON      = 12;
-//    public final static short       OBJECT_TYPE_EDIT_BOX           = 13;
-//    public final static short       OBJECT_TYPE_LABEL              = 14;
-//    public final static short       OBJECT_TYPE_DIALOG_BOX         = 15;
-//    public final static short       OBJECT_TYPE_SPINNER            = 16;
-//    public final static short       OBJECT_TYPE_SCROLL_BAR         = 17;
-//    public final static short       OBJECT_TYPE_LIST_BOX           = 18;
-//    public final static short       OBJECT_TYPE_GROUP_BOX          = 19;
-    public final static short       OBJECT_TYPE_COMBO_BOX          = HSSFShapeTypes.HostControl;
-    public final static short       OBJECT_TYPE_COMMENT            = HSSFShapeTypes.TextBox;
-    public final static short       OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 30;
-
-    public final static int WRAP_SQUARE = 0;
-    public final static int WRAP_BY_POINTS = 1;
-    public final static int WRAP_NONE = 2;
+    public static final short       OBJECT_TYPE_LINE               = HSSFShapeTypes.Line;
+    public static final short       OBJECT_TYPE_RECTANGLE          = HSSFShapeTypes.Rectangle;
+    public static final short       OBJECT_TYPE_OVAL               = HSSFShapeTypes.Ellipse;
+    public static final short       OBJECT_TYPE_ARC                = HSSFShapeTypes.Arc;
+    //    public static final short       OBJECT_TYPE_CHART              = 5;
+//    public static final short       OBJECT_TYPE_TEXT               = 6;
+//    public static final short       OBJECT_TYPE_BUTTON             = 7;
+    public static final short       OBJECT_TYPE_PICTURE            = HSSFShapeTypes.PictureFrame;
+
+//    public static final short       OBJECT_TYPE_POLYGON            = 9;
+//    public static final short       OBJECT_TYPE_CHECKBOX           = 11;
+//    public static final short       OBJECT_TYPE_OPTION_BUTTON      = 12;
+//    public static final short       OBJECT_TYPE_EDIT_BOX           = 13;
+//    public static final short       OBJECT_TYPE_LABEL              = 14;
+//    public static final short       OBJECT_TYPE_DIALOG_BOX         = 15;
+//    public static final short       OBJECT_TYPE_SPINNER            = 16;
+//    public static final short       OBJECT_TYPE_SCROLL_BAR         = 17;
+//    public static final short       OBJECT_TYPE_LIST_BOX           = 18;
+//    public static final short       OBJECT_TYPE_GROUP_BOX          = 19;
+    public static final short       OBJECT_TYPE_COMBO_BOX          = HSSFShapeTypes.HostControl;
+    public static final short       OBJECT_TYPE_COMMENT            = HSSFShapeTypes.TextBox;
+    public static final short       OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 30;
+
+    public static final int WRAP_SQUARE = 0;
+    public static final int WRAP_BY_POINTS = 1;
+    public static final int WRAP_NONE = 2;
 
     private TextObjectRecord _textObjectRecord;
 
@@ -251,7 +251,7 @@ public class HSSFSimpleShape extends HSS
         EscherSpRecord spRecord = getEscherContainer().getChildById(EscherSpRecord.RECORD_ID);
         spRecord.setShapeType((short) value);
     }
-    
+
     private TextObjectRecord getOrCreateTextObjRecord(){
         if (getTextObjectRecord() == null){
             _textObjectRecord = createTextObjRecord();

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java Sun Jan 17 17:31:22 2021
@@ -38,25 +38,25 @@ import org.apache.poi.hssf.record.TextOb
  * A textbox is a shape that may hold a rich text string.
  */
 public class HSSFTextbox extends HSSFSimpleShape {
-    public final static short OBJECT_TYPE_TEXT = 6;
+    public static final short OBJECT_TYPE_TEXT = 6;
 
     /**
      * How to align text horizontally
      */
-    public final static short HORIZONTAL_ALIGNMENT_LEFT = 1;
-    public final static short HORIZONTAL_ALIGNMENT_CENTERED = 2;
-    public final static short HORIZONTAL_ALIGNMENT_RIGHT = 3;
-    public final static short HORIZONTAL_ALIGNMENT_JUSTIFIED = 4;
-    public final static short HORIZONTAL_ALIGNMENT_DISTRIBUTED = 7;
+    public static final short HORIZONTAL_ALIGNMENT_LEFT = 1;
+    public static final short HORIZONTAL_ALIGNMENT_CENTERED = 2;
+    public static final short HORIZONTAL_ALIGNMENT_RIGHT = 3;
+    public static final short HORIZONTAL_ALIGNMENT_JUSTIFIED = 4;
+    public static final short HORIZONTAL_ALIGNMENT_DISTRIBUTED = 7;
 
     /**
      * How to align text vertically
      */
-    public final static short VERTICAL_ALIGNMENT_TOP = 1;
-    public final static short VERTICAL_ALIGNMENT_CENTER = 2;
-    public final static short VERTICAL_ALIGNMENT_BOTTOM = 3;
-    public final static short VERTICAL_ALIGNMENT_JUSTIFY = 4;
-    public final static short VERTICAL_ALIGNMENT_DISTRIBUTED = 7;
+    public static final short VERTICAL_ALIGNMENT_TOP = 1;
+    public static final short VERTICAL_ALIGNMENT_CENTER = 2;
+    public static final short VERTICAL_ALIGNMENT_BOTTOM = 3;
+    public static final short VERTICAL_ALIGNMENT_JUSTIFY = 4;
+    public static final short VERTICAL_ALIGNMENT_DISTRIBUTED = 7;
 
     public HSSFTextbox(EscherContainerRecord spContainer, ObjRecord objRecord, TextObjectRecord textObjectRecord) {
         super(spContainer, objRecord, textObjectRecord);

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java Sun Jan 17 17:31:22 2021
@@ -156,7 +156,7 @@ public final class HSSFWorkbook extends
      * since you're never allowed to have more or less than three sheets!
      */
 
-    public final static int INITIAL_CAPACITY = Configurator.getIntValue("HSSFWorkbook.SheetInitialCapacity", 3);
+    public static final int INITIAL_CAPACITY = Configurator.getIntValue("HSSFWorkbook.SheetInitialCapacity", 3);
 
     /**
      * this is the reference to the low level Workbook object

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java Sun Jan 17 17:31:22 2021
@@ -35,7 +35,7 @@ import org.apache.poi.util.POILogger;
 // {@link org.apache.poi.xssf.usermodel.helpers.XSSFColumnShifter}
 @Beta
 public final class HSSFColumnShifter extends ColumnShifter {
-    private static final POILogger logger = POILogFactory.getLogger(HSSFColumnShifter.class);
+    private static final POILogger LOG = POILogFactory.getLogger(HSSFColumnShifter.class);
 
     public HSSFColumnShifter(HSSFSheet sh) {
         super(sh);

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java Sun Jan 17 17:31:22 2021
@@ -33,7 +33,7 @@ import org.apache.poi.util.POILogger;
 // non-Javadoc: When possible, code should be implemented in the RowShifter abstract class to avoid duplication with
 // {@link org.apache.poi.xssf.usermodel.helpers.XSSFRowShifter}
 public final class HSSFRowShifter extends RowShifter {
-    private static final POILogger logger = POILogFactory.getLogger(HSSFRowShifter.class);
+    private static final POILogger LOG = POILogFactory.getLogger(HSSFRowShifter.class);
 
     public HSSFRowShifter(HSSFSheet sh) {
         super(sh);

Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java Sun Jan 17 17:31:22 2021
@@ -54,7 +54,7 @@ import org.apache.poi.util.POILogger;
 import org.apache.poi.util.TempFile;
 
 public class StandardEncryptor extends Encryptor {
-    private static final POILogger logger = POILogFactory.getLogger(StandardEncryptor.class);
+    private static final POILogger LOG = POILogFactory.getLogger(StandardEncryptor.class);
 
     protected StandardEncryptor() {}
 
@@ -193,7 +193,7 @@ public class StandardEncryptor extends E
                     IOUtils.copy(fis, leos);
                 }
                 if (!fileOut.delete()) {
-                    logger.log(POILogger.ERROR, "Can't delete temporary encryption file: ", fileOut);
+                    LOG.log(POILogger.ERROR, "Can't delete temporary encryption file: ", fileOut);
                 }
 
                 leos.close();

Modified: poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/filesystem/FileMagic.java Sun Jan 17 17:31:22 2021
@@ -105,7 +105,7 @@ public enum FileMagic {
     UNKNOWN(new byte[0]);
 
     // update this if a longer pattern is added
-    final static int MAX_PATTERN_LENGTH = 44;
+    static final int MAX_PATTERN_LENGTH = 44;
 
     final byte[][] magic;
 

Modified: poi/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java?rev=1885613&r1=1885612&r2=1885613&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java Sun Jan 17 17:31:22 2021
@@ -37,7 +37,7 @@ import org.apache.poi.util.POILogger;
  * A POIFS {@link DataSource} backed by a File
  */
 public class FileBackedDataSource extends DataSource implements Closeable {
-    private final static POILogger logger = POILogFactory.getLogger(FileBackedDataSource.class);
+    private static final POILogger LOG = POILogFactory.getLogger(FileBackedDataSource.class);
 
     private final FileChannel channel;
     private Long channelSize;
@@ -195,10 +195,10 @@ public class FileBackedDataSource extend
             try {
                 CleanerUtil.getCleaner().freeBuffer(buffer);
             } catch (IOException e) {
-                logger.log(POILogger.WARN, "Failed to unmap the buffer", e);
+                LOG.log(POILogger.WARN, "Failed to unmap the buffer", e);
             }
         } else {
-            logger.log(POILogger.DEBUG, CleanerUtil.UNMAP_NOT_SUPPORTED_REASON);
+            LOG.log(POILogger.DEBUG, CleanerUtil.UNMAP_NOT_SUPPORTED_REASON);
         }
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org