]> source.dussan.org Git - poi.git/commitdiff
Updated to use BitFieldFactory. Appologies for stepping outside my HSSF domain (wont...
authorJason Height <jheight@apache.org>
Fri, 2 Sep 2005 03:49:41 +0000 (03:49 +0000)
committerJason Height <jheight@apache.org>
Fri, 2 Sep 2005 03:49:41 +0000 (03:49 +0000)
git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353779 13f79535-47bb-0310-9956-ffa450edef68

23 files changed:
src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java
src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java
src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java
src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java
src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java
src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java
src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java
src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java
src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java
src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java
src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java
src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java
src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java
src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java
src/scratchpad/src/org/apache/poi/hwpf/model/types/FIBAbstractType.java
src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java
src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java
src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java
src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java
src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java

index a36291cb7bcbfa713a1eea027d582eedaea9537f..5392825d1dab08c9abfaecacfadb196bf411c97f 100644 (file)
@@ -37,31 +37,31 @@ public class FileInformationBlock extends FIBAbstractType
     private  short field_5_unknown;
     private  short field_6_options;
 
-        private static final BitField template          = new BitField(0x0001);
-        private static final BitField glossary          = new BitField(0x0002);
-        private static final BitField quicksave         = new BitField(0x0004);
-        private static final BitField haspictr          = new BitField(0x0008);
-        private static final BitField nquicksaves       = new BitField(0x00F0);
-        private static final BitField encrypted         = new BitField(0x0100);
-        private static final BitField tabletype         = new BitField(0x0200);
-        private static final BitField readonly          = new BitField(0x0400);
-        private static final BitField writeReservation  = new BitField(0x0800);
-        private static final BitField extendedCharacter = new BitField(0x1000);
-        private static final BitField loadOverride      = new BitField(0x2000);
-        private static final BitField farEast           = new BitField(0x4000);
-        private static final BitField crypto            = new BitField(0x8000);
+        private static final BitField template          = BitFieldFactory.getInstance(0x0001);
+        private static final BitField glossary          = BitFieldFactory.getInstance(0x0002);
+        private static final BitField quicksave         = BitFieldFactory.getInstance(0x0004);
+        private static final BitField haspictr          = BitFieldFactory.getInstance(0x0008);
+        private static final BitField nquicksaves       = BitFieldFactory.getInstance(0x00F0);
+        private static final BitField encrypted         = BitFieldFactory.getInstance(0x0100);
+        private static final BitField tabletype         = BitFieldFactory.getInstance(0x0200);
+        private static final BitField readonly          = BitFieldFactory.getInstance(0x0400);
+        private static final BitField writeReservation  = BitFieldFactory.getInstance(0x0800);
+        private static final BitField extendedCharacter = BitFieldFactory.getInstance(0x1000);
+        private static final BitField loadOverride      = BitFieldFactory.getInstance(0x2000);
+        private static final BitField farEast           = BitFieldFactory.getInstance(0x4000);
+        private static final BitField crypto            = BitFieldFactory.getInstance(0x8000);
 
     private short field_7_minversion;
     private short field_8_encrypted_key;
     private short field_9_environment; // 0 or 1 - windows or mac
     private short field_10_history;
 
-        private static final BitField history_mac   = new BitField(0x01);
-        private static final BitField empty_special = new BitField(0x02);
-        private static final BitField load_override = new BitField(0x04);
-        private static final BitField future_undo   = new BitField(0x08);
-        private static final BitField w97_saved     = new BitField(0x10);
-        private static final BitField spare         = new BitField(0xfe);
+        private static final BitField history_mac   = BitFieldFactory.getInstance(0x01);
+        private static final BitField empty_special = BitFieldFactory.getInstance(0x02);
+        private static final BitField load_override = BitFieldFactory.getInstance(0x04);
+        private static final BitField future_undo   = BitFieldFactory.getInstance(0x08);
+        private static final BitField w97_saved     = BitFieldFactory.getInstance(0x10);
+        private static final BitField spare         = BitFieldFactory.getInstance(0xfe);
 
     private short field_11_default_charset;
     private short field_12_default_extcharset;
index 239dcbcdfaf0315ab018e49b2aacc69f88716439..1d147d6a262748c06580f68dd694d56a20433ca2 100644 (file)
@@ -22,6 +22,7 @@ package org.apache.poi.hdf.model.hdftypes.definitions;
 
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
@@ -40,27 +41,27 @@ public abstract class CHPAbstractType
 
     private  short field_1_chse;
     private  int field_2_format_flags;
-        private static BitField  fBold = new BitField(0x0001);
-        private static BitField  fItalic = new BitField(0x0002);
-        private static BitField  fRMarkDel = new BitField(0x0004);
-        private static BitField  fOutline = new BitField(0x0008);
-        private static BitField  fFldVanish = new BitField(0x0010);
-        private static BitField  fSmallCaps = new BitField(0x0020);
-        private static BitField  fCaps = new BitField(0x0040);
-        private static BitField  fVanish = new BitField(0x0080);
-        private static BitField  fRMark = new BitField(0x0100);
-        private static BitField  fSpec = new BitField(0x0200);
-        private static BitField  fStrike = new BitField(0x0400);
-        private static BitField  fObj = new BitField(0x0800);
-        private static BitField  fShadow = new BitField(0x1000);
-        private static BitField  fLowerCase = new BitField(0x2000);
-        private static BitField  fData = new BitField(0x4000);
-        private static BitField  fOle2 = new BitField(0x8000);
+        private static BitField  fBold = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fItalic = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fRMarkDel = BitFieldFactory.getInstance(0x0004);
+        private static BitField  fOutline = BitFieldFactory.getInstance(0x0008);
+        private static BitField  fFldVanish = BitFieldFactory.getInstance(0x0010);
+        private static BitField  fSmallCaps = BitFieldFactory.getInstance(0x0020);
+        private static BitField  fCaps = BitFieldFactory.getInstance(0x0040);
+        private static BitField  fVanish = BitFieldFactory.getInstance(0x0080);
+        private static BitField  fRMark = BitFieldFactory.getInstance(0x0100);
+        private static BitField  fSpec = BitFieldFactory.getInstance(0x0200);
+        private static BitField  fStrike = BitFieldFactory.getInstance(0x0400);
+        private static BitField  fObj = BitFieldFactory.getInstance(0x0800);
+        private static BitField  fShadow = BitFieldFactory.getInstance(0x1000);
+        private static BitField  fLowerCase = BitFieldFactory.getInstance(0x2000);
+        private static BitField  fData = BitFieldFactory.getInstance(0x4000);
+        private static BitField  fOle2 = BitFieldFactory.getInstance(0x8000);
     private  int field_3_format_flags1;
-        private static BitField  fEmboss = new BitField(0x0001);
-        private static BitField  fImprint = new BitField(0x0002);
-        private static BitField  fDStrike = new BitField(0x0004);
-        private static BitField  fUsePgsuSettings = new BitField(0x0008);
+        private static BitField  fEmboss = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fImprint = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fDStrike = BitFieldFactory.getInstance(0x0004);
+        private static BitField  fUsePgsuSettings = BitFieldFactory.getInstance(0x0008);
     private  int field_4_ftcAscii;
     private  int field_5_ftcFE;
     private  int field_6_ftcOther;
@@ -91,13 +92,13 @@ public abstract class CHPAbstractType
     private  byte field_31_chYsr;
     private  int field_32_hpsKern;
     private  short field_33_Highlight;
-        private static BitField  icoHighlight = new BitField(0x001f);
-        private static BitField  fHighlight = new BitField(0x0020);
-        private static BitField  kcd = new BitField(0x01c0);
-        private static BitField  fNavHighlight = new BitField(0x0200);
-        private static BitField  fChsDiff = new BitField(0x0400);
-        private static BitField  fMacChs = new BitField(0x0800);
-        private static BitField  fFtcAsciSym = new BitField(0x1000);
+        private static BitField  icoHighlight = BitFieldFactory.getInstance(0x001f);
+        private static BitField  fHighlight = BitFieldFactory.getInstance(0x0020);
+        private static BitField  kcd = BitFieldFactory.getInstance(0x01c0);
+        private static BitField  fNavHighlight = BitFieldFactory.getInstance(0x0200);
+        private static BitField  fChsDiff = BitFieldFactory.getInstance(0x0400);
+        private static BitField  fMacChs = BitFieldFactory.getInstance(0x0800);
+        private static BitField  fFtcAsciSym = BitFieldFactory.getInstance(0x1000);
     private  short field_34_fPropMark;
     private  int field_35_ibstPropRMark;
     private  int field_36_dttmPropRMark;
index 7b44337291d59c43e6db3ba06b3a9ea34e954ff1..f98cad5f48b607bbcf7108ad6679ab03dd477de8 100644 (file)
@@ -22,6 +22,7 @@ package org.apache.poi.hdf.model.hdftypes.definitions;
 
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
@@ -39,58 +40,58 @@ public abstract class DOPAbstractType
 {
 
     private  byte field_1_formatFlags;
-        private static BitField  fFacingPages = new BitField(0x01);
-        private static BitField  fWidowControl = new BitField(0x02);
-        private static BitField  fPMHMainDoc = new BitField(0x04);
-        private static BitField  grfSupression = new BitField(0x18);
-        private static BitField  fpc = new BitField(0x60);
-        private static BitField  unused1 = new BitField(0x80);
+        private static BitField  fFacingPages = BitFieldFactory.getInstance(0x01);
+        private static BitField  fWidowControl = BitFieldFactory.getInstance(0x02);
+        private static BitField  fPMHMainDoc = BitFieldFactory.getInstance(0x04);
+        private static BitField  grfSupression = BitFieldFactory.getInstance(0x18);
+        private static BitField  fpc = BitFieldFactory.getInstance(0x60);
+        private static BitField  unused1 = BitFieldFactory.getInstance(0x80);
     private  byte field_2_unused2;
     private  short field_3_footnoteInfo;
-        private static BitField  rncFtn = new BitField(0x0003);
-        private static BitField  nFtn = new BitField(0xfffc);
+        private static BitField  rncFtn = BitFieldFactory.getInstance(0x0003);
+        private static BitField  nFtn = BitFieldFactory.getInstance(0xfffc);
     private  byte field_4_fOutlineDirtySave;
     private  byte field_5_docinfo;
-        private static BitField  fOnlyMacPics = new BitField(0x01);
-        private static BitField  fOnlyWinPics = new BitField(0x02);
-        private static BitField  fLabelDoc = new BitField(0x04);
-        private static BitField  fHyphCapitals = new BitField(0x08);
-        private static BitField  fAutoHyphen = new BitField(0x10);
-        private static BitField  fFormNoFields = new BitField(0x20);
-        private static BitField  fLinkStyles = new BitField(0x40);
-        private static BitField  fRevMarking = new BitField(0x80);
+        private static BitField  fOnlyMacPics = BitFieldFactory.getInstance(0x01);
+        private static BitField  fOnlyWinPics = BitFieldFactory.getInstance(0x02);
+        private static BitField  fLabelDoc = BitFieldFactory.getInstance(0x04);
+        private static BitField  fHyphCapitals = BitFieldFactory.getInstance(0x08);
+        private static BitField  fAutoHyphen = BitFieldFactory.getInstance(0x10);
+        private static BitField  fFormNoFields = BitFieldFactory.getInstance(0x20);
+        private static BitField  fLinkStyles = BitFieldFactory.getInstance(0x40);
+        private static BitField  fRevMarking = BitFieldFactory.getInstance(0x80);
     private  byte field_6_docinfo1;
-        private static BitField  fBackup = new BitField(0x01);
-        private static BitField  fExactCWords = new BitField(0x02);
-        private static BitField  fPagHidden = new BitField(0x04);
-        private static BitField  fPagResults = new BitField(0x08);
-        private static BitField  fLockAtn = new BitField(0x10);
-        private static BitField  fMirrorMargins = new BitField(0x20);
-        private static BitField  unused3 = new BitField(0x40);
-        private static BitField  fDfltTrueType = new BitField(0x80);
+        private static BitField  fBackup = BitFieldFactory.getInstance(0x01);
+        private static BitField  fExactCWords = BitFieldFactory.getInstance(0x02);
+        private static BitField  fPagHidden = BitFieldFactory.getInstance(0x04);
+        private static BitField  fPagResults = BitFieldFactory.getInstance(0x08);
+        private static BitField  fLockAtn = BitFieldFactory.getInstance(0x10);
+        private static BitField  fMirrorMargins = BitFieldFactory.getInstance(0x20);
+        private static BitField  unused3 = BitFieldFactory.getInstance(0x40);
+        private static BitField  fDfltTrueType = BitFieldFactory.getInstance(0x80);
     private  byte field_7_docinfo2;
-        private static BitField  fPagSupressTopSpacing = new BitField(0x01);
-        private static BitField  fProtEnabled = new BitField(0x02);
-        private static BitField  fDispFormFldSel = new BitField(0x04);
-        private static BitField  fRMView = new BitField(0x08);
-        private static BitField  fRMPrint = new BitField(0x10);
-        private static BitField  unused4 = new BitField(0x20);
-        private static BitField  fLockRev = new BitField(0x40);
-        private static BitField  fEmbedFonts = new BitField(0x80);
+        private static BitField  fPagSupressTopSpacing = BitFieldFactory.getInstance(0x01);
+        private static BitField  fProtEnabled = BitFieldFactory.getInstance(0x02);
+        private static BitField  fDispFormFldSel = BitFieldFactory.getInstance(0x04);
+        private static BitField  fRMView = BitFieldFactory.getInstance(0x08);
+        private static BitField  fRMPrint = BitFieldFactory.getInstance(0x10);
+        private static BitField  unused4 = BitFieldFactory.getInstance(0x20);
+        private static BitField  fLockRev = BitFieldFactory.getInstance(0x40);
+        private static BitField  fEmbedFonts = BitFieldFactory.getInstance(0x80);
     private  short field_8_docinfo3;
-        private static BitField  oldfNoTabForInd = new BitField(0x0001);
-        private static BitField  oldfNoSpaceRaiseLower = new BitField(0x0002);
-        private static BitField  oldfSuppressSpbfAfterPageBreak = new BitField(0x0004);
-        private static BitField  oldfWrapTrailSpaces = new BitField(0x0008);
-        private static BitField  oldfMapPrintTextColor = new BitField(0x0010);
-        private static BitField  oldfNoColumnBalance = new BitField(0x0020);
-        private static BitField  oldfConvMailMergeEsc = new BitField(0x0040);
-        private static BitField  oldfSupressTopSpacing = new BitField(0x0080);
-        private static BitField  oldfOrigWordTableRules = new BitField(0x0100);
-        private static BitField  oldfTransparentMetafiles = new BitField(0x0200);
-        private static BitField  oldfShowBreaksInFrames = new BitField(0x0400);
-        private static BitField  oldfSwapBordersFacingPgs = new BitField(0x0800);
-        private static BitField  unused5 = new BitField(0xf000);
+        private static BitField  oldfNoTabForInd = BitFieldFactory.getInstance(0x0001);
+        private static BitField  oldfNoSpaceRaiseLower = BitFieldFactory.getInstance(0x0002);
+        private static BitField  oldfSuppressSpbfAfterPageBreak = BitFieldFactory.getInstance(0x0004);
+        private static BitField  oldfWrapTrailSpaces = BitFieldFactory.getInstance(0x0008);
+        private static BitField  oldfMapPrintTextColor = BitFieldFactory.getInstance(0x0010);
+        private static BitField  oldfNoColumnBalance = BitFieldFactory.getInstance(0x0020);
+        private static BitField  oldfConvMailMergeEsc = BitFieldFactory.getInstance(0x0040);
+        private static BitField  oldfSupressTopSpacing = BitFieldFactory.getInstance(0x0080);
+        private static BitField  oldfOrigWordTableRules = BitFieldFactory.getInstance(0x0100);
+        private static BitField  oldfTransparentMetafiles = BitFieldFactory.getInstance(0x0200);
+        private static BitField  oldfShowBreaksInFrames = BitFieldFactory.getInstance(0x0400);
+        private static BitField  oldfSwapBordersFacingPgs = BitFieldFactory.getInstance(0x0800);
+        private static BitField  unused5 = BitFieldFactory.getInstance(0xf000);
     private  int field_9_dxaTab;
     private  int field_10_wSpare;
     private  int field_11_dxaHotz;
@@ -106,16 +107,16 @@ public abstract class DOPAbstractType
     private  int field_21_cPg;
     private  int field_22_cParas;
     private  short field_23_Edn;
-        private static BitField  rncEdn = new BitField(0x0003);
-        private static BitField  nEdn = new BitField(0xfffc);
+        private static BitField  rncEdn = BitFieldFactory.getInstance(0x0003);
+        private static BitField  nEdn = BitFieldFactory.getInstance(0xfffc);
     private  short field_24_Edn1;
-        private static BitField  epc = new BitField(0x0003);
-        private static BitField  nfcFtnRef1 = new BitField(0x003c);
-        private static BitField  nfcEdnRef1 = new BitField(0x03c0);
-        private static BitField  fPrintFormData = new BitField(0x0400);
-        private static BitField  fSaveFormData = new BitField(0x0800);
-        private static BitField  fShadeFormData = new BitField(0x1000);
-        private static BitField  fWCFtnEdn = new BitField(0x8000);
+        private static BitField  epc = BitFieldFactory.getInstance(0x0003);
+        private static BitField  nfcFtnRef1 = BitFieldFactory.getInstance(0x003c);
+        private static BitField  nfcEdnRef1 = BitFieldFactory.getInstance(0x03c0);
+        private static BitField  fPrintFormData = BitFieldFactory.getInstance(0x0400);
+        private static BitField  fSaveFormData = BitFieldFactory.getInstance(0x0800);
+        private static BitField  fShadeFormData = BitFieldFactory.getInstance(0x1000);
+        private static BitField  fWCFtnEdn = BitFieldFactory.getInstance(0x8000);
     private  int field_25_cLines;
     private  int field_26_cWordsFtnEnd;
     private  int field_27_cChFtnEdn;
@@ -124,55 +125,55 @@ public abstract class DOPAbstractType
     private  int field_30_cLinesFtnEdn;
     private  int field_31_lKeyProtDoc;
     private  short field_32_view;
-        private static BitField  wvkSaved = new BitField(0x0007);
-        private static BitField  wScaleSaved = new BitField(0x0ff8);
-        private static BitField  zkSaved = new BitField(0x3000);
-        private static BitField  fRotateFontW6 = new BitField(0x4000);
-        private static BitField  iGutterPos = new BitField(0x8000);
+        private static BitField  wvkSaved = BitFieldFactory.getInstance(0x0007);
+        private static BitField  wScaleSaved = BitFieldFactory.getInstance(0x0ff8);
+        private static BitField  zkSaved = BitFieldFactory.getInstance(0x3000);
+        private static BitField  fRotateFontW6 = BitFieldFactory.getInstance(0x4000);
+        private static BitField  iGutterPos = BitFieldFactory.getInstance(0x8000);
     private  int field_33_docinfo4;
-        private static BitField  fNoTabForInd = new BitField(0x00000001);
-        private static BitField  fNoSpaceRaiseLower = new BitField(0x00000002);
-        private static BitField  fSupressSpdfAfterPageBreak = new BitField(0x00000004);
-        private static BitField  fWrapTrailSpaces = new BitField(0x00000008);
-        private static BitField  fMapPrintTextColor = new BitField(0x00000010);
-        private static BitField  fNoColumnBalance = new BitField(0x00000020);
-        private static BitField  fConvMailMergeEsc = new BitField(0x00000040);
-        private static BitField  fSupressTopSpacing = new BitField(0x00000080);
-        private static BitField  fOrigWordTableRules = new BitField(0x00000100);
-        private static BitField  fTransparentMetafiles = new BitField(0x00000200);
-        private static BitField  fShowBreaksInFrames = new BitField(0x00000400);
-        private static BitField  fSwapBordersFacingPgs = new BitField(0x00000800);
-        private static BitField  fSuppressTopSPacingMac5 = new BitField(0x00010000);
-        private static BitField  fTruncDxaExpand = new BitField(0x00020000);
-        private static BitField  fPrintBodyBeforeHdr = new BitField(0x00040000);
-        private static BitField  fNoLeading = new BitField(0x00080000);
-        private static BitField  fMWSmallCaps = new BitField(0x00200000);
+        private static BitField  fNoTabForInd = BitFieldFactory.getInstance(0x00000001);
+        private static BitField  fNoSpaceRaiseLower = BitFieldFactory.getInstance(0x00000002);
+        private static BitField  fSupressSpdfAfterPageBreak = BitFieldFactory.getInstance(0x00000004);
+        private static BitField  fWrapTrailSpaces = BitFieldFactory.getInstance(0x00000008);
+        private static BitField  fMapPrintTextColor = BitFieldFactory.getInstance(0x00000010);
+        private static BitField  fNoColumnBalance = BitFieldFactory.getInstance(0x00000020);
+        private static BitField  fConvMailMergeEsc = BitFieldFactory.getInstance(0x00000040);
+        private static BitField  fSupressTopSpacing = BitFieldFactory.getInstance(0x00000080);
+        private static BitField  fOrigWordTableRules = BitFieldFactory.getInstance(0x00000100);
+        private static BitField  fTransparentMetafiles = BitFieldFactory.getInstance(0x00000200);
+        private static BitField  fShowBreaksInFrames = BitFieldFactory.getInstance(0x00000400);
+        private static BitField  fSwapBordersFacingPgs = BitFieldFactory.getInstance(0x00000800);
+        private static BitField  fSuppressTopSPacingMac5 = BitFieldFactory.getInstance(0x00010000);
+        private static BitField  fTruncDxaExpand = BitFieldFactory.getInstance(0x00020000);
+        private static BitField  fPrintBodyBeforeHdr = BitFieldFactory.getInstance(0x00040000);
+        private static BitField  fNoLeading = BitFieldFactory.getInstance(0x00080000);
+        private static BitField  fMWSmallCaps = BitFieldFactory.getInstance(0x00200000);
     private  short field_34_adt;
     private  byte[] field_35_doptypography;
     private  byte[] field_36_dogrid;
     private  short field_37_docinfo5;
-        private static BitField  lvl = new BitField(0x001e);
-        private static BitField  fGramAllDone = new BitField(0x0020);
-        private static BitField  fGramAllClean = new BitField(0x0040);
-        private static BitField  fSubsetFonts = new BitField(0x0080);
-        private static BitField  fHideLastVersion = new BitField(0x0100);
-        private static BitField  fHtmlDoc = new BitField(0x0200);
-        private static BitField  fSnapBorder = new BitField(0x0800);
-        private static BitField  fIncludeHeader = new BitField(0x1000);
-        private static BitField  fIncludeFooter = new BitField(0x2000);
-        private static BitField  fForcePageSizePag = new BitField(0x4000);
-        private static BitField  fMinFontSizePag = new BitField(0x8000);
+        private static BitField  lvl = BitFieldFactory.getInstance(0x001e);
+        private static BitField  fGramAllDone = BitFieldFactory.getInstance(0x0020);
+        private static BitField  fGramAllClean = BitFieldFactory.getInstance(0x0040);
+        private static BitField  fSubsetFonts = BitFieldFactory.getInstance(0x0080);
+        private static BitField  fHideLastVersion = BitFieldFactory.getInstance(0x0100);
+        private static BitField  fHtmlDoc = BitFieldFactory.getInstance(0x0200);
+        private static BitField  fSnapBorder = BitFieldFactory.getInstance(0x0800);
+        private static BitField  fIncludeHeader = BitFieldFactory.getInstance(0x1000);
+        private static BitField  fIncludeFooter = BitFieldFactory.getInstance(0x2000);
+        private static BitField  fForcePageSizePag = BitFieldFactory.getInstance(0x4000);
+        private static BitField  fMinFontSizePag = BitFieldFactory.getInstance(0x8000);
     private  short field_38_docinfo6;
-        private static BitField  fHaveVersions = new BitField(0x0001);
-        private static BitField  fAutoVersions = new BitField(0x0002);
+        private static BitField  fHaveVersions = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fAutoVersions = BitFieldFactory.getInstance(0x0002);
     private  byte[] field_39_asumyi;
     private  int field_40_cChWS;
     private  int field_41_cChWSFtnEdn;
     private  int field_42_grfDocEvents;
     private  int field_43_virusinfo;
-        private static BitField  fVirusPrompted = new BitField(0x0001);
-        private static BitField  fVirusLoadSafe = new BitField(0x0002);
-        private static BitField  KeyVirusSession30 = new BitField(0xfffffffc);
+        private static BitField  fVirusPrompted = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fVirusLoadSafe = BitFieldFactory.getInstance(0x0002);
+        private static BitField  KeyVirusSession30 = BitFieldFactory.getInstance(0xfffffffc);
     private  byte[] field_44_Spare;
     private  int field_45_reserved1;
     private  int field_46_reserved2;
index b4cc870971fea765d938046d2de34f6c781feaa1..e6e6c91865aee331a56f6215c11b43bdf1587a1a 100644 (file)
@@ -22,6 +22,7 @@ package org.apache.poi.hdf.model.hdftypes.definitions;
 
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
@@ -44,29 +45,29 @@ public abstract class FIBAbstractType
     private  int field_4_lid;
     private  int field_5_pnNext;
     private  short field_6_options;
-        private static BitField  fDot = new BitField(0x0001);
-        private static BitField  fGlsy = new BitField(0x0002);
-        private static BitField  fComplex = new BitField(0x0004);
-        private static BitField  fHasPic = new BitField(0x0008);
-        private static BitField  cQuickSaves = new BitField(0x00F0);
-        private static BitField  fEncrypted = new BitField(0x0100);
-        private static BitField  fWhichTblStm = new BitField(0x0200);
-        private static BitField  fReadOnlyRecommended = new BitField(0x0400);
-        private static BitField  fWriteReservation = new BitField(0x0800);
-        private static BitField  fExtChar = new BitField(0x1000);
-        private static BitField  fLoadOverride = new BitField(0x2000);
-        private static BitField  fFarEast = new BitField(0x4000);
-        private static BitField  fCrypto = new BitField(0x8000);
+        private static BitField  fDot = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fGlsy = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fComplex = BitFieldFactory.getInstance(0x0004);
+        private static BitField  fHasPic = BitFieldFactory.getInstance(0x0008);
+        private static BitField  cQuickSaves = BitFieldFactory.getInstance(0x00F0);
+        private static BitField  fEncrypted = BitFieldFactory.getInstance(0x0100);
+        private static BitField  fWhichTblStm = BitFieldFactory.getInstance(0x0200);
+        private static BitField  fReadOnlyRecommended = BitFieldFactory.getInstance(0x0400);
+        private static BitField  fWriteReservation = BitFieldFactory.getInstance(0x0800);
+        private static BitField  fExtChar = BitFieldFactory.getInstance(0x1000);
+        private static BitField  fLoadOverride = BitFieldFactory.getInstance(0x2000);
+        private static BitField  fFarEast = BitFieldFactory.getInstance(0x4000);
+        private static BitField  fCrypto = BitFieldFactory.getInstance(0x8000);
     private  int field_7_nFibBack;
     private  int field_8_lKey;
     private  int field_9_envr;
     private  short field_10_history;
-        private static BitField  fMac = new BitField(0x0001);
-        private static BitField  fEmptySpecial = new BitField(0x0002);
-        private static BitField  fLoadOverridePage = new BitField(0x0004);
-        private static BitField  fFutureSavedUndo = new BitField(0x0008);
-        private static BitField  fWord97Saved = new BitField(0x0010);
-        private static BitField  fSpare0 = new BitField(0x00FE);
+        private static BitField  fMac = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fEmptySpecial = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fLoadOverridePage = BitFieldFactory.getInstance(0x0004);
+        private static BitField  fFutureSavedUndo = BitFieldFactory.getInstance(0x0008);
+        private static BitField  fWord97Saved = BitFieldFactory.getInstance(0x0010);
+        private static BitField  fSpare0 = BitFieldFactory.getInstance(0x00FE);
     private  int field_11_chs;
     private  int field_12_chsTables;
     private  int field_13_fcMin;
index 6c59b4ca18375e27665d76da4c07c07e5b8a1733..64bdb99fca17b684dcc01e967a7e6b1ec09891bd 100644 (file)
@@ -22,6 +22,7 @@ package org.apache.poi.hdf.model.hdftypes.definitions;
 
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
@@ -73,9 +74,9 @@ public abstract class PAPAbstractType
     private  byte field_33_fAutoSpaceDN;
     private  int field_34_wAlignFont;
     private  short field_35_fontAlign;
-        private static BitField  fVertical = new BitField(0x0001);
-        private static BitField  fBackward = new BitField(0x0002);
-        private static BitField  fRotateFont = new BitField(0x0004);
+        private static BitField  fVertical = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fBackward = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fRotateFont = BitFieldFactory.getInstance(0x0004);
     private  byte field_36_fBackward;
     private  byte field_37_fRotateFont;
     private  byte field_38_fInTable;
index b21c261d4b0a7f953568848ead58cd0b564981e5..56281d799a17e0774da9e3e0c692c8845c4a0731 100644 (file)
@@ -22,6 +22,7 @@ package org.apache.poi.hdf.model.hdftypes.definitions;
 
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
@@ -39,14 +40,14 @@ public abstract class TCAbstractType
 {
 
     private  short field_1_rgf;
-        private static BitField  fFirstMerged = new BitField(0x0001);
-        private static BitField  fMerged = new BitField(0x0002);
-        private static BitField  fVertical = new BitField(0x0004);
-        private static BitField  fBackward = new BitField(0x0008);
-        private static BitField  fRotateFont = new BitField(0x0010);
-        private static BitField  fVertMerge = new BitField(0x0020);
-        private static BitField  fVertRestart = new BitField(0x0040);
-        private static BitField  vertAlign = new BitField(0x0180);
+        private static BitField  fFirstMerged = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fMerged = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fVertical = BitFieldFactory.getInstance(0x0004);
+        private static BitField  fBackward = BitFieldFactory.getInstance(0x0008);
+        private static BitField  fRotateFont = BitFieldFactory.getInstance(0x0010);
+        private static BitField  fVertMerge = BitFieldFactory.getInstance(0x0020);
+        private static BitField  fVertRestart = BitFieldFactory.getInstance(0x0040);
+        private static BitField  vertAlign = BitFieldFactory.getInstance(0x0180);
     private  short field_2_unused;
     private  short[] field_3_brcTop;
     private  short[] field_4_brcLeft;
index 7d0966cb413289a71ac2584199278304bd20b557..dde2f6e54ef69967644ffe4ecb65e49f1aa74387 100644 (file)
@@ -19,6 +19,7 @@
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import java.util.Arrays;
 
@@ -33,9 +34,9 @@ public class Ffn
 {
   private int _cbFfnM1;//total length of FFN - 1.
   private byte _info;
-    private static BitField _prq = new BitField(0x0003);// pitch request
-    private static BitField _fTrueType = new BitField(0x0004);// when 1, font is a TrueType font
-    private static BitField _ff = new BitField(0x0070);
+    private static BitField _prq = BitFieldFactory.getInstance(0x0003);// pitch request
+    private static BitField _fTrueType = BitFieldFactory.getInstance(0x0004);// when 1, font is a TrueType font
+    private static BitField _ff = BitFieldFactory.getInstance(0x0070);
   private short _wWeight;// base weight of font
   private byte _chs;// character set identifier
   private byte _ixchSzAlt;  // index into ffn.szFfn to the name of
index ae088278c94bec866172a86e834a62484cc3bbd0..cae3257667d450483ed72a0b480208f454667b69 100644 (file)
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 
 public class FieldDescriptor
 {
   byte _fieldBoundaryType;
   byte _info;
-    private final static BitField fZombieEmbed = new BitField(0x02);
-    private final static BitField fResultDiry = new BitField(0x04);
-    private final static BitField fResultEdited = new BitField(0x08);
-    private final static BitField fLocked = new BitField(0x10);
-    private final static BitField fPrivateResult = new BitField(0x20);
-    private final static BitField fNested = new BitField(0x40);
-    private final static BitField fHasSep = new BitField(0x80);
+    private final static BitField fZombieEmbed = BitFieldFactory.getInstance(0x02);
+    private final static BitField fResultDiry = BitFieldFactory.getInstance(0x04);
+    private final static BitField fResultEdited = BitFieldFactory.getInstance(0x08);
+    private final static BitField fLocked = BitFieldFactory.getInstance(0x10);
+    private final static BitField fPrivateResult = BitFieldFactory.getInstance(0x20);
+    private final static BitField fNested = BitFieldFactory.getInstance(0x40);
+    private final static BitField fHasSep = BitFieldFactory.getInstance(0x80);
 
 
   public FieldDescriptor()
index 16e008dde5ab59e9627cb8915fa52d6e7f32fbd5..8cdaf055aefdbcf896991ec61434b82978dd6618 100644 (file)
@@ -19,6 +19,7 @@
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 
 import java.util.Arrays;
@@ -29,8 +30,8 @@ public class ListData
   private int _tplc;
   private short[] _rgistd;
   private byte _info;
-    private static BitField _fSimpleList = new BitField(0x1);
-    private static BitField _fRestartHdn = new BitField(0x2);
+    private static BitField _fSimpleList = BitFieldFactory.getInstance(0x1);
+    private static BitField _fRestartHdn = BitFieldFactory.getInstance(0x2);
   private byte _reserved;
   ListLevel[] _levels;
 
index 65acf13a0651f1a6c28c0d2a8e323676473f7bfc..eb39382867fd1c9637c46604e5ab8c2b6c723d26 100644 (file)
@@ -20,6 +20,7 @@ package org.apache.poi.hwpf.model;
 
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 
 import java.util.Arrays;
 
@@ -29,9 +30,9 @@ public class ListFormatOverrideLevel
 
   int _iStartAt;
   byte _info;
-   private static BitField _ilvl = new BitField(0xf);
-   private static BitField _fStartAt = new BitField(0x10);
-   private static BitField _fFormatting = new BitField(0x20);
+   private static BitField _ilvl = BitFieldFactory.getInstance(0xf);
+   private static BitField _fStartAt = BitFieldFactory.getInstance(0x10);
+   private static BitField _fFormatting = BitFieldFactory.getInstance(0x20);
   byte[] _reserved = new byte[3];
   ListLevel _lvl;
 
index 656e2ba9bb0cb30b5214fed8a86c9d6be732d8a4..79fdbb06a5020894c3ba8a89f03caacd28acef43 100644 (file)
@@ -23,15 +23,16 @@ import java.io.OutputStream;
 import java.io.IOException;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 
 public class ParagraphHeight
 {
   private short infoField;
-    private BitField fSpare = new BitField(0x0001);
-    private BitField fUnk = new BitField(0x0002);
-    private BitField fDiffLines = new BitField(0x0004);
-    private BitField clMac = new BitField(0xff00);
+    private BitField fSpare = BitFieldFactory.getInstance(0x0001);
+    private BitField fUnk = BitFieldFactory.getInstance(0x0002);
+    private BitField fDiffLines = BitFieldFactory.getInstance(0x0004);
+    private BitField clMac = BitFieldFactory.getInstance(0xff00);
   private short reserved;
   private int dxaCol;
   private int dymLineOrHeight;
index 02ca85ae3b3a049aa1e1fb1e953ba6ec99db5cae..16ccd589b26ade143224b803fea33a3f71f208ad 100644 (file)
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 
 public class PieceDescriptor
 {
 
   short descriptor;
-   private static BitField fNoParaLast = new BitField(0x01);
-   private static BitField fPaphNil = new BitField(0x02);
-   private static BitField fCopied = new BitField(0x04);
+   private static BitField fNoParaLast = BitFieldFactory.getInstance(0x01);
+   private static BitField fPaphNil = BitFieldFactory.getInstance(0x02);
+   private static BitField fCopied = BitFieldFactory.getInstance(0x04);
   int fc;
   short prm;
   boolean unicode;
index aa33072f3a941538f32a254d604009c4f1d91633..1f53ec32ea76cc4513e4fdead6582f8996bd321c 100644 (file)
@@ -26,6 +26,7 @@ import org.apache.poi.hwpf.usermodel.CharacterProperties;
 import org.apache.poi.hwpf.usermodel.ParagraphProperties;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 /**
  * Comment me
  *
@@ -41,21 +42,21 @@ public class StyleDescription implements HDFType
   private int _istd;
   private int _baseLength;
   private short _infoShort;
-    private static BitField _sti = new BitField(0xfff);
-    private static BitField _fScratch = new BitField(0x1000);
-    private static BitField _fInvalHeight = new BitField(0x2000);
-    private static BitField _fHasUpe = new BitField(0x4000);
-    private static BitField _fMassCopy = new BitField(0x8000);
+    private static BitField _sti = BitFieldFactory.getInstance(0xfff);
+    private static BitField _fScratch = BitFieldFactory.getInstance(0x1000);
+    private static BitField _fInvalHeight = BitFieldFactory.getInstance(0x2000);
+    private static BitField _fHasUpe = BitFieldFactory.getInstance(0x4000);
+    private static BitField _fMassCopy = BitFieldFactory.getInstance(0x8000);
   private short _infoShort2;
-    private static BitField _styleTypeCode = new BitField(0xf);
-    private static BitField _baseStyle = new BitField(0xfff0);
+    private static BitField _styleTypeCode = BitFieldFactory.getInstance(0xf);
+    private static BitField _baseStyle = BitFieldFactory.getInstance(0xfff0);
   private short _infoShort3;
-    private static BitField _numUPX = new BitField(0xf);
-    private static BitField _nextStyle = new BitField(0xfff0);
+    private static BitField _numUPX = BitFieldFactory.getInstance(0xf);
+    private static BitField _nextStyle = BitFieldFactory.getInstance(0xfff0);
   private short _bchUpe;
   private short _infoShort4;
-    private static BitField _fAutoRedef = new BitField(0x1);
-    private static BitField _fHidden = new BitField(0x2);
+    private static BitField _fAutoRedef = BitFieldFactory.getInstance(0x1);
+    private static BitField _fHidden = BitFieldFactory.getInstance(0x2);
 
   UPX[] _upxs;
   String _name;
index 887c302c2f8f9b19e374904ecd57215194c69f17..b3c512341866f4246d503205bfd5a61bd2476747 100644 (file)
@@ -22,6 +22,7 @@ package org.apache.poi.hwpf.model.types;
 
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
@@ -41,27 +42,27 @@ public abstract class CHPAbstractType
 
     protected  short field_1_chse;
     protected  int field_2_format_flags;
-        private static BitField  fBold = new BitField(0x0001);
-        private static BitField  fItalic = new BitField(0x0002);
-        private static BitField  fRMarkDel = new BitField(0x0004);
-        private static BitField  fOutline = new BitField(0x0008);
-        private static BitField  fFldVanish = new BitField(0x0010);
-        private static BitField  fSmallCaps = new BitField(0x0020);
-        private static BitField  fCaps = new BitField(0x0040);
-        private static BitField  fVanish = new BitField(0x0080);
-        private static BitField  fRMark = new BitField(0x0100);
-        private static BitField  fSpec = new BitField(0x0200);
-        private static BitField  fStrike = new BitField(0x0400);
-        private static BitField  fObj = new BitField(0x0800);
-        private static BitField  fShadow = new BitField(0x1000);
-        private static BitField  fLowerCase = new BitField(0x2000);
-        private static BitField  fData = new BitField(0x4000);
-        private static BitField  fOle2 = new BitField(0x8000);
+        private static BitField  fBold = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fItalic = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fRMarkDel = BitFieldFactory.getInstance(0x0004);
+        private static BitField  fOutline = BitFieldFactory.getInstance(0x0008);
+        private static BitField  fFldVanish = BitFieldFactory.getInstance(0x0010);
+        private static BitField  fSmallCaps = BitFieldFactory.getInstance(0x0020);
+        private static BitField  fCaps = BitFieldFactory.getInstance(0x0040);
+        private static BitField  fVanish = BitFieldFactory.getInstance(0x0080);
+        private static BitField  fRMark = BitFieldFactory.getInstance(0x0100);
+        private static BitField  fSpec = BitFieldFactory.getInstance(0x0200);
+        private static BitField  fStrike = BitFieldFactory.getInstance(0x0400);
+        private static BitField  fObj = BitFieldFactory.getInstance(0x0800);
+        private static BitField  fShadow = BitFieldFactory.getInstance(0x1000);
+        private static BitField  fLowerCase = BitFieldFactory.getInstance(0x2000);
+        private static BitField  fData = BitFieldFactory.getInstance(0x4000);
+        private static BitField  fOle2 = BitFieldFactory.getInstance(0x8000);
     protected  int field_3_format_flags1;
-        private static BitField  fEmboss = new BitField(0x0001);
-        private static BitField  fImprint = new BitField(0x0002);
-        private static BitField  fDStrike = new BitField(0x0004);
-        private static BitField  fUsePgsuSettings = new BitField(0x0008);
+        private static BitField  fEmboss = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fImprint = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fDStrike = BitFieldFactory.getInstance(0x0004);
+        private static BitField  fUsePgsuSettings = BitFieldFactory.getInstance(0x0008);
     protected  int field_4_ftcAscii;
     protected  int field_5_ftcFE;
     protected  int field_6_ftcOther;
@@ -92,13 +93,13 @@ public abstract class CHPAbstractType
     protected  byte field_31_chYsr;
     protected  int field_32_hpsKern;
     protected  short field_33_Highlight;
-        private static BitField  icoHighlight = new BitField(0x001f);
-        private static BitField  fHighlight = new BitField(0x0020);
-        private static BitField  kcd = new BitField(0x01c0);
-        private static BitField  fNavHighlight = new BitField(0x0200);
-        private static BitField  fChsDiff = new BitField(0x0400);
-        private static BitField  fMacChs = new BitField(0x0800);
-        private static BitField  fFtcAsciSym = new BitField(0x1000);
+        private static BitField  icoHighlight = BitFieldFactory.getInstance(0x001f);
+        private static BitField  fHighlight = BitFieldFactory.getInstance(0x0020);
+        private static BitField  kcd = BitFieldFactory.getInstance(0x01c0);
+        private static BitField  fNavHighlight = BitFieldFactory.getInstance(0x0200);
+        private static BitField  fChsDiff = BitFieldFactory.getInstance(0x0400);
+        private static BitField  fMacChs = BitFieldFactory.getInstance(0x0800);
+        private static BitField  fFtcAsciSym = BitFieldFactory.getInstance(0x1000);
     protected  short field_34_fPropMark;
     protected  int field_35_ibstPropRMark;
     protected  DateAndTime field_36_dttmPropRMark;
index 676c4c09f13a02c4130d14f200fc150bb9240bd8..eb0a23d97e1ec76b3234d7d8e3383e42e84ba3fc 100644 (file)
@@ -22,6 +22,7 @@ package org.apache.poi.hwpf.model.types;
 
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
@@ -40,58 +41,58 @@ public abstract class DOPAbstractType
 {
 
     protected  byte field_1_formatFlags;
-        private static BitField  fFacingPages = new BitField(0x01);
-        private static BitField  fWidowControl = new BitField(0x02);
-        private static BitField  fPMHMainDoc = new BitField(0x04);
-        private static BitField  grfSupression = new BitField(0x18);
-        private static BitField  fpc = new BitField(0x60);
-        private static BitField  unused1 = new BitField(0x80);
+        private static BitField  fFacingPages = BitFieldFactory.getInstance(0x01);
+        private static BitField  fWidowControl = BitFieldFactory.getInstance(0x02);
+        private static BitField  fPMHMainDoc = BitFieldFactory.getInstance(0x04);
+        private static BitField  grfSupression = BitFieldFactory.getInstance(0x18);
+        private static BitField  fpc = BitFieldFactory.getInstance(0x60);
+        private static BitField  unused1 = BitFieldFactory.getInstance(0x80);
     protected  byte field_2_unused2;
     protected  short field_3_footnoteInfo;
-        private static BitField  rncFtn = new BitField(0x0003);
-        private static BitField  nFtn = new BitField(0xfffc);
+        private static BitField  rncFtn = BitFieldFactory.getInstance(0x0003);
+        private static BitField  nFtn = BitFieldFactory.getInstance(0xfffc);
     protected  byte field_4_fOutlineDirtySave;
     protected  byte field_5_docinfo;
-        private static BitField  fOnlyMacPics = new BitField(0x01);
-        private static BitField  fOnlyWinPics = new BitField(0x02);
-        private static BitField  fLabelDoc = new BitField(0x04);
-        private static BitField  fHyphCapitals = new BitField(0x08);
-        private static BitField  fAutoHyphen = new BitField(0x10);
-        private static BitField  fFormNoFields = new BitField(0x20);
-        private static BitField  fLinkStyles = new BitField(0x40);
-        private static BitField  fRevMarking = new BitField(0x80);
+        private static BitField  fOnlyMacPics = BitFieldFactory.getInstance(0x01);
+        private static BitField  fOnlyWinPics = BitFieldFactory.getInstance(0x02);
+        private static BitField  fLabelDoc = BitFieldFactory.getInstance(0x04);
+        private static BitField  fHyphCapitals = BitFieldFactory.getInstance(0x08);
+        private static BitField  fAutoHyphen = BitFieldFactory.getInstance(0x10);
+        private static BitField  fFormNoFields = BitFieldFactory.getInstance(0x20);
+        private static BitField  fLinkStyles = BitFieldFactory.getInstance(0x40);
+        private static BitField  fRevMarking = BitFieldFactory.getInstance(0x80);
     protected  byte field_6_docinfo1;
-        private static BitField  fBackup = new BitField(0x01);
-        private static BitField  fExactCWords = new BitField(0x02);
-        private static BitField  fPagHidden = new BitField(0x04);
-        private static BitField  fPagResults = new BitField(0x08);
-        private static BitField  fLockAtn = new BitField(0x10);
-        private static BitField  fMirrorMargins = new BitField(0x20);
-        private static BitField  unused3 = new BitField(0x40);
-        private static BitField  fDfltTrueType = new BitField(0x80);
+        private static BitField  fBackup = BitFieldFactory.getInstance(0x01);
+        private static BitField  fExactCWords = BitFieldFactory.getInstance(0x02);
+        private static BitField  fPagHidden = BitFieldFactory.getInstance(0x04);
+        private static BitField  fPagResults = BitFieldFactory.getInstance(0x08);
+        private static BitField  fLockAtn = BitFieldFactory.getInstance(0x10);
+        private static BitField  fMirrorMargins = BitFieldFactory.getInstance(0x20);
+        private static BitField  unused3 = BitFieldFactory.getInstance(0x40);
+        private static BitField  fDfltTrueType = BitFieldFactory.getInstance(0x80);
     protected  byte field_7_docinfo2;
-        private static BitField  fPagSupressTopSpacing = new BitField(0x01);
-        private static BitField  fProtEnabled = new BitField(0x02);
-        private static BitField  fDispFormFldSel = new BitField(0x04);
-        private static BitField  fRMView = new BitField(0x08);
-        private static BitField  fRMPrint = new BitField(0x10);
-        private static BitField  unused4 = new BitField(0x20);
-        private static BitField  fLockRev = new BitField(0x40);
-        private static BitField  fEmbedFonts = new BitField(0x80);
+        private static BitField  fPagSupressTopSpacing = BitFieldFactory.getInstance(0x01);
+        private static BitField  fProtEnabled = BitFieldFactory.getInstance(0x02);
+        private static BitField  fDispFormFldSel = BitFieldFactory.getInstance(0x04);
+        private static BitField  fRMView = BitFieldFactory.getInstance(0x08);
+        private static BitField  fRMPrint = BitFieldFactory.getInstance(0x10);
+        private static BitField  unused4 = BitFieldFactory.getInstance(0x20);
+        private static BitField  fLockRev = BitFieldFactory.getInstance(0x40);
+        private static BitField  fEmbedFonts = BitFieldFactory.getInstance(0x80);
     protected  short field_8_docinfo3;
-        private static BitField  oldfNoTabForInd = new BitField(0x0001);
-        private static BitField  oldfNoSpaceRaiseLower = new BitField(0x0002);
-        private static BitField  oldfSuppressSpbfAfterPageBreak = new BitField(0x0004);
-        private static BitField  oldfWrapTrailSpaces = new BitField(0x0008);
-        private static BitField  oldfMapPrintTextColor = new BitField(0x0010);
-        private static BitField  oldfNoColumnBalance = new BitField(0x0020);
-        private static BitField  oldfConvMailMergeEsc = new BitField(0x0040);
-        private static BitField  oldfSupressTopSpacing = new BitField(0x0080);
-        private static BitField  oldfOrigWordTableRules = new BitField(0x0100);
-        private static BitField  oldfTransparentMetafiles = new BitField(0x0200);
-        private static BitField  oldfShowBreaksInFrames = new BitField(0x0400);
-        private static BitField  oldfSwapBordersFacingPgs = new BitField(0x0800);
-        private static BitField  unused5 = new BitField(0xf000);
+        private static BitField  oldfNoTabForInd = BitFieldFactory.getInstance(0x0001);
+        private static BitField  oldfNoSpaceRaiseLower = BitFieldFactory.getInstance(0x0002);
+        private static BitField  oldfSuppressSpbfAfterPageBreak = BitFieldFactory.getInstance(0x0004);
+        private static BitField  oldfWrapTrailSpaces = BitFieldFactory.getInstance(0x0008);
+        private static BitField  oldfMapPrintTextColor = BitFieldFactory.getInstance(0x0010);
+        private static BitField  oldfNoColumnBalance = BitFieldFactory.getInstance(0x0020);
+        private static BitField  oldfConvMailMergeEsc = BitFieldFactory.getInstance(0x0040);
+        private static BitField  oldfSupressTopSpacing = BitFieldFactory.getInstance(0x0080);
+        private static BitField  oldfOrigWordTableRules = BitFieldFactory.getInstance(0x0100);
+        private static BitField  oldfTransparentMetafiles = BitFieldFactory.getInstance(0x0200);
+        private static BitField  oldfShowBreaksInFrames = BitFieldFactory.getInstance(0x0400);
+        private static BitField  oldfSwapBordersFacingPgs = BitFieldFactory.getInstance(0x0800);
+        private static BitField  unused5 = BitFieldFactory.getInstance(0xf000);
     protected  int field_9_dxaTab;
     protected  int field_10_wSpare;
     protected  int field_11_dxaHotz;
@@ -107,16 +108,16 @@ public abstract class DOPAbstractType
     protected  int field_21_cPg;
     protected  int field_22_cParas;
     protected  short field_23_Edn;
-        private static BitField  rncEdn = new BitField(0x0003);
-        private static BitField  nEdn = new BitField(0xfffc);
+        private static BitField  rncEdn = BitFieldFactory.getInstance(0x0003);
+        private static BitField  nEdn = BitFieldFactory.getInstance(0xfffc);
     protected  short field_24_Edn1;
-        private static BitField  epc = new BitField(0x0003);
-        private static BitField  nfcFtnRef1 = new BitField(0x003c);
-        private static BitField  nfcEdnRef1 = new BitField(0x03c0);
-        private static BitField  fPrintFormData = new BitField(0x0400);
-        private static BitField  fSaveFormData = new BitField(0x0800);
-        private static BitField  fShadeFormData = new BitField(0x1000);
-        private static BitField  fWCFtnEdn = new BitField(0x8000);
+        private static BitField  epc = BitFieldFactory.getInstance(0x0003);
+        private static BitField  nfcFtnRef1 = BitFieldFactory.getInstance(0x003c);
+        private static BitField  nfcEdnRef1 = BitFieldFactory.getInstance(0x03c0);
+        private static BitField  fPrintFormData = BitFieldFactory.getInstance(0x0400);
+        private static BitField  fSaveFormData = BitFieldFactory.getInstance(0x0800);
+        private static BitField  fShadeFormData = BitFieldFactory.getInstance(0x1000);
+        private static BitField  fWCFtnEdn = BitFieldFactory.getInstance(0x8000);
     protected  int field_25_cLines;
     protected  int field_26_cWordsFtnEnd;
     protected  int field_27_cChFtnEdn;
@@ -125,55 +126,55 @@ public abstract class DOPAbstractType
     protected  int field_30_cLinesFtnEdn;
     protected  int field_31_lKeyProtDoc;
     protected  short field_32_view;
-        private static BitField  wvkSaved = new BitField(0x0007);
-        private static BitField  wScaleSaved = new BitField(0x0ff8);
-        private static BitField  zkSaved = new BitField(0x3000);
-        private static BitField  fRotateFontW6 = new BitField(0x4000);
-        private static BitField  iGutterPos = new BitField(0x8000);
+        private static BitField  wvkSaved = BitFieldFactory.getInstance(0x0007);
+        private static BitField  wScaleSaved = BitFieldFactory.getInstance(0x0ff8);
+        private static BitField  zkSaved = BitFieldFactory.getInstance(0x3000);
+        private static BitField  fRotateFontW6 = BitFieldFactory.getInstance(0x4000);
+        private static BitField  iGutterPos = BitFieldFactory.getInstance(0x8000);
     protected  int field_33_docinfo4;
-        private static BitField  fNoTabForInd = new BitField(0x00000001);
-        private static BitField  fNoSpaceRaiseLower = new BitField(0x00000002);
-        private static BitField  fSupressSpdfAfterPageBreak = new BitField(0x00000004);
-        private static BitField  fWrapTrailSpaces = new BitField(0x00000008);
-        private static BitField  fMapPrintTextColor = new BitField(0x00000010);
-        private static BitField  fNoColumnBalance = new BitField(0x00000020);
-        private static BitField  fConvMailMergeEsc = new BitField(0x00000040);
-        private static BitField  fSupressTopSpacing = new BitField(0x00000080);
-        private static BitField  fOrigWordTableRules = new BitField(0x00000100);
-        private static BitField  fTransparentMetafiles = new BitField(0x00000200);
-        private static BitField  fShowBreaksInFrames = new BitField(0x00000400);
-        private static BitField  fSwapBordersFacingPgs = new BitField(0x00000800);
-        private static BitField  fSuppressTopSPacingMac5 = new BitField(0x00010000);
-        private static BitField  fTruncDxaExpand = new BitField(0x00020000);
-        private static BitField  fPrintBodyBeforeHdr = new BitField(0x00040000);
-        private static BitField  fNoLeading = new BitField(0x00080000);
-        private static BitField  fMWSmallCaps = new BitField(0x00200000);
+        private static BitField  fNoTabForInd = BitFieldFactory.getInstance(0x00000001);
+        private static BitField  fNoSpaceRaiseLower = BitFieldFactory.getInstance(0x00000002);
+        private static BitField  fSupressSpdfAfterPageBreak = BitFieldFactory.getInstance(0x00000004);
+        private static BitField  fWrapTrailSpaces = BitFieldFactory.getInstance(0x00000008);
+        private static BitField  fMapPrintTextColor = BitFieldFactory.getInstance(0x00000010);
+        private static BitField  fNoColumnBalance = BitFieldFactory.getInstance(0x00000020);
+        private static BitField  fConvMailMergeEsc = BitFieldFactory.getInstance(0x00000040);
+        private static BitField  fSupressTopSpacing = BitFieldFactory.getInstance(0x00000080);
+        private static BitField  fOrigWordTableRules = BitFieldFactory.getInstance(0x00000100);
+        private static BitField  fTransparentMetafiles = BitFieldFactory.getInstance(0x00000200);
+        private static BitField  fShowBreaksInFrames = BitFieldFactory.getInstance(0x00000400);
+        private static BitField  fSwapBordersFacingPgs = BitFieldFactory.getInstance(0x00000800);
+        private static BitField  fSuppressTopSPacingMac5 = BitFieldFactory.getInstance(0x00010000);
+        private static BitField  fTruncDxaExpand = BitFieldFactory.getInstance(0x00020000);
+        private static BitField  fPrintBodyBeforeHdr = BitFieldFactory.getInstance(0x00040000);
+        private static BitField  fNoLeading = BitFieldFactory.getInstance(0x00080000);
+        private static BitField  fMWSmallCaps = BitFieldFactory.getInstance(0x00200000);
     protected  short field_34_adt;
     protected  byte[] field_35_doptypography;
     protected  byte[] field_36_dogrid;
     protected  short field_37_docinfo5;
-        private static BitField  lvl = new BitField(0x001e);
-        private static BitField  fGramAllDone = new BitField(0x0020);
-        private static BitField  fGramAllClean = new BitField(0x0040);
-        private static BitField  fSubsetFonts = new BitField(0x0080);
-        private static BitField  fHideLastVersion = new BitField(0x0100);
-        private static BitField  fHtmlDoc = new BitField(0x0200);
-        private static BitField  fSnapBorder = new BitField(0x0800);
-        private static BitField  fIncludeHeader = new BitField(0x1000);
-        private static BitField  fIncludeFooter = new BitField(0x2000);
-        private static BitField  fForcePageSizePag = new BitField(0x4000);
-        private static BitField  fMinFontSizePag = new BitField(0x8000);
+        private static BitField  lvl = BitFieldFactory.getInstance(0x001e);
+        private static BitField  fGramAllDone = BitFieldFactory.getInstance(0x0020);
+        private static BitField  fGramAllClean = BitFieldFactory.getInstance(0x0040);
+        private static BitField  fSubsetFonts = BitFieldFactory.getInstance(0x0080);
+        private static BitField  fHideLastVersion = BitFieldFactory.getInstance(0x0100);
+        private static BitField  fHtmlDoc = BitFieldFactory.getInstance(0x0200);
+        private static BitField  fSnapBorder = BitFieldFactory.getInstance(0x0800);
+        private static BitField  fIncludeHeader = BitFieldFactory.getInstance(0x1000);
+        private static BitField  fIncludeFooter = BitFieldFactory.getInstance(0x2000);
+        private static BitField  fForcePageSizePag = BitFieldFactory.getInstance(0x4000);
+        private static BitField  fMinFontSizePag = BitFieldFactory.getInstance(0x8000);
     protected  short field_38_docinfo6;
-        private static BitField  fHaveVersions = new BitField(0x0001);
-        private static BitField  fAutoVersions = new BitField(0x0002);
+        private static BitField  fHaveVersions = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fAutoVersions = BitFieldFactory.getInstance(0x0002);
     protected  byte[] field_39_asumyi;
     protected  int field_40_cChWS;
     protected  int field_41_cChWSFtnEdn;
     protected  int field_42_grfDocEvents;
     protected  int field_43_virusinfo;
-        private static BitField  fVirusPrompted = new BitField(0x0001);
-        private static BitField  fVirusLoadSafe = new BitField(0x0002);
-        private static BitField  KeyVirusSession30 = new BitField(0xfffffffc);
+        private static BitField  fVirusPrompted = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fVirusLoadSafe = BitFieldFactory.getInstance(0x0002);
+        private static BitField  KeyVirusSession30 = BitFieldFactory.getInstance(0xfffffffc);
     protected  byte[] field_44_Spare;
     protected  int field_45_reserved1;
     protected  int field_46_reserved2;
index e12362186449e447c30ad1df83bfd2e73b314d93..3f0a563c302f6d996ade01cbadef58f807f835db 100644 (file)
@@ -22,6 +22,7 @@ package org.apache.poi.hwpf.model.types;
 
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
@@ -45,29 +46,29 @@ public abstract class FIBAbstractType
     protected  int field_4_lid;
     protected  int field_5_pnNext;
     protected  short field_6_options;
-        private static BitField  fDot = new BitField(0x0001);
-        private static BitField  fGlsy = new BitField(0x0002);
-        private static BitField  fComplex = new BitField(0x0004);
-        private static BitField  fHasPic = new BitField(0x0008);
-        private static BitField  cQuickSaves = new BitField(0x00F0);
-        private static BitField  fEncrypted = new BitField(0x0100);
-        private static BitField  fWhichTblStm = new BitField(0x0200);
-        private static BitField  fReadOnlyRecommended = new BitField(0x0400);
-        private static BitField  fWriteReservation = new BitField(0x0800);
-        private static BitField  fExtChar = new BitField(0x1000);
-        private static BitField  fLoadOverride = new BitField(0x2000);
-        private static BitField  fFarEast = new BitField(0x4000);
-        private static BitField  fCrypto = new BitField(0x8000);
+        private static BitField  fDot = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fGlsy = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fComplex = BitFieldFactory.getInstance(0x0004);
+        private static BitField  fHasPic = BitFieldFactory.getInstance(0x0008);
+        private static BitField  cQuickSaves = BitFieldFactory.getInstance(0x00F0);
+        private static BitField  fEncrypted = BitFieldFactory.getInstance(0x0100);
+        private static BitField  fWhichTblStm = BitFieldFactory.getInstance(0x0200);
+        private static BitField  fReadOnlyRecommended = BitFieldFactory.getInstance(0x0400);
+        private static BitField  fWriteReservation = BitFieldFactory.getInstance(0x0800);
+        private static BitField  fExtChar = BitFieldFactory.getInstance(0x1000);
+        private static BitField  fLoadOverride = BitFieldFactory.getInstance(0x2000);
+        private static BitField  fFarEast = BitFieldFactory.getInstance(0x4000);
+        private static BitField  fCrypto = BitFieldFactory.getInstance(0x8000);
     protected  int field_7_nFibBack;
     protected  int field_8_lKey;
     protected  int field_9_envr;
     protected  short field_10_history;
-        private static BitField  fMac = new BitField(0x0001);
-        private static BitField  fEmptySpecial = new BitField(0x0002);
-        private static BitField  fLoadOverridePage = new BitField(0x0004);
-        private static BitField  fFutureSavedUndo = new BitField(0x0008);
-        private static BitField  fWord97Saved = new BitField(0x0010);
-        private static BitField  fSpare0 = new BitField(0x00FE);
+        private static BitField  fMac = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fEmptySpecial = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fLoadOverridePage = BitFieldFactory.getInstance(0x0004);
+        private static BitField  fFutureSavedUndo = BitFieldFactory.getInstance(0x0008);
+        private static BitField  fWord97Saved = BitFieldFactory.getInstance(0x0010);
+        private static BitField  fSpare0 = BitFieldFactory.getInstance(0x00FE);
     protected  int field_11_chs;
     protected  int field_12_chsTables;
     protected  int field_13_fcMin;
index f1aed0b8fb896f1986f08c2a6628c8f3f425301f..a0f13a6b9e8f5bae6129eead0669d2e283b466f1 100644 (file)
@@ -22,6 +22,7 @@ package org.apache.poi.hwpf.model.types;
 
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
@@ -74,9 +75,9 @@ public abstract class PAPAbstractType
     protected  byte field_33_fAutoSpaceDN;
     protected  int field_34_wAlignFont;
     protected  short field_35_fontAlign;
-        private static BitField  fVertical = new BitField(0x0001);
-        private static BitField  fBackward = new BitField(0x0002);
-        private static BitField  fRotateFont = new BitField(0x0004);
+        private static BitField  fVertical = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fBackward = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fRotateFont = BitFieldFactory.getInstance(0x0004);
     protected  byte field_36_fBackward;
     protected  byte field_37_fRotateFont;
     protected  byte field_38_fInTable;
index ee2791b6cf48eba2eb5e46afc9a009fc204ab998..27945c6c09bfc7db45b9230c7c83085d3648096a 100644 (file)
@@ -22,6 +22,7 @@ package org.apache.poi.hwpf.model.types;
 
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
@@ -40,14 +41,14 @@ public abstract class TCAbstractType
 {
 
     protected  short field_1_rgf;
-        private static BitField  fFirstMerged = new BitField(0x0001);
-        private static BitField  fMerged = new BitField(0x0002);
-        private static BitField  fVertical = new BitField(0x0004);
-        private static BitField  fBackward = new BitField(0x0008);
-        private static BitField  fRotateFont = new BitField(0x0010);
-        private static BitField  fVertMerge = new BitField(0x0020);
-        private static BitField  fVertRestart = new BitField(0x0040);
-        private static BitField  vertAlign = new BitField(0x0180);
+        private static BitField  fFirstMerged = BitFieldFactory.getInstance(0x0001);
+        private static BitField  fMerged = BitFieldFactory.getInstance(0x0002);
+        private static BitField  fVertical = BitFieldFactory.getInstance(0x0004);
+        private static BitField  fBackward = BitFieldFactory.getInstance(0x0008);
+        private static BitField  fRotateFont = BitFieldFactory.getInstance(0x0010);
+        private static BitField  fVertMerge = BitFieldFactory.getInstance(0x0020);
+        private static BitField  fVertRestart = BitFieldFactory.getInstance(0x0040);
+        private static BitField  vertAlign = BitFieldFactory.getInstance(0x0180);
     protected  short field_2_unused;
     protected  BorderCode field_3_brcTop;
     protected  BorderCode field_4_brcLeft;
index b769fe4ee4c73f1f796698529cab697d65364dff..95b60017cfe140d7cbc3284123a149aa65323d28 100644 (file)
@@ -19,6 +19,7 @@
 package org.apache.poi.hwpf.sprm;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -29,10 +30,10 @@ import org.apache.poi.util.LittleEndian;
  */
 public class SprmOperation
 {
-  final static private BitField OP_BITFIELD = new BitField(0x1ff);
-  final static private BitField SPECIAL_BITFIELD = new BitField(0x200);
-  final static private BitField TYPE_BITFIELD = new BitField(0x1c00);
-  final static private BitField SIZECODE_BITFIELD = new BitField(0xe000);
+  final static private BitField OP_BITFIELD = BitFieldFactory.getInstance(0x1ff);
+  final static private BitField SPECIAL_BITFIELD = BitFieldFactory.getInstance(0x200);
+  final static private BitField TYPE_BITFIELD = BitFieldFactory.getInstance(0x1c00);
+  final static private BitField SIZECODE_BITFIELD = BitFieldFactory.getInstance(0xe000);
 
   final static private short LONG_SPRM_TABLE = (short)0xd608;
   final static private short LONG_SPRM_PARAGRAPH = (short)0xc615;
index ed038e57ccf235e1b3d974ebf6a0d85d0a39ae54..21e4153229200188f461dc5dbb8208b4e52fde78 100644 (file)
@@ -19,6 +19,7 @@
 package org.apache.poi.hwpf.usermodel;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 
 public class BorderCode
@@ -26,13 +27,13 @@ public class BorderCode
 {
   public static final int SIZE = 4;
   private short _info;
-    private final static BitField _dptLineWidth = new BitField(0xff);
-    private final static BitField _brcType = new BitField(0xff00);
+    private final static BitField _dptLineWidth = BitFieldFactory.getInstance(0xff);
+    private final static BitField _brcType = BitFieldFactory.getInstance(0xff00);
   private short _info2;
-    private final static BitField _ico = new BitField(0xff);
-    private final static BitField _dptDpace = new BitField(0x1f00);
-    private final static BitField _fShadow = new BitField(0x2000);
-    private final static BitField _fFrame = new BitField(0x4000);
+    private final static BitField _ico = BitFieldFactory.getInstance(0xff);
+    private final static BitField _dptDpace = BitFieldFactory.getInstance(0x1f00);
+    private final static BitField _fShadow = BitFieldFactory.getInstance(0x2000);
+    private final static BitField _fFrame = BitFieldFactory.getInstance(0x4000);
 
   public BorderCode()
   {
index 44436952e21b1751cad57d0ea05dc46375fe1237..196d8aaf8af9647d3ba97e31acf7d5071666e9ed 100644 (file)
@@ -19,6 +19,7 @@
 package org.apache.poi.hwpf.usermodel;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -31,13 +32,13 @@ public class DateAndTime
 {
   public static final int SIZE = 4;
   private short _info;
-    private static final BitField _minutes = new BitField(0x3f);
-    private static final BitField _hours = new BitField(0x7c0);
-    private static final BitField _dom = new BitField(0xf800);
+    private static final BitField _minutes = BitFieldFactory.getInstance(0x3f);
+    private static final BitField _hours = BitFieldFactory.getInstance(0x7c0);
+    private static final BitField _dom = BitFieldFactory.getInstance(0xf800);
   private short _info2;
-    private static final BitField _months = new BitField(0xf);
-    private static final BitField _years = new BitField(0x1ff0);
-    private static final BitField _weekday = new BitField(0xe000);
+    private static final BitField _months = BitFieldFactory.getInstance(0xf);
+    private static final BitField _years = BitFieldFactory.getInstance(0x1ff0);
+    private static final BitField _weekday = BitFieldFactory.getInstance(0xe000);
 
   public DateAndTime()
   {
index 513b305149cabb7479661befe56247458ff073bf..cca5a234dee4c39db2b02068f6e7f4d55258466c 100644 (file)
@@ -17,6 +17,7 @@
 package org.apache.poi.hwpf.usermodel;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -30,8 +31,8 @@ import org.apache.poi.util.LittleEndian;
 public class DropCapSpecifier
 {
   private short _info;
-    private static BitField _type = new BitField(0x07);
-    private static BitField _lines = new BitField(0xf8);
+    private static BitField _type = BitFieldFactory.getInstance(0x07);
+    private static BitField _lines = BitFieldFactory.getInstance(0xf8);
 
   public DropCapSpecifier(byte[] buf, int offset)
   {
index 583b048fc5c38a46bc620a1a2673233ca254c870..92b5c8013e6455cca9549ab72150e13de9155c1f 100644 (file)
@@ -19,6 +19,7 @@
 package org.apache.poi.hwpf.usermodel;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.LittleEndian;
 
 public class ShadingDescriptor
@@ -27,9 +28,9 @@ public class ShadingDescriptor
   public static final int SIZE = 2;
 
   private short _info;
-    private final static BitField _icoFore = new BitField(0x1f);
-    private final static BitField _icoBack = new BitField(0x3e0);
-    private final static BitField _ipat = new BitField(0xfc00);
+    private final static BitField _icoFore = BitFieldFactory.getInstance(0x1f);
+    private final static BitField _icoBack = BitFieldFactory.getInstance(0x3e0);
+    private final static BitField _ipat = BitFieldFactory.getInstance(0xfc00);
 
   public ShadingDescriptor()
   {