Index: src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java =================================================================== --- src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java (revision 683062) +++ src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java (working copy) @@ -68,10 +68,10 @@ public final static short OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 30; private short field_2_objectId; private short field_3_option; - private BitField locked = BitFieldFactory.getInstance(0x1); - private BitField printable = BitFieldFactory.getInstance(0x10); - private BitField autofill = BitFieldFactory.getInstance(0x2000); - private BitField autoline = BitFieldFactory.getInstance(0x4000); + private static final BitField locked = BitFieldFactory.getInstance(0x1); + private static final BitField printable = BitFieldFactory.getInstance(0x10); + private static final BitField autofill = BitFieldFactory.getInstance(0x2000); + private static final BitField autoline = BitFieldFactory.getInstance(0x4000); private int field_4_reserved1; private int field_5_reserved2; private int field_6_reserved3; Index: src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java =================================================================== --- src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java (revision 683062) +++ src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java (working copy) @@ -44,8 +44,8 @@ private int field_4_first_column; private int field_5_last_column; - private BitField rowRelative = BitFieldFactory.getInstance( 0x8000 ); - private BitField colRelative = BitFieldFactory.getInstance( 0x4000 ); + private static final BitField rowRelative = BitFieldFactory.getInstance( 0x8000 ); + private static final BitField colRelative = BitFieldFactory.getInstance( 0x4000 ); /** Creates new AreaPtg */ public Area3DPtg() Index: src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java =================================================================== --- src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java (revision 683062) +++ src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java (working copy) @@ -46,8 +46,8 @@ * - bit 15 - isColumnRelative */ private int field_3_column; - private BitField rowRelative = BitFieldFactory.getInstance(0x8000); - private BitField colRelative = BitFieldFactory.getInstance(0x4000); + private static final BitField rowRelative = BitFieldFactory.getInstance(0x8000); + private static final BitField colRelative = BitFieldFactory.getInstance(0x4000); /** Creates new AreaPtg */ public Ref3DPtg() {} Index: src/java/org/apache/poi/hssf/record/WindowTwoRecord.java =================================================================== --- src/java/org/apache/poi/hssf/record/WindowTwoRecord.java (revision 683062) +++ src/java/org/apache/poi/hssf/record/WindowTwoRecord.java (working copy) @@ -39,23 +39,23 @@ private short field_1_options; // bitfields - private BitField displayFormulas = BitFieldFactory.getInstance(0x01); - private BitField displayGridlines = BitFieldFactory.getInstance(0x02); - private BitField displayRowColHeadings = BitFieldFactory.getInstance(0x04); - private BitField freezePanes = BitFieldFactory.getInstance(0x08); - private BitField displayZeros = BitFieldFactory.getInstance(0x10); - private BitField defaultHeader = - BitFieldFactory.getInstance(0x20); // if false use color in field 4 + private static final BitField displayFormulas = BitFieldFactory.getInstance(0x01); + private static final BitField displayGridlines = BitFieldFactory.getInstance(0x02); + private static final BitField displayRowColHeadings = BitFieldFactory.getInstance(0x04); + private static final BitField freezePanes = BitFieldFactory.getInstance(0x08); + private static final BitField displayZeros = BitFieldFactory.getInstance(0x10); + private static final BitField defaultHeader = BitFieldFactory.getInstance(0x20); + // if false use color in field 4 // if true use default foreground // for headers - private BitField arabic = - BitFieldFactory.getInstance(0x40); // for our desert dwelling friends - private BitField displayGuts = BitFieldFactory.getInstance(0x80); - private BitField freezePanesNoSplit = BitFieldFactory.getInstance(0x100); - private BitField selected = BitFieldFactory.getInstance(0x200); - private BitField active = BitFieldFactory.getInstance(0x400); - private BitField savedInPageBreakPreview = BitFieldFactory.getInstance(0x800); + private static final BitField arabic = BitFieldFactory.getInstance(0x40); + // for our desert dwelling friends + private static final BitField displayGuts = BitFieldFactory.getInstance(0x80); + private static final BitField freezePanesNoSplit = BitFieldFactory.getInstance(0x100); + private static final BitField selected = BitFieldFactory.getInstance(0x200); + private static final BitField active = BitFieldFactory.getInstance(0x400); + private static final BitField savedInPageBreakPreview = BitFieldFactory.getInstance(0x800); // 4-7 reserved // end bitfields Index: src/java/org/apache/poi/hssf/record/FormulaRecord.java =================================================================== --- src/java/org/apache/poi/hssf/record/FormulaRecord.java (revision 683062) +++ src/java/org/apache/poi/hssf/record/FormulaRecord.java (working copy) @@ -54,9 +54,9 @@ private short field_3_xf; private double field_4_value; private short field_5_options; - private BitField alwaysCalc = BitFieldFactory.getInstance(0x0001); - private BitField calcOnLoad = BitFieldFactory.getInstance(0x0002); - private BitField sharedFormula = BitFieldFactory.getInstance(0x0008); + private static final BitField alwaysCalc = BitFieldFactory.getInstance(0x0001); + private static final BitField calcOnLoad = BitFieldFactory.getInstance(0x0002); + private static final BitField sharedFormula = BitFieldFactory.getInstance(0x0008); private int field_6_zero; private short field_7_expression_len; private Stack field_8_parsed_expr; Index: src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java =================================================================== --- src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java (revision 683062) +++ src/java/org/apache/poi/hssf/record/TextObjectBaseRecord.java (working copy) @@ -37,20 +37,20 @@ { public final static short sid = 0x1B6; private short field_1_options; - private BitField reserved1 = BitFieldFactory.getInstance(0x1); - private BitField HorizontalTextAlignment = BitFieldFactory.getInstance(0x000E); + private static final BitField reserved1 = BitFieldFactory.getInstance(0x1); + private static final BitField HorizontalTextAlignment = BitFieldFactory.getInstance(0x000E); public final static short HORIZONTAL_TEXT_ALIGNMENT_LEFT_ALIGNED = 1; public final static short HORIZONTAL_TEXT_ALIGNMENT_CENTERED = 2; public final static short HORIZONTAL_TEXT_ALIGNMENT_RIGHT_ALIGNED = 3; public final static short HORIZONTAL_TEXT_ALIGNMENT_JUSTIFIED = 4; - private BitField VerticalTextAlignment = BitFieldFactory.getInstance(0x0070); + private static final BitField VerticalTextAlignment = BitFieldFactory.getInstance(0x0070); public final static short VERTICAL_TEXT_ALIGNMENT_TOP = 1; public final static short VERTICAL_TEXT_ALIGNMENT_CENTER = 2; public final static short VERTICAL_TEXT_ALIGNMENT_BOTTOM = 3; public final static short VERTICAL_TEXT_ALIGNMENT_JUSTIFY = 4; - private BitField reserved2 = BitFieldFactory.getInstance(0x0180); - private BitField textLocked = BitFieldFactory.getInstance(0x200); - private BitField reserved3 = BitFieldFactory.getInstance(0xFC00); + private static final BitField reserved2 = BitFieldFactory.getInstance(0x0180); + private static final BitField textLocked = BitFieldFactory.getInstance(0x200); + private static final BitField reserved3 = BitFieldFactory.getInstance(0xFC00); private short field_2_textOrientation; public final static short TEXT_ORIENTATION_NONE = 0; public final static short TEXT_ORIENTATION_TOP_TO_BOTTOM = 1;