moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

FindBugs fix

Browse Source 
- fixed "Field isn't final but should be"
- see http://findbugs.sourceforge.net/bugDescriptions.html#MS_SHOULD_BE_FINAL


git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1568145 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2014-02-13 23:34:11 +00:00
parent 276b477322
commit 3ceb93b23d
24 changed files with 133 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -1405,7 +1405,7 @@ under the License.
</classpath> </classpath>
</taskdef> </taskdef>
<findbugs home="${findbugs.home}" output="html" outputFile="build/findbugs.html" <findbugs home="${findbugs.home}" output="html" outputFile="build/findbugs.html"
includeFilter="src/resources/devtools/findbugs-filters.xml"> excludeFilter="src/resources/devtools/findbugs-filters.xml">
<fileset dir="${dist.dir}"> <fileset dir="${dist.dir}">
<include name="poi-${version.id}-*.jar"/> <include name="poi-${version.id}-*.jar"/>
<include name="poi-scratchpad-${version.id}-*.jar"/> <include name="poi-scratchpad-${version.id}-*.jar"/>

22
src/java/org/apache/poi/hpsf/Thumbnail.java
View File

@ -32,7 +32,7 @@ public final class Thumbnail {
* <code>byte[]</code> returned by {@link * <code>byte[]</code> returned by {@link
* SummaryInformation#getThumbnail()}</p> * SummaryInformation#getThumbnail()}</p>
*/ */
public static int OFFSET_CFTAG = 4; public static final int OFFSET_CFTAG = 4;
/** /**
* <p>Offset in bytes where the Clipboard Format starts in the * <p>Offset in bytes where the Clipboard Format starts in the
@ -42,7 +42,7 @@ public final class Thumbnail {
* <p>This is only valid if the Clipboard Format Tag is {@link * <p>This is only valid if the Clipboard Format Tag is {@link
* #CFTAG_WINDOWS}</p> * #CFTAG_WINDOWS}</p>
*/ */
public static int OFFSET_CF = 8; public static final int OFFSET_CF = 8;
/** /**
* <p>Offset in bytes where the Windows Metafile (WMF) image data * <p>Offset in bytes where the Windows Metafile (WMF) image data
@ -60,7 +60,7 @@ public final class Thumbnail {
* image. It can be saved to disk with a <code>.wmf</code> file * image. It can be saved to disk with a <code>.wmf</code> file
* type and read using a WMF-capable image viewer.</p> * type and read using a WMF-capable image viewer.</p>
*/ */
public static int OFFSET_WMFDATA = 20; public static final int OFFSET_WMFDATA = 20;
/** /**
* <p>Clipboard Format Tag - Windows clipboard format</p> * <p>Clipboard Format Tag - Windows clipboard format</p>
@ -68,7 +68,7 @@ public final class Thumbnail {
* <p>A <code>DWORD</code> indicating a built-in Windows clipboard * <p>A <code>DWORD</code> indicating a built-in Windows clipboard
* format value</p> * format value</p>
*/ */
public static int CFTAG_WINDOWS = -1; public static final int CFTAG_WINDOWS = -1;
/** /**
* <p>Clipboard Format Tag - Macintosh clipboard format</p> * <p>Clipboard Format Tag - Macintosh clipboard format</p>
@ -76,7 +76,7 @@ public final class Thumbnail {
* <p>A <code>DWORD</code> indicating a Macintosh clipboard format * <p>A <code>DWORD</code> indicating a Macintosh clipboard format
* value</p> * value</p>
*/ */
public static int CFTAG_MACINTOSH = -2; public static final int CFTAG_MACINTOSH = -2;
/** /**
* <p>Clipboard Format Tag - Format ID</p> * <p>Clipboard Format Tag - Format ID</p>
@ -84,7 +84,7 @@ public final class Thumbnail {
* <p>A GUID containing a format identifier (FMTID). This is * <p>A GUID containing a format identifier (FMTID). This is
* rarely used.</p> * rarely used.</p>
*/ */
public static int CFTAG_FMTID = -3; public static final int CFTAG_FMTID = -3;
/** /**
* <p>Clipboard Format Tag - No Data</p> * <p>Clipboard Format Tag - No Data</p>
@ -92,7 +92,7 @@ public final class Thumbnail {
* <p>A <code>DWORD</code> indicating No data. This is rarely * <p>A <code>DWORD</code> indicating No data. This is rarely
* used.</p> * used.</p>
*/ */
public static int CFTAG_NODATA = 0; public static final int CFTAG_NODATA = 0;
/** /**
* <p>Clipboard Format - Windows metafile format. This is the * <p>Clipboard Format - Windows metafile format. This is the
@ -102,17 +102,17 @@ public final class Thumbnail {
* regular WMF images. The clipboard version of this format has an * regular WMF images. The clipboard version of this format has an
* extra clipboard-specific header.</p> * extra clipboard-specific header.</p>
*/ */
public static int CF_METAFILEPICT = 3; public static final int CF_METAFILEPICT = 3;
/** /**
* <p>Clipboard Format - Device Independent Bitmap</p> * <p>Clipboard Format - Device Independent Bitmap</p>
*/ */
public static int CF_DIB = 8; public static final int CF_DIB = 8;
/** /**
* <p>Clipboard Format - Enhanced Windows metafile format</p> * <p>Clipboard Format - Enhanced Windows metafile format</p>
*/ */
public static int CF_ENHMETAFILE = 14; public static final int CF_ENHMETAFILE = 14;
/** /**
* <p>Clipboard Format - Bitmap</p> * <p>Clipboard Format - Bitmap</p>
@ -121,7 +121,7 @@ public final class Thumbnail {
* href="msdn.microsoft.com/library/en-us/dnw98bk/html/clipboardoperations.asp * href="msdn.microsoft.com/library/en-us/dnw98bk/html/clipboardoperations.asp
* target="_blank">msdn.microsoft.com/library/en-us/dnw98bk/html/clipboardoperations.asp</a>.</p> * target="_blank">msdn.microsoft.com/library/en-us/dnw98bk/html/clipboardoperations.asp</a>.</p>
*/ */
public static int CF_BITMAP = 2; public static final int CF_BITMAP = 2;
/** /**
* <p>A <code>byte[]</code> to hold a thumbnail image in ({@link * <p>A <code>byte[]</code> to hold a thumbnail image in ({@link

2
src/java/org/apache/poi/hpsf/VariantSupport.java
View File

@ -49,7 +49,7 @@ import org.apache.poi.util.POILogger;
*/ */
public class VariantSupport extends Variant public class VariantSupport extends Variant
{ {
private static POILogger logger = POILogFactory.getLogger(VariantSupport.class); private static final POILogger logger = POILogFactory.getLogger(VariantSupport.class);
private static boolean logUnsupportedTypes = false; private static boolean logUnsupportedTypes = false;
/** /**

6
src/java/org/apache/poi/hssf/record/FtCfSubRecord.java
View File

@ -32,18 +32,18 @@ public final class FtCfSubRecord extends SubRecord {
/** /**
* Specifies the format of the picture is an enhanced metafile. * Specifies the format of the picture is an enhanced metafile.
*/ */
public static short METAFILE_BIT = (short)0x0002; public static final short METAFILE_BIT = (short)0x0002;
/** /**
* Specifies the format of the picture is a bitmap. * Specifies the format of the picture is a bitmap.
*/ */
public static short BITMAP_BIT = (short)0x0009; public static final short BITMAP_BIT = (short)0x0009;
/** /**
* Specifies the picture is in an unspecified format that is * Specifies the picture is in an unspecified format that is
* neither and enhanced metafile nor a bitmap. * neither and enhanced metafile nor a bitmap.
*/ */
public static short UNSPECIFIED_BIT = (short)0xFFFF; public static final short UNSPECIFIED_BIT = (short)0xFFFF;
private short flags = 0; private short flags = 0;

18
src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
View File

@ -33,53 +33,53 @@ public final class FtPioGrbitSubRecord extends SubRecord {
* A bit that specifies whether the picture's aspect ratio is preserved when rendered in * A bit that specifies whether the picture's aspect ratio is preserved when rendered in
* different views (Normal view, Page Break Preview view, Page Layout view and printing). * different views (Normal view, Page Break Preview view, Page Layout view and printing).
*/ */
public static int AUTO_PICT_BIT = 1 << 0; public static final int AUTO_PICT_BIT = 1 << 0;
/** /**
* A bit that specifies whether the pictFmla field of the Obj record that contains * A bit that specifies whether the pictFmla field of the Obj record that contains
* this FtPioGrbit specifies a DDE reference. * this FtPioGrbit specifies a DDE reference.
*/ */
public static int DDE_BIT = 1 << 1; public static final int DDE_BIT = 1 << 1;
/** /**
* A bit that specifies whether this object is expected to be updated on print to * A bit that specifies whether this object is expected to be updated on print to
* reflect the values in the cell associated with the object. * reflect the values in the cell associated with the object.
*/ */
public static int PRINT_CALC_BIT = 1 << 2; public static final int PRINT_CALC_BIT = 1 << 2;
/** /**
* A bit that specifies whether the picture is displayed as an icon. * A bit that specifies whether the picture is displayed as an icon.
*/ */
public static int ICON_BIT = 1 << 3; public static final int ICON_BIT = 1 << 3;
/** /**
* A bit that specifies whether this object is an ActiveX control. * A bit that specifies whether this object is an ActiveX control.
* It MUST NOT be the case that both fCtl and fDde are equal to 1. * It MUST NOT be the case that both fCtl and fDde are equal to 1.
*/ */
public static int CTL_BIT = 1 << 4; public static final int CTL_BIT = 1 << 4;
/** /**
* A bit that specifies whether the object data are stored in an * A bit that specifies whether the object data are stored in an
* embedding storage (= 0) or in the controls stream (ctls) (= 1). * embedding storage (= 0) or in the controls stream (ctls) (= 1).
*/ */
public static int PRSTM_BIT = 1 << 5; public static final int PRSTM_BIT = 1 << 5;
/** /**
* A bit that specifies whether this is a camera picture. * A bit that specifies whether this is a camera picture.
*/ */
public static int CAMERA_BIT = 1 << 7; public static final int CAMERA_BIT = 1 << 7;
/** /**
* A bit that specifies whether this picture's size has been explicitly set. * A bit that specifies whether this picture's size has been explicitly set.
* 0 = picture size has been explicitly set, 1 = has not been set * 0 = picture size has been explicitly set, 1 = has not been set
*/ */
public static int DEFAULT_SIZE_BIT = 1 << 8; public static final int DEFAULT_SIZE_BIT = 1 << 8;
/** /**
* A bit that specifies whether the OLE server for the object is called * A bit that specifies whether the OLE server for the object is called
* to load the object's data automatically when the parent workbook is opened. * to load the object's data automatically when the parent workbook is opened.
*/ */
public static int AUTO_LOAD_BIT = 1 << 9; public static final int AUTO_LOAD_BIT = 1 << 9;
private short flags = 0; private short flags = 0;

13
src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
View File

@ -16,8 +16,11 @@
==================================================================== */ ==================================================================== */
package org.apache.poi.hssf.record; package org.apache.poi.hssf.record;
import org.apache.poi.ss.formula.ptg.*; import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.util.*; import org.apache.poi.util.HexDump;
import org.apache.poi.util.LittleEndianInput;
import org.apache.poi.util.LittleEndianOutput;
import org.apache.poi.util.StringUtil;
/** /**
* This structure specifies the properties of a list or drop-down list embedded object in a sheet. * This structure specifies the properties of a list or drop-down list embedded object in a sheet.
@ -298,15 +301,15 @@ public class LbsDataSubRecord extends SubRecord {
/** /**
* Combo dropdown control * Combo dropdown control
*/ */
public static int STYLE_COMBO_DROPDOWN = 0; public static final int STYLE_COMBO_DROPDOWN = 0;
/** /**
* Combo Edit dropdown control * Combo Edit dropdown control
*/ */
public static int STYLE_COMBO_EDIT_DROPDOWN = 1; public static final int STYLE_COMBO_EDIT_DROPDOWN = 1;
/** /**
* Simple dropdown control (just the dropdown button) * Simple dropdown control (just the dropdown button)
*/ */
public static int STYLE_COMBO_SIMPLE_DROPDOWN = 2; public static final int STYLE_COMBO_SIMPLE_DROPDOWN = 2;
/** /**
* An unsigned integer that specifies the style of this dropdown. * An unsigned integer that specifies the style of this dropdown.

2
src/ooxml/java/org/apache/poi/extractor/CommandLineTextExtractor.java
View File

@ -25,7 +25,7 @@ import org.apache.poi.POITextExtractor;
* for when debugging. * for when debugging.
*/ */
public class CommandLineTextExtractor { public class CommandLineTextExtractor {
public static String DIVIDER = "======================="; public static final String DIVIDER = "=======================";
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
if(args.length < 1) { if(args.length < 1) {

10
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
View File

@ -16,24 +16,24 @@
==================================================================== */ ==================================================================== */
package org.apache.poi.xslf.usermodel; package org.apache.poi.xslf.usermodel;
import java.util.HashMap;
import java.util.Map;
import org.apache.poi.POIXMLDocumentPart; import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLRelation; import org.apache.poi.POIXMLRelation;
import org.apache.poi.util.Beta; import org.apache.poi.util.Beta;
import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger; import org.apache.poi.util.POILogger;
import java.util.HashMap;
import java.util.Map;
@Beta @Beta
public class XSLFRelation extends POIXMLRelation { public class XSLFRelation extends POIXMLRelation {
private static POILogger log = POILogFactory.getLogger(XSLFRelation.class); private static final POILogger log = POILogFactory.getLogger(XSLFRelation.class);
/** /**
* A map to lookup POIXMLRelation by its relation type * A map to lookup POIXMLRelation by its relation type
*/ */
protected static Map<String, XSLFRelation> _table = new HashMap<String, XSLFRelation>(); protected static final Map<String, XSLFRelation> _table = new HashMap<String, XSLFRelation>();
public static final XSLFRelation MAIN = new XSLFRelation( public static final XSLFRelation MAIN = new XSLFRelation(
"application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml", "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml",

4
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
View File

@ -47,12 +47,12 @@ import org.apache.poi.xssf.model.ThemesTable;
*/ */
public final class XSSFRelation extends POIXMLRelation { public final class XSSFRelation extends POIXMLRelation {
private static POILogger log = POILogFactory.getLogger(XSSFRelation.class); private static final POILogger log = POILogFactory.getLogger(XSSFRelation.class);
/** /**
* A map to lookup POIXMLRelation by its relation type * A map to lookup POIXMLRelation by its relation type
*/ */
protected static Map<String, XSSFRelation> _table = new HashMap<String, XSSFRelation>(); protected static final Map<String, XSSFRelation> _table = new HashMap<String, XSSFRelation>();
public static final XSSFRelation WORKBOOK = new XSSFRelation( public static final XSSFRelation WORKBOOK = new XSSFRelation(

2
src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
View File

@ -31,7 +31,7 @@ public final class XWPFRelation extends POIXMLRelation {
/** /**
* A map to lookup POIXMLRelation by its relation type * A map to lookup POIXMLRelation by its relation type
*/ */
protected static Map<String, XWPFRelation> _table = new HashMap<String, XWPFRelation>(); protected static final Map<String, XWPFRelation> _table = new HashMap<String, XWPFRelation>();
public static final XWPFRelation DOCUMENT = new XWPFRelation( public static final XWPFRelation DOCUMENT = new XWPFRelation(

6
src/resources/devtools/findbugs-filters.xml
View File

@ -18,7 +18,7 @@
==================================================================== ====================================================================
--> -->
<FindBugsFilter> <FindBugsFilter>
<Match> <Match>
<Not><Bug pattern="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE"/></Not> <Bug pattern="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE,MS_PKGPROTECT,MS_MUTABLE_ARRAY"/>
</Match> </Match>
</FindBugsFilter> </FindBugsFilter>

17
src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
View File

@ -17,10 +17,19 @@
package org.apache.poi.hslf.dev; package org.apache.poi.hslf.dev;
import org.apache.poi.util.LittleEndian; import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import org.apache.poi.hslf.record.RecordTypes; import org.apache.poi.hslf.record.RecordTypes;
import org.apache.poi.poifs.filesystem.*; import org.apache.poi.poifs.filesystem.DocumentEntry;
import java.io.*; import org.apache.poi.poifs.filesystem.DocumentInputStream;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.LittleEndian;
/** /**
* Utility class which dumps raw contents of a ppt file into XML format * Utility class which dumps raw contents of a ppt file into XML format
@ -33,7 +42,7 @@ public final class PPTXMLDump {
public static final int PICT_HEADER_SIZE = 25; //size of the picture header public static final int PICT_HEADER_SIZE = 25; //size of the picture header
public final static String PPDOC_ENTRY = "PowerPoint Document"; public final static String PPDOC_ENTRY = "PowerPoint Document";
public final static String PICTURES_ENTRY = "Pictures"; public final static String PICTURES_ENTRY = "Pictures";
public static String CR = System.getProperty("line.separator"); public final static String CR = System.getProperty("line.separator");
protected Writer out; protected Writer out;
protected byte[] docstream; protected byte[] docstream;

12
src/scratchpad/src/org/apache/poi/hslf/model/AutoShapes.java
View File

@ -17,9 +17,15 @@
package org.apache.poi.hslf.model; package org.apache.poi.hslf.model;
import org.apache.poi.ddf.EscherProperties; import java.awt.geom.AffineTransform;
import java.awt.geom.Arc2D;
import java.awt.geom.Ellipse2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.Line2D;
import java.awt.geom.Rectangle2D;
import java.awt.geom.RoundRectangle2D;
import java.awt.geom.*; import org.apache.poi.ddf.EscherProperties;
/** /**
* Stores definition of auto-shapes. * Stores definition of auto-shapes.
@ -30,7 +36,7 @@ import java.awt.geom.*;
* @author Yegor Kozlov * @author Yegor Kozlov
*/ */
public final class AutoShapes { public final class AutoShapes {
protected static ShapeOutline[] shapes; protected static final ShapeOutline[] shapes;
/** /**

26
src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
View File

@ -17,13 +17,25 @@
package org.apache.poi.hslf.model; package org.apache.poi.hslf.model;
import org.apache.poi.ddf.*;
import org.apache.poi.util.POILogger;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.hslf.record.*;
import java.util.List;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import org.apache.poi.ddf.EscherClientDataRecord;
import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherOptRecord;
import org.apache.poi.ddf.EscherProperties;
import org.apache.poi.ddf.EscherProperty;
import org.apache.poi.ddf.EscherPropertyFactory;
import org.apache.poi.ddf.EscherRecord;
import org.apache.poi.ddf.EscherSimpleProperty;
import org.apache.poi.ddf.EscherSpRecord;
import org.apache.poi.hslf.record.InteractiveInfo;
import org.apache.poi.hslf.record.InteractiveInfoAtom;
import org.apache.poi.hslf.record.OEShapeAtom;
import org.apache.poi.hslf.record.Record;
import org.apache.poi.hslf.record.RecordTypes;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
/** /**
* Create a <code>Shape</code> object depending on its type * Create a <code>Shape</code> object depending on its type
@ -32,7 +44,7 @@ import java.util.Iterator;
*/ */
public final class ShapeFactory { public final class ShapeFactory {
// For logging // For logging
protected static POILogger logger = POILogFactory.getLogger(ShapeFactory.class); protected static final POILogger logger = POILogFactory.getLogger(ShapeFactory.class);
/** /**
* Create a new shape from the data provided. * Create a new shape from the data provided.

13
src/scratchpad/src/org/apache/poi/hslf/model/ShapePainter.java
View File

@ -18,19 +18,22 @@
package org.apache.poi.hslf.model; package org.apache.poi.hslf.model;
import org.apache.poi.util.POILogger; import java.awt.BasicStroke;
import org.apache.poi.util.POILogFactory; import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.*; import java.awt.Stroke;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
/** /**
* Paint a shape into java.awt.Graphics2D * Paint a shape into java.awt.Graphics2D
* *
* @author Yegor Kozlov * @author Yegor Kozlov
*/ */
public final class ShapePainter { public final class ShapePainter {
protected static POILogger logger = POILogFactory.getLogger(ShapePainter.class); protected static final POILogger logger = POILogFactory.getLogger(ShapePainter.class);
public static void paint(SimpleShape shape, Graphics2D graphics){ public static void paint(SimpleShape shape, Graphics2D graphics){
Rectangle2D anchor = shape.getLogicalAnchor2D(); Rectangle2D anchor = shape.getLogicalAnchor2D();

8
src/scratchpad/src/org/apache/poi/hslf/model/ShapeTypes.java
View File

@ -17,10 +17,10 @@
package org.apache.poi.hslf.model; package org.apache.poi.hslf.model;
import org.apache.poi.hslf.exceptions.HSLFException;
import java.util.HashMap;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.HashMap;
import org.apache.poi.hslf.exceptions.HSLFException;
/** /**
* Contains all known shape types in PowerPoint * Contains all known shape types in PowerPoint
@ -38,7 +38,7 @@ public final class ShapeTypes implements org.apache.poi.sl.usermodel.ShapeTypes
return name; return name;
} }
public static HashMap types; public static final HashMap types;
static { static {
types = new HashMap(); types = new HashMap();
try { try {

2
src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
View File

@ -32,7 +32,7 @@ public class CharFlagsTextProp extends BitMaskTextProp {
public static final int ENABLE_NUMBERING_1_IDX = 11; public static final int ENABLE_NUMBERING_1_IDX = 11;
public static final int ENABLE_NUMBERING_2_IDX = 12; public static final int ENABLE_NUMBERING_2_IDX = 12;
public static String NAME = "char_flags"; public static final String NAME = "char_flags";
public CharFlagsTextProp() { public CharFlagsTextProp() {
super(2,0xffff, NAME, new String[] { super(2,0xffff, NAME, new String[] {
"bold", // 0x0001 A bit that specifies whether the characters are bold. "bold", // 0x0001 A bit that specifies whether the characters are bold.

2
src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
View File

@ -28,7 +28,7 @@ public final class ParagraphFlagsTextProp extends BitMaskTextProp {
public static final int BULLET_HARDCOLOR_IDX = 2; public static final int BULLET_HARDCOLOR_IDX = 2;
public static final int BULLET_HARDSIZE_IDX = 4; public static final int BULLET_HARDSIZE_IDX = 4;
public static String NAME = "paragraph_flags"; public static final String NAME = "paragraph_flags";
public ParagraphFlagsTextProp() { public ParagraphFlagsTextProp() {
super(2, 0xF, NAME, new String[] { super(2, 0xF, NAME, new String[] {

2
src/scratchpad/src/org/apache/poi/hslf/record/Record.java
View File

@ -38,7 +38,7 @@ import org.apache.poi.util.POILogger;
public abstract class Record public abstract class Record
{ {
// For logging // For logging
protected static POILogger logger = POILogFactory.getLogger(Record.class); protected static final POILogger logger = POILogFactory.getLogger(Record.class);
/** /**
* Is this record type an Atom record (only has data), * Is this record type an Atom record (only has data),

6
src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
View File

@ -17,8 +17,8 @@
package org.apache.poi.hslf.record; package org.apache.poi.hslf.record;
import java.util.HashMap;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.HashMap;
/** /**
* List of all known record types in a PowerPoint document, and the * List of all known record types in a PowerPoint document, and the
@ -31,8 +31,8 @@ import java.lang.reflect.Field;
* @author Nick Burch * @author Nick Burch
*/ */
public final class RecordTypes { public final class RecordTypes {
public static HashMap<Integer,String> typeToName; public static final HashMap<Integer,String> typeToName;
public static HashMap<Integer,Class<? extends Record>> typeToClass; public static final HashMap<Integer,Class<? extends Record>> typeToClass;
public static final Type Unknown = new Type(0,null); public static final Type Unknown = new Type(0,null);
public static final Type Document = new Type(1000,Document.class); public static final Type Document = new Type(1000,Document.class);

16
src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java
View File

@ -64,42 +64,42 @@ public class SSSlideInfoAtom extends RecordAtom {
* A bit that specifies whether the presentation slide can be * A bit that specifies whether the presentation slide can be
* manually advanced by the user during the slide show. * manually advanced by the user during the slide show.
*/ */
public static int MANUAL_ADVANCE_BIT = 1 << 0; public static final int MANUAL_ADVANCE_BIT = 1 << 0;
/** /**
* A bit that specifies whether the corresponding slide is * A bit that specifies whether the corresponding slide is
* hidden and is not displayed during the slide show. * hidden and is not displayed during the slide show.
*/ */
public static int HIDDEN_BIT = 1 << 2; public static final int HIDDEN_BIT = 1 << 2;
/** /**
* A bit that specifies whether to play the sound specified by soundIfRef. * A bit that specifies whether to play the sound specified by soundIfRef.
*/ */
public static int SOUND_BIT = 1 << 4; public static final int SOUND_BIT = 1 << 4;
/** /**
* A bit that specifies whether the sound specified by soundIdRef is * A bit that specifies whether the sound specified by soundIdRef is
* looped continuously when playing until the next sound plays. * looped continuously when playing until the next sound plays.
*/ */
public static int LOOP_SOUND_BIT = 1 << 6; public static final int LOOP_SOUND_BIT = 1 << 6;
/** /**
* A bit that specifies whether to stop any currently playing * A bit that specifies whether to stop any currently playing
* sound when the transition starts. * sound when the transition starts.
*/ */
public static int STOP_SOUND_BIT = 1 << 8; public static final int STOP_SOUND_BIT = 1 << 8;
/** /**
* A bit that specifies whether the slide will automatically * A bit that specifies whether the slide will automatically
* advance after slideTime milliseconds during the slide show. * advance after slideTime milliseconds during the slide show.
*/ */
public static int AUTO_ADVANCE_BIT = 1 << 10; public static final int AUTO_ADVANCE_BIT = 1 << 10;
/** /**
* A bit that specifies whether to display the cursor during * A bit that specifies whether to display the cursor during
* the slide show. * the slide show.
*/ */
public static int CURSOR_VISIBLE_BIT = 1 << 12; public static final int CURSOR_VISIBLE_BIT = 1 << 12;
// public static int RESERVED1_BIT = 1 << 1; // public static int RESERVED1_BIT = 1 << 1;
// public static int RESERVED2_BIT = 1 << 3; // public static int RESERVED2_BIT = 1 << 3;
@ -109,7 +109,7 @@ public class SSSlideInfoAtom extends RecordAtom {
// public static int RESERVED6_BIT = 1 << 11; // public static int RESERVED6_BIT = 1 << 11;
// public static int RESERVED7_BIT = 1 << 13 | 1 << 14 | 1 << 15; // public static int RESERVED7_BIT = 1 << 13 | 1 << 14 | 1 << 15;
private static long _type = RecordTypes.SSSlideInfoAtom.typeID; private static final long _type = RecordTypes.SSSlideInfoAtom.typeID;
private byte[] _header; private byte[] _header;

4
src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
View File

@ -118,7 +118,7 @@ public final class StyleTextPropAtom extends RecordAtom
} }
/** All the different kinds of paragraph properties we might handle */ /** All the different kinds of paragraph properties we might handle */
public static TextProp[] paragraphTextPropTypes = new TextProp[] { public static final TextProp[] paragraphTextPropTypes = new TextProp[] {
new TextProp(0, 0x1, "hasBullet"), new TextProp(0, 0x1, "hasBullet"),
new TextProp(0, 0x2, "hasBulletFont"), new TextProp(0, 0x2, "hasBulletFont"),
new TextProp(0, 0x4, "hasBulletColor"), new TextProp(0, 0x4, "hasBulletColor"),
@ -141,7 +141,7 @@ public final class StyleTextPropAtom extends RecordAtom
new TextProp(2, 0x200000, "textDirection") new TextProp(2, 0x200000, "textDirection")
}; };
/** All the different kinds of character properties we might handle */ /** All the different kinds of character properties we might handle */
public static TextProp[] characterTextPropTypes = new TextProp[] { public static final TextProp[] characterTextPropTypes = new TextProp[] {
new TextProp(0, 0x1, "bold"), new TextProp(0, 0x1, "bold"),
new TextProp(0, 0x2, "italic"), new TextProp(0, 0x2, "italic"),
new TextProp(0, 0x4, "underline"), new TextProp(0, 0x4, "underline"),

27
src/scratchpad/src/org/apache/poi/hslf/usermodel/PictureData.java
View File

@ -17,18 +17,25 @@
package org.apache.poi.hslf.usermodel; package org.apache.poi.hslf.usermodel;
import org.apache.poi.util.LittleEndian; import java.awt.Graphics2D;
import org.apache.poi.util.POILogger;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.hslf.model.Picture;
import org.apache.poi.hslf.blip.*;
import org.apache.poi.hslf.exceptions.HSLFException;
import java.io.OutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.awt.*;
import org.apache.poi.hslf.blip.BitmapPainter;
import org.apache.poi.hslf.blip.DIB;
import org.apache.poi.hslf.blip.EMF;
import org.apache.poi.hslf.blip.ImagePainter;
import org.apache.poi.hslf.blip.JPEG;
import org.apache.poi.hslf.blip.PICT;
import org.apache.poi.hslf.blip.PNG;
import org.apache.poi.hslf.blip.WMF;
import org.apache.poi.hslf.exceptions.HSLFException;
import org.apache.poi.hslf.model.Picture;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
/** /**
* A class that represents image data contained in a slide show. * A class that represents image data contained in a slide show.
@ -77,7 +84,7 @@ public abstract class PictureData {
*/ */
protected abstract int getSignature(); protected abstract int getSignature();
protected static ImagePainter[] painters = new ImagePainter[8]; protected static final ImagePainter[] painters = new ImagePainter[8];
static { static {
PictureData.setImagePainter(Picture.PNG, new BitmapPainter()); PictureData.setImagePainter(Picture.PNG, new BitmapPainter());
PictureData.setImagePainter(Picture.JPEG, new BitmapPainter()); PictureData.setImagePainter(Picture.JPEG, new BitmapPainter());

4
src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java
View File

@ -40,7 +40,7 @@ public abstract class PropertyNode<T extends PropertyNode<T>> implements Compar
public static final class EndComparator implements public static final class EndComparator implements
Comparator<PropertyNode<?>> Comparator<PropertyNode<?>>
{ {
public static EndComparator instance = new EndComparator(); public static final EndComparator instance = new EndComparator();
public int compare( PropertyNode<?> o1, PropertyNode<?> o2 ) public int compare( PropertyNode<?> o1, PropertyNode<?> o2 )
{ {
@ -54,7 +54,7 @@ public abstract class PropertyNode<T extends PropertyNode<T>> implements Compar
public static final class StartComparator implements public static final class StartComparator implements
Comparator<PropertyNode<?>> Comparator<PropertyNode<?>>
{ {
public static StartComparator instance = new StartComparator(); public static final StartComparator instance = new StartComparator();
public int compare( PropertyNode<?> o1, PropertyNode<?> o2 ) public int compare( PropertyNode<?> o1, PropertyNode<?> o2 )
{ {