View | Details | Raw Unified | Return to bug 60526
Collapse All | Expand All

(-)a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java (-1 / +1 lines)
Lines 41-47 import org.apache.poi.util.POILogger; Link Here
41
 * ids.
41
 * ids.
42
 */
42
 */
43
public class FormatTrackingHSSFListener implements HSSFListener {
43
public class FormatTrackingHSSFListener implements HSSFListener {
44
	private static POILogger logger = POILogFactory.getLogger(FormatTrackingHSSFListener.class);
44
	private final static POILogger logger = POILogFactory.getLogger(FormatTrackingHSSFListener.class);
45
	private final HSSFListener _childListener;
45
	private final HSSFListener _childListener;
46
	private final HSSFDataFormatter _formatter;
46
	private final HSSFDataFormatter _formatter;
47
	private final NumberFormat _defaultFormat;
47
	private final NumberFormat _defaultFormat;
(-)a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java (-1 / +1 lines)
Lines 43-49 import org.w3c.dom.NodeList; Link Here
43
public final class PackageRelationshipCollection implements
43
public final class PackageRelationshipCollection implements
44
        Iterable<PackageRelationship> {
44
        Iterable<PackageRelationship> {
45
45
46
    private static POILogger logger = POILogFactory.getLogger(PackageRelationshipCollection.class);
46
    private final static POILogger logger = POILogFactory.getLogger(PackageRelationshipCollection.class);
47
47
48
    /**
48
    /**
49
     * Package relationships ordered by ID.
49
     * Package relationships ordered by ID.
(-)a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java (-1 / +1 lines)
Lines 38-44 import org.w3c.dom.Document; Link Here
38
 * @see ContentTypeManager
38
 * @see ContentTypeManager
39
 */
39
 */
40
public class ZipContentTypeManager extends ContentTypeManager {
40
public class ZipContentTypeManager extends ContentTypeManager {
41
    private static POILogger logger = POILogFactory.getLogger(ZipContentTypeManager.class);
41
    private final static POILogger logger = POILogFactory.getLogger(ZipContentTypeManager.class);
42
42
43
	/**
43
	/**
44
	 * Delegate constructor to the super constructor.
44
	 * Delegate constructor to the super constructor.
(-)a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java (-1 / +1 lines)
Lines 48-54 import org.w3c.dom.Element; Link Here
48
 * @author Julien Chable
48
 * @author Julien Chable
49
 */
49
 */
50
public final class ZipPartMarshaller implements PartMarshaller {
50
public final class ZipPartMarshaller implements PartMarshaller {
51
	private static POILogger logger = POILogFactory.getLogger(ZipPartMarshaller.class);
51
	private final static POILogger logger = POILogFactory.getLogger(ZipPartMarshaller.class);
52
52
53
	/**
53
	/**
54
	 * Save the specified part.
54
	 * Save the specified part.
(-)a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java (-1 / +1 lines)
Lines 45-51 import org.apache.poi.util.SuppressForbidden; Link Here
45
 * and {@link #setMinInflateRatio(double)}.
45
 * and {@link #setMinInflateRatio(double)}.
46
 */
46
 */
47
public class ZipSecureFile extends ZipFile {
47
public class ZipSecureFile extends ZipFile {
48
    private static POILogger logger = POILogFactory.getLogger(ZipSecureFile.class);
48
    private final static POILogger logger = POILogFactory.getLogger(ZipSecureFile.class);
49
    
49
    
50
    private static double MIN_INFLATE_RATIO = 0.01d;
50
    private static double MIN_INFLATE_RATIO = 0.01d;
51
    private static long MAX_ENTRY_SIZE = 0xFFFFFFFFL;
51
    private static long MAX_ENTRY_SIZE = 0xFFFFFFFFL;
(-)a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java (-1 / +1 lines)
Lines 72-78 import org.openxmlformats.schemas.presentationml.x2006.main.PresentationDocument Link Here
72
@Beta
72
@Beta
73
public class XMLSlideShow extends POIXMLDocument
73
public class XMLSlideShow extends POIXMLDocument
74
implements SlideShow<XSLFShape,XSLFTextParagraph> {
74
implements SlideShow<XSLFShape,XSLFTextParagraph> {
75
    private static POILogger _logger = POILogFactory.getLogger(XMLSlideShow.class);
75
    private final static POILogger _logger = POILogFactory.getLogger(XMLSlideShow.class);
76
76
77
    private CTPresentation _presentation;
77
    private CTPresentation _presentation;
78
    private List<XSLFSlide> _slides;
78
    private List<XSLFSlide> _slides;
(-)a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java (-1 / +1 lines)
Lines 46-52 import org.w3c.dom.Node; Link Here
46
@Beta
46
@Beta
47
@Internal
47
@Internal
48
public class XSLFColor {
48
public class XSLFColor {
49
    private static POILogger LOGGER = POILogFactory.getLogger(XSLFColor.class);
49
    private final static POILogger LOGGER = POILogFactory.getLogger(XSLFColor.class);
50
    
50
    
51
    private XmlObject _xmlObject;
51
    private XmlObject _xmlObject;
52
    private Color _color;
52
    private Color _color;
(-)a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java (-1 / +1 lines)
Lines 55-61 import org.openxmlformats.schemas.presentationml.x2006.main.CTShape; Link Here
55
@Beta
55
@Beta
56
public class XSLFGroupShape extends XSLFShape
56
public class XSLFGroupShape extends XSLFShape
57
implements XSLFShapeContainer, GroupShape<XSLFShape,XSLFTextParagraph> {
57
implements XSLFShapeContainer, GroupShape<XSLFShape,XSLFTextParagraph> {
58
    private static POILogger _logger = POILogFactory.getLogger(XSLFGroupShape.class);
58
    private final static POILogger _logger = POILogFactory.getLogger(XSLFGroupShape.class);
59
    
59
    
60
    private final List<XSLFShape> _shapes;
60
    private final List<XSLFShape> _shapes;
61
    private final CTGroupShapeProperties _grpSpPr;
61
    private final CTGroupShapeProperties _grpSpPr;
(-)a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java (-1 / +1 lines)
Lines 71-77 public class XSSFImportFromXML { Link Here
71
71
72
    private final XSSFMap _map;
72
    private final XSSFMap _map;
73
73
74
    private static POILogger logger = POILogFactory.getLogger(XSSFImportFromXML.class);
74
    private final static POILogger logger = POILogFactory.getLogger(XSSFImportFromXML.class);
75
75
76
    public XSSFImportFromXML(XSSFMap map) {
76
    public XSSFImportFromXML(XSSFMap map) {
77
        _map = map;
77
        _map = map;
(-)a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java (-1 / +1 lines)
Lines 34-40 import org.apache.poi.xssf.usermodel.BaseXSSFFormulaEvaluator; Link Here
34
 *  lookup cells within the current Window.
34
 *  lookup cells within the current Window.
35
 */
35
 */
36
public final class SXSSFFormulaEvaluator extends BaseXSSFFormulaEvaluator {
36
public final class SXSSFFormulaEvaluator extends BaseXSSFFormulaEvaluator {
37
    private static POILogger logger = POILogFactory.getLogger(SXSSFFormulaEvaluator.class);
37
    private final static POILogger logger = POILogFactory.getLogger(SXSSFFormulaEvaluator.class);
38
    
38
    
39
    private SXSSFWorkbook wb;
39
    private SXSSFWorkbook wb;
40
    
40
    
(-)a/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java (-1 / +1 lines)
Lines 27-33 import org.apache.poi.util.POILogFactory; Link Here
27
import org.apache.poi.util.POILogger;
27
import org.apache.poi.util.POILogger;
28
28
29
public final class ChunkStream extends Stream {
29
public final class ChunkStream extends Stream {
30
	private static POILogger logger = POILogFactory.getLogger(ChunkStream.class);
30
	private final static POILogger logger = POILogFactory.getLogger(ChunkStream.class);
31
	
31
	
32
	private ChunkFactory chunkFactory;
32
	private ChunkFactory chunkFactory;
33
	/** All the Chunks we contain */
33
	/** All the Chunks we contain */
(-)a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java (-1 / +1 lines)
Lines 42-48 import org.apache.poi.util.POILogger; Link Here
42
 * @see <a href="https://msdn.microsoft.com/en-us/library/cc433490(v=exchg.80).aspx">[MS-OXPROPS]: Exchange Server Protocols Master Property List</a>
42
 * @see <a href="https://msdn.microsoft.com/en-us/library/cc433490(v=exchg.80).aspx">[MS-OXPROPS]: Exchange Server Protocols Master Property List</a>
43
 */
43
 */
44
public final class MAPIDateAttribute extends MAPIAttribute {
44
public final class MAPIDateAttribute extends MAPIAttribute {
45
   private static POILogger logger = POILogFactory.getLogger(MAPIDateAttribute.class);
45
   private final static POILogger logger = POILogFactory.getLogger(MAPIDateAttribute.class);
46
   private Date data;
46
   private Date data;
47
   
47
   
48
   /**
48
   /**
(-)a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java (-1 / +1 lines)
Lines 32-38 import org.apache.poi.util.StringUtil; Link Here
32
 *  to a {@link HMEFMessage} or one of its {@link Attachment}s.
32
 *  to a {@link HMEFMessage} or one of its {@link Attachment}s.
33
 */
33
 */
34
public final class MAPIStringAttribute extends MAPIAttribute {
34
public final class MAPIStringAttribute extends MAPIAttribute {
35
   private static POILogger logger = POILogFactory.getLogger(MAPIStringAttribute.class);
35
   private final static POILogger logger = POILogFactory.getLogger(MAPIStringAttribute.class);
36
   private static final String CODEPAGE = "CP1252";
36
   private static final String CODEPAGE = "CP1252";
37
   private final String data;
37
   private final String data;
38
   
38
   
(-)a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java (-1 / +1 lines)
Lines 39-45 import org.apache.poi.util.POILogger; Link Here
39
 *  or one of its {@link Attachment}s.
39
 *  or one of its {@link Attachment}s.
40
 */
40
 */
41
public final class TNEFDateAttribute extends TNEFAttribute {
41
public final class TNEFDateAttribute extends TNEFAttribute {
42
   private static POILogger logger = POILogFactory.getLogger(TNEFDateAttribute.class);
42
   private final static POILogger logger = POILogFactory.getLogger(TNEFDateAttribute.class);
43
   private Date data;
43
   private Date data;
44
   
44
   
45
   /**
45
   /**
(-)a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java (-1 / +1 lines)
Lines 31-37 import org.apache.poi.util.StringUtil; Link Here
31
 *  or one of its {@link Attachment}s.
31
 *  or one of its {@link Attachment}s.
32
 */
32
 */
33
public final class TNEFStringAttribute extends TNEFAttribute {
33
public final class TNEFStringAttribute extends TNEFAttribute {
34
   private static POILogger logger = POILogFactory.getLogger(TNEFStringAttribute.class);
34
   private final static POILogger logger = POILogFactory.getLogger(TNEFStringAttribute.class);
35
   private String data;
35
   private String data;
36
   
36
   
37
   /**
37
   /**
(-)a/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java (-1 / +1 lines)
Lines 43-49 import org.apache.poi.util.StringUtil; Link Here
43
 */
43
 */
44
public class CurrentUserAtom
44
public class CurrentUserAtom
45
{
45
{
46
	private static POILogger logger = POILogFactory.getLogger(CurrentUserAtom.class);
46
	private final static POILogger logger = POILogFactory.getLogger(CurrentUserAtom.class);
47
47
48
	/** Standard Atom header */
48
	/** Standard Atom header */
49
	public static final byte[] atomHeader = new byte[] { 0, 0, -10, 15 };
49
	public static final byte[] atomHeader = new byte[] { 0, 0, -10, 15 };
(-)a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java (-1 / +1 lines)
Lines 50-56 import org.apache.poi.util.POILogger; Link Here
50
 * data and so on.
50
 * data and so on.
51
 */
51
 */
52
public final class POIFSChunkParser {
52
public final class POIFSChunkParser {
53
   private static POILogger logger = POILogFactory.getLogger(POIFSChunkParser.class);
53
   private final static POILogger logger = POILogFactory.getLogger(POIFSChunkParser.class);
54
54
55
   public static ChunkGroup[] parse(NPOIFSFileSystem fs) throws IOException {
55
   public static ChunkGroup[] parse(NPOIFSFileSystem fs) throws IOException {
56
      return parse(fs.getRoot());
56
      return parse(fs.getRoot());
(-)a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java (-1 / +1 lines)
Lines 189-195 public class HwmfBitmapDib { Link Here
189
        }
189
        }
190
    }
190
    }
191
191
192
    private static POILogger logger = POILogFactory.getLogger(HwmfBitmapDib.class);
192
    private final static POILogger logger = POILogFactory.getLogger(HwmfBitmapDib.class);
193
    private static final int BMP_HEADER_SIZE = 14;
193
    private static final int BMP_HEADER_SIZE = 14;
194
    
194
    
195
    private int headerSize;
195
    private int headerSize;
(-)a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java (-1 / +1 lines)
Lines 144-150 public final class FIBFieldHandler Link Here
144
  public static final int STTBLISTNAMES = 91;
144
  public static final int STTBLISTNAMES = 91;
145
  public static final int STTBFUSSR = 92;
145
  public static final int STTBFUSSR = 92;
146
146
147
  private static POILogger log = POILogFactory.getLogger(FIBFieldHandler.class);
147
  private final static POILogger log = POILogFactory.getLogger(FIBFieldHandler.class);
148
148
149
  private static final int FIELD_SIZE = LittleEndian.INT_SIZE * 2;
149
  private static final int FIELD_SIZE = LittleEndian.INT_SIZE * 2;
150
150
(-)a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java (-1 / +1 lines)
Lines 34-40 import org.apache.poi.util.POILogger; Link Here
34
@Internal
34
@Internal
35
public final class ListTables
35
public final class ListTables
36
{
36
{
37
  private static POILogger log = POILogFactory.getLogger(ListTables.class);
37
  private final static POILogger log = POILogFactory.getLogger(ListTables.class);
38
38
39
    /**
39
    /**
40
     * Both PlfLst and the following LVLs
40
     * Both PlfLst and the following LVLs
(-)a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java (-1 / +1 lines)
Lines 37-43 import org.apache.poi.util.POILogger; Link Here
37
 */
37
 */
38
public class PlfLfo
38
public class PlfLfo
39
{
39
{
40
    private static POILogger log = POILogFactory.getLogger( PlfLfo.class );
40
    private final static POILogger log = POILogFactory.getLogger( PlfLfo.class );
41
41
42
    /**
42
    /**
43
     * An unsigned integer that specifies the count of elements in both the
43
     * An unsigned integer that specifies the count of elements in both the
(-)a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java (-8 / +2 lines)
Lines 48-61 import org.apache.poi.hwpf.sprm.ParagraphSprmCompressor; Link Here
48
 */
48
 */
49
public final class HWPFList
49
public final class HWPFList
50
{
50
{
51
    //private static POILogger log = POILogFactory.getLogger( HWPFList.class );
52
53
    private boolean _ignoreLogicalLeftIdentation = false;
51
    private boolean _ignoreLogicalLeftIdentation = false;
54
    private LFO _lfo;
52
    private LFO _lfo;
55
    private LFOData _lfoData;
53
    private LFOData _lfoData;
56
    private ListData _listData;
54
    private ListData _listData;
57
    private ListTables _listTables;
55
    private ListTables _listTables;
58
    private boolean _registered;
59
    private StyleSheet _styleSheet;
56
    private StyleSheet _styleSheet;
60
57
61
    /**
58
    /**
Lines 80-86 public final class HWPFList Link Here
80
    {
77
    {
81
        _listTables = listTables;
78
        _listTables = listTables;
82
        _styleSheet = styleSheet;
79
        _styleSheet = styleSheet;
83
        _registered = true;
84
80
85
        /* See documentation for sprmPIlfo (0x460B) */
81
        /* See documentation for sprmPIlfo (0x460B) */
86
        if ( ilfo == 0 || ilfo == 0xF801 )
82
        if ( ilfo == 0 || ilfo == 0xF801 )
Lines 214-221 public final class HWPFList Link Here
214
        int styleIndex = _listData.getLevelStyle( level );
210
        int styleIndex = _listData.getLevelStyle( level );
215
        CharacterProperties base = _styleSheet.getCharacterStyle( styleIndex );
211
        CharacterProperties base = _styleSheet.getCharacterStyle( styleIndex );
216
212
217
        byte[] grpprl = CharacterSprmCompressor.compressCharacterProperty( chp,
213
        byte[] grpprl = CharacterSprmCompressor.compressCharacterProperty( chp, base );
218
                base );
219
        listLevel.setNumberProperties( grpprl );
214
        listLevel.setNumberProperties( grpprl );
220
    }
215
    }
221
216
Lines 233-240 public final class HWPFList Link Here
233
        int styleIndex = _listData.getLevelStyle( level );
228
        int styleIndex = _listData.getLevelStyle( level );
234
        ParagraphProperties base = _styleSheet.getParagraphStyle( styleIndex );
229
        ParagraphProperties base = _styleSheet.getParagraphStyle( styleIndex );
235
230
236
        byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty( pap,
231
        byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty( pap, base );
237
                base );
238
        listLevel.setLevelProperties( grpprl );
232
        listLevel.setLevelProperties( grpprl );
239
    }
233
    }
240
234
(-)a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java (-1 / +1 lines)
Lines 33-39 import org.apache.poi.util.POILogFactory; Link Here
33
import org.apache.poi.util.POILogger;
33
import org.apache.poi.util.POILogger;
34
34
35
public class Paragraph extends Range implements Cloneable {
35
public class Paragraph extends Range implements Cloneable {
36
    private static POILogger log = POILogFactory.getLogger( Paragraph.class );
36
    private final static POILogger log = POILogFactory.getLogger( Paragraph.class );
37
37
38
    public final static short SPRM_JC = 0x2403;
38
    public final static short SPRM_JC = 0x2403;
39
    public final static short SPRM_FSIDEBYSIDE = 0x2404;
39
    public final static short SPRM_FSIDEBYSIDE = 0x2404;

Return to bug 60526