[patch] [PATCH] more final static loggers

patch.txt (text/plain), 17.73 KB, created by PJ Fanning on 2016-12-28 22:00:43 UTC

(hide)

Description: [PATCH] more final static loggers

Filename:

MIME Type:

Creator: PJ Fanning

Created: 2016-12-28 22:00:43 UTC

Size: 17.73 KB

patch

obsolete

>diff --git a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java >index 4a78696..de9814e 100644 >--- a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java >+++ b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java >@@ -41,7 +41,7 @@ import org.apache.poi.util.POILogger; > * ids. > */ > public class FormatTrackingHSSFListener implements HSSFListener { >- private static POILogger logger = POILogFactory.getLogger(FormatTrackingHSSFListener.class); >+ private final static POILogger logger = POILogFactory.getLogger(FormatTrackingHSSFListener.class); > private final HSSFListener _childListener; > private final HSSFDataFormatter _formatter; > private final NumberFormat _defaultFormat; >diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java >index 665c51f..232b38b 100644 >--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java >+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java >@@ -43,7 +43,7 @@ import org.w3c.dom.NodeList; > public final class PackageRelationshipCollection implements > Iterable<PackageRelationship> { > >- private static POILogger logger = POILogFactory.getLogger(PackageRelationshipCollection.class); >+ private final static POILogger logger = POILogFactory.getLogger(PackageRelationshipCollection.class); > > /** > * Package relationships ordered by ID. >diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java >index 1e00d93..70bdb39 100644 >--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java >+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java >@@ -38,7 +38,7 @@ import org.w3c.dom.Document; > * @see ContentTypeManager > */ > public class ZipContentTypeManager extends ContentTypeManager { >- private static POILogger logger = POILogFactory.getLogger(ZipContentTypeManager.class); >+ private final static POILogger logger = POILogFactory.getLogger(ZipContentTypeManager.class); > > /** > * Delegate constructor to the super constructor. >diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java >index 8860ae3..37abb44 100644 >--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java >+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java >@@ -48,7 +48,7 @@ import org.w3c.dom.Element; > * @author Julien Chable > */ > public final class ZipPartMarshaller implements PartMarshaller { >- private static POILogger logger = POILogFactory.getLogger(ZipPartMarshaller.class); >+ private final static POILogger logger = POILogFactory.getLogger(ZipPartMarshaller.class); > > /** > * Save the specified part. >diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java b/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java >index 9000656..d1fc0cb 100644 >--- a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java >+++ b/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java >@@ -45,7 +45,7 @@ import org.apache.poi.util.SuppressForbidden; > * and {@link #setMinInflateRatio(double)}. > */ > public class ZipSecureFile extends ZipFile { >- private static POILogger logger = POILogFactory.getLogger(ZipSecureFile.class); >+ private final static POILogger logger = POILogFactory.getLogger(ZipSecureFile.class); > > private static double MIN_INFLATE_RATIO = 0.01d; > private static long MAX_ENTRY_SIZE = 0xFFFFFFFFL; >diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java >index 14b656b..cee2d0e 100644 >--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java >+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java >@@ -72,7 +72,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.PresentationDocument > @Beta > public class XMLSlideShow extends POIXMLDocument > implements SlideShow<XSLFShape,XSLFTextParagraph> { >- private static POILogger _logger = POILogFactory.getLogger(XMLSlideShow.class); >+ private final static POILogger _logger = POILogFactory.getLogger(XMLSlideShow.class); > > private CTPresentation _presentation; > private List<XSLFSlide> _slides; >diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java >index f519f7e..bff6e01 100644 >--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java >+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java >@@ -46,7 +46,7 @@ import org.w3c.dom.Node; > @Beta > @Internal > public class XSLFColor { >- private static POILogger LOGGER = POILogFactory.getLogger(XSLFColor.class); >+ private final static POILogger LOGGER = POILogFactory.getLogger(XSLFColor.class); > > private XmlObject _xmlObject; > private Color _color; >diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java >index 08022e9..bb904be 100644 >--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java >+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java >@@ -55,7 +55,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.CTShape; > @Beta > public class XSLFGroupShape extends XSLFShape > implements XSLFShapeContainer, GroupShape<XSLFShape,XSLFTextParagraph> { >- private static POILogger _logger = POILogFactory.getLogger(XSLFGroupShape.class); >+ private final static POILogger _logger = POILogFactory.getLogger(XSLFGroupShape.class); > > private final List<XSLFShape> _shapes; > private final CTGroupShapeProperties _grpSpPr; >diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java >index 0ffbd0b..478ed54 100644 >--- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java >+++ b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java >@@ -71,7 +71,7 @@ public class XSSFImportFromXML { > > private final XSSFMap _map; > >- private static POILogger logger = POILogFactory.getLogger(XSSFImportFromXML.class); >+ private final static POILogger logger = POILogFactory.getLogger(XSSFImportFromXML.class); > > public XSSFImportFromXML(XSSFMap map) { > _map = map; >diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java >index 0ac776f..d6e258e 100644 >--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java >+++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java >@@ -34,7 +34,7 @@ import org.apache.poi.xssf.usermodel.BaseXSSFFormulaEvaluator; > * lookup cells within the current Window. > */ > public final class SXSSFFormulaEvaluator extends BaseXSSFFormulaEvaluator { >- private static POILogger logger = POILogFactory.getLogger(SXSSFFormulaEvaluator.class); >+ private final static POILogger logger = POILogFactory.getLogger(SXSSFFormulaEvaluator.class); > > private SXSSFWorkbook wb; > >diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java b/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java >index 9f15e40..f58a4c8 100644 >--- a/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java >+++ b/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java >@@ -27,7 +27,7 @@ import org.apache.poi.util.POILogFactory; > import org.apache.poi.util.POILogger; > > public final class ChunkStream extends Stream { >- private static POILogger logger = POILogFactory.getLogger(ChunkStream.class); >+ private final static POILogger logger = POILogFactory.getLogger(ChunkStream.class); > > private ChunkFactory chunkFactory; > /** All the Chunks we contain */ >diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java b/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java >index 53eb575..0669723 100644 >--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java >+++ b/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java >@@ -42,7 +42,7 @@ import org.apache.poi.util.POILogger; > * @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 static POILogger logger = POILogFactory.getLogger(MAPIDateAttribute.class); >+ private final static POILogger logger = POILogFactory.getLogger(MAPIDateAttribute.class); > private Date data; > > /** >diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java b/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java >index 5307e71..ef4e16b 100644 >--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java >+++ b/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java >@@ -32,7 +32,7 @@ import org.apache.poi.util.StringUtil; > * to a {@link HMEFMessage} or one of its {@link Attachment}s. > */ > public final class MAPIStringAttribute extends MAPIAttribute { >- private static POILogger logger = POILogFactory.getLogger(MAPIStringAttribute.class); >+ private final static POILogger logger = POILogFactory.getLogger(MAPIStringAttribute.class); > private static final String CODEPAGE = "CP1252"; > private final String data; > >diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java b/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java >index 1df0d96..faedc4c 100644 >--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java >+++ b/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java >@@ -39,7 +39,7 @@ import org.apache.poi.util.POILogger; > * or one of its {@link Attachment}s. > */ > public final class TNEFDateAttribute extends TNEFAttribute { >- private static POILogger logger = POILogFactory.getLogger(TNEFDateAttribute.class); >+ private final static POILogger logger = POILogFactory.getLogger(TNEFDateAttribute.class); > private Date data; > > /** >diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java b/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java >index 34e1ef3..a63b0d1 100644 >--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java >+++ b/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java >@@ -31,7 +31,7 @@ import org.apache.poi.util.StringUtil; > * or one of its {@link Attachment}s. > */ > public final class TNEFStringAttribute extends TNEFAttribute { >- private static POILogger logger = POILogFactory.getLogger(TNEFStringAttribute.class); >+ private final static POILogger logger = POILogFactory.getLogger(TNEFStringAttribute.class); > private String data; > > /** >diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java >index 2d68860..d05c5b2 100644 >--- a/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java >+++ b/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java >@@ -43,7 +43,7 @@ import org.apache.poi.util.StringUtil; > */ > public class CurrentUserAtom > { >- private static POILogger logger = POILogFactory.getLogger(CurrentUserAtom.class); >+ private final static POILogger logger = POILogFactory.getLogger(CurrentUserAtom.class); > > /** Standard Atom header */ > public static final byte[] atomHeader = new byte[] { 0, 0, -10, 15 }; >diff --git a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java b/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java >index c44f494..ffe44ad 100644 >--- a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java >+++ b/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java >@@ -50,7 +50,7 @@ import org.apache.poi.util.POILogger; > * data and so on. > */ > public final class POIFSChunkParser { >- private static POILogger logger = POILogFactory.getLogger(POIFSChunkParser.class); >+ private final static POILogger logger = POILogFactory.getLogger(POIFSChunkParser.class); > > public static ChunkGroup[] parse(NPOIFSFileSystem fs) throws IOException { > return parse(fs.getRoot()); >diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java >index ba935f3..da49d2e 100644 >--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java >+++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java >@@ -189,7 +189,7 @@ public class HwmfBitmapDib { > } > } > >- private static POILogger logger = POILogFactory.getLogger(HwmfBitmapDib.class); >+ private final static POILogger logger = POILogFactory.getLogger(HwmfBitmapDib.class); > private static final int BMP_HEADER_SIZE = 14; > > private int headerSize; >diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java >index ec422d9..ae830f6 100644 >--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java >+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java >@@ -144,7 +144,7 @@ public final class FIBFieldHandler > public static final int STTBLISTNAMES = 91; > public static final int STTBFUSSR = 92; > >- private static POILogger log = POILogFactory.getLogger(FIBFieldHandler.class); >+ private final static POILogger log = POILogFactory.getLogger(FIBFieldHandler.class); > > private static final int FIELD_SIZE = LittleEndian.INT_SIZE * 2; > >diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java >index 5ec0253..01b9577 100644 >--- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java >+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java >@@ -34,7 +34,7 @@ import org.apache.poi.util.POILogger; > @Internal > public final class ListTables > { >- private static POILogger log = POILogFactory.getLogger(ListTables.class); >+ private final static POILogger log = POILogFactory.getLogger(ListTables.class); > > /** > * Both PlfLst and the following LVLs >diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java >index 90618da..b387e8f 100644 >--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java >+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java >@@ -37,7 +37,7 @@ import org.apache.poi.util.POILogger; > */ > public class PlfLfo > { >- private static POILogger log = POILogFactory.getLogger( PlfLfo.class ); >+ private final static POILogger log = POILogFactory.getLogger( PlfLfo.class ); > > /** > * An unsigned integer that specifies the count of elements in both the >diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java >index 6f69f71..3364aec 100644 >--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java >+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java >@@ -48,14 +48,11 @@ import org.apache.poi.hwpf.sprm.ParagraphSprmCompressor; > */ > public final class HWPFList > { >- //private static POILogger log = POILogFactory.getLogger( HWPFList.class ); >- > private boolean _ignoreLogicalLeftIdentation = false; > private LFO _lfo; > private LFOData _lfoData; > private ListData _listData; > private ListTables _listTables; >- private boolean _registered; > private StyleSheet _styleSheet; > > /** >@@ -80,7 +77,6 @@ public final class HWPFList > { > _listTables = listTables; > _styleSheet = styleSheet; >- _registered = true; > > /* See documentation for sprmPIlfo (0x460B) */ > if ( ilfo == 0 || ilfo == 0xF801 ) >@@ -214,8 +210,7 @@ public final class HWPFList > int styleIndex = _listData.getLevelStyle( level ); > CharacterProperties base = _styleSheet.getCharacterStyle( styleIndex ); > >- byte[] grpprl = CharacterSprmCompressor.compressCharacterProperty( chp, >- base ); >+ byte[] grpprl = CharacterSprmCompressor.compressCharacterProperty( chp, base ); > listLevel.setNumberProperties( grpprl ); > } > >@@ -233,8 +228,7 @@ public final class HWPFList > int styleIndex = _listData.getLevelStyle( level ); > ParagraphProperties base = _styleSheet.getParagraphStyle( styleIndex ); > >- byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty( pap, >- base ); >+ byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty( pap, base ); > listLevel.setLevelProperties( grpprl ); > } > >diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java >index 6e5f688..9da19fd 100644 >--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java >+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java >@@ -33,7 +33,7 @@ import org.apache.poi.util.POILogFactory; > import org.apache.poi.util.POILogger; > > public class Paragraph extends Range implements Cloneable { >- private static POILogger log = POILogFactory.getLogger( Paragraph.class ); >+ private final static POILogger log = POILogFactory.getLogger( Paragraph.class ); > > public final static short SPRM_JC = 0x2403; > public final static short SPRM_FSIDEBYSIDE = 0x2404; View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]