latest record classes

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353157 13f79535-47bb-0310-9956-ffa450edef68

src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes/definitions/CHPAbstractType.java

@@ -62,7 +62,7 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
-import org.apache.poi.hwpf.model.hdftypes.HDFType;
+import org.apache.poi.hdf.model.hdftypes.HDFType;
 
 /**
  * Character Properties.
@@ -77,27 +77,27 @@ public abstract class CHPAbstractType
 
     private  short field_1_chse;
     private  int field_2_format_flags;
-        private BitField  fBold = new BitField(0x0001);
+        private static BitField  fBold = new BitField(0x0001);
-        private BitField  fItalic = new BitField(0x0002);
+        private static BitField  fItalic = new BitField(0x0002);
-        private BitField  fRMarkDel = new BitField(0x0004);
+        private static BitField  fRMarkDel = new BitField(0x0004);
-        private BitField  fOutline = new BitField(0x0008);
+        private static BitField  fOutline = new BitField(0x0008);
-        private BitField  fFldVanish = new BitField(0x0010);
+        private static BitField  fFldVanish = new BitField(0x0010);
-        private BitField  fSmallCaps = new BitField(0x0020);
+        private static BitField  fSmallCaps = new BitField(0x0020);
-        private BitField  fCaps = new BitField(0x0040);
+        private static BitField  fCaps = new BitField(0x0040);
-        private BitField  fVanish = new BitField(0x0080);
+        private static BitField  fVanish = new BitField(0x0080);
-        private BitField  fRMark = new BitField(0x0100);
+        private static BitField  fRMark = new BitField(0x0100);
-        private BitField  fSpec = new BitField(0x0200);
+        private static BitField  fSpec = new BitField(0x0200);
-        private BitField  fStrike = new BitField(0x0400);
+        private static BitField  fStrike = new BitField(0x0400);
-        private BitField  fObj = new BitField(0x0800);
+        private static BitField  fObj = new BitField(0x0800);
-        private BitField  fShadow = new BitField(0x1000);
+        private static BitField  fShadow = new BitField(0x1000);
-        private BitField  fLowerCase = new BitField(0x2000);
+        private static BitField  fLowerCase = new BitField(0x2000);
-        private BitField  fData = new BitField(0x4000);
+        private static BitField  fData = new BitField(0x4000);
-        private BitField  fOle2 = new BitField(0x8000);
+        private static BitField  fOle2 = new BitField(0x8000);
     private  int field_3_format_flags1;
-        private BitField  fEmboss = new BitField(0x0001);
+        private static BitField  fEmboss = new BitField(0x0001);
-        private BitField  fImprint = new BitField(0x0002);
+        private static BitField  fImprint = new BitField(0x0002);
-        private BitField  fDStrike = new BitField(0x0004);
+        private static BitField  fDStrike = new BitField(0x0004);
-        private BitField  fUsePgsuSettings = new BitField(0x0008);
+        private static BitField  fUsePgsuSettings = new BitField(0x0008);
     private  int field_4_ftcAscii;
     private  int field_5_ftcFE;
     private  int field_6_ftcOther;
@@ -128,13 +128,13 @@ public abstract class CHPAbstractType
     private  byte field_31_chYsr;
     private  int field_32_hpsKern;
     private  short field_33_Highlight;
-        private BitField  icoHighlight = new BitField(0x001f);
+        private static BitField  icoHighlight = new BitField(0x001f);
-        private BitField  fHighlight = new BitField(0x0020);
+        private static BitField  fHighlight = new BitField(0x0020);
-        private BitField  kcd = new BitField(0x01c0);
+        private static BitField  kcd = new BitField(0x01c0);
-        private BitField  fNavHighlight = new BitField(0x0200);
+        private static BitField  fNavHighlight = new BitField(0x0200);
-        private BitField  fChsDiff = new BitField(0x0400);
+        private static BitField  fChsDiff = new BitField(0x0400);
-        private BitField  fMacChs = new BitField(0x0800);
+        private static BitField  fMacChs = new BitField(0x0800);
-        private BitField  fFtcAsciSym = new BitField(0x1000);
+        private static BitField  fFtcAsciSym = new BitField(0x1000);
     private  short field_34_fPropMark;
     private  int field_35_ibstPropRMark;
     private  int field_36_dttmPropRMark;
@@ -852,569 +852,569 @@ public abstract class CHPAbstractType
 
     /**
      * Sets the fBold field value.
-     *
+     * 
      */
     public void setFBold(boolean value)
     {
         field_2_format_flags = (int)fBold.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fBold field value.
      */
     public boolean isFBold()
     {
         return fBold.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fItalic field value.
-     *
+     * 
      */
     public void setFItalic(boolean value)
     {
         field_2_format_flags = (int)fItalic.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fItalic field value.
      */
     public boolean isFItalic()
     {
         return fItalic.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fRMarkDel field value.
-     *
+     * 
      */
     public void setFRMarkDel(boolean value)
     {
         field_2_format_flags = (int)fRMarkDel.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fRMarkDel field value.
      */
     public boolean isFRMarkDel()
     {
         return fRMarkDel.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fOutline field value.
-     *
+     * 
      */
     public void setFOutline(boolean value)
     {
         field_2_format_flags = (int)fOutline.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fOutline field value.
      */
     public boolean isFOutline()
     {
         return fOutline.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fFldVanish field value.
-     *
+     * 
      */
     public void setFFldVanish(boolean value)
     {
         field_2_format_flags = (int)fFldVanish.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fFldVanish field value.
      */
     public boolean isFFldVanish()
     {
         return fFldVanish.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fSmallCaps field value.
-     *
+     * 
      */
     public void setFSmallCaps(boolean value)
     {
         field_2_format_flags = (int)fSmallCaps.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fSmallCaps field value.
      */
     public boolean isFSmallCaps()
     {
         return fSmallCaps.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fCaps field value.
-     *
+     * 
      */
     public void setFCaps(boolean value)
     {
         field_2_format_flags = (int)fCaps.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fCaps field value.
      */
     public boolean isFCaps()
     {
         return fCaps.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fVanish field value.
-     *
+     * 
      */
     public void setFVanish(boolean value)
     {
         field_2_format_flags = (int)fVanish.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fVanish field value.
      */
     public boolean isFVanish()
     {
         return fVanish.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fRMark field value.
-     *
+     * 
      */
     public void setFRMark(boolean value)
     {
         field_2_format_flags = (int)fRMark.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fRMark field value.
      */
     public boolean isFRMark()
     {
         return fRMark.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fSpec field value.
-     *
+     * 
      */
     public void setFSpec(boolean value)
     {
         field_2_format_flags = (int)fSpec.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fSpec field value.
      */
     public boolean isFSpec()
     {
         return fSpec.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fStrike field value.
-     *
+     * 
      */
     public void setFStrike(boolean value)
     {
         field_2_format_flags = (int)fStrike.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fStrike field value.
      */
     public boolean isFStrike()
     {
         return fStrike.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fObj field value.
-     *
+     * 
      */
     public void setFObj(boolean value)
     {
         field_2_format_flags = (int)fObj.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fObj field value.
      */
     public boolean isFObj()
     {
         return fObj.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fShadow field value.
-     *
+     * 
      */
     public void setFShadow(boolean value)
     {
         field_2_format_flags = (int)fShadow.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fShadow field value.
      */
     public boolean isFShadow()
     {
         return fShadow.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fLowerCase field value.
-     *
+     * 
      */
     public void setFLowerCase(boolean value)
     {
         field_2_format_flags = (int)fLowerCase.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fLowerCase field value.
      */
     public boolean isFLowerCase()
     {
         return fLowerCase.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fData field value.
-     *
+     * 
      */
     public void setFData(boolean value)
     {
         field_2_format_flags = (int)fData.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fData field value.
      */
     public boolean isFData()
     {
         return fData.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fOle2 field value.
-     *
+     * 
      */
     public void setFOle2(boolean value)
     {
         field_2_format_flags = (int)fOle2.setBoolean(field_2_format_flags, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fOle2 field value.
      */
     public boolean isFOle2()
     {
         return fOle2.isSet(field_2_format_flags);
-
+        
     }
 
     /**
      * Sets the fEmboss field value.
-     *
+     * 
      */
     public void setFEmboss(boolean value)
     {
         field_3_format_flags1 = (int)fEmboss.setBoolean(field_3_format_flags1, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fEmboss field value.
      */
     public boolean isFEmboss()
     {
         return fEmboss.isSet(field_3_format_flags1);
-
+        
     }
 
     /**
      * Sets the fImprint field value.
-     *
+     * 
      */
     public void setFImprint(boolean value)
     {
         field_3_format_flags1 = (int)fImprint.setBoolean(field_3_format_flags1, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fImprint field value.
      */
     public boolean isFImprint()
     {
         return fImprint.isSet(field_3_format_flags1);
-
+        
     }
 
     /**
      * Sets the fDStrike field value.
-     *
+     * 
      */
     public void setFDStrike(boolean value)
     {
         field_3_format_flags1 = (int)fDStrike.setBoolean(field_3_format_flags1, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fDStrike field value.
      */
     public boolean isFDStrike()
     {
         return fDStrike.isSet(field_3_format_flags1);
-
+        
     }
 
     /**
      * Sets the fUsePgsuSettings field value.
-     *
+     * 
      */
     public void setFUsePgsuSettings(boolean value)
     {
         field_3_format_flags1 = (int)fUsePgsuSettings.setBoolean(field_3_format_flags1, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fUsePgsuSettings field value.
      */
     public boolean isFUsePgsuSettings()
     {
         return fUsePgsuSettings.isSet(field_3_format_flags1);
-
+        
     }
 
     /**
      * Sets the icoHighlight field value.
-     *
+     * 
      */
     public void setIcoHighlight(byte value)
     {
         field_33_Highlight = (short)icoHighlight.setValue(field_33_Highlight, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the icoHighlight field value.
      */
     public byte getIcoHighlight()
     {
         return ( byte )icoHighlight.getValue(field_33_Highlight);
-
+        
     }
 
     /**
      * Sets the fHighlight field value.
-     *
+     * 
      */
     public void setFHighlight(boolean value)
     {
         field_33_Highlight = (short)fHighlight.setBoolean(field_33_Highlight, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fHighlight field value.
      */
     public boolean isFHighlight()
     {
         return fHighlight.isSet(field_33_Highlight);
-
+        
     }
 
     /**
      * Sets the kcd field value.
-     *
+     * 
      */
     public void setKcd(byte value)
     {
         field_33_Highlight = (short)kcd.setValue(field_33_Highlight, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the kcd field value.
      */
     public byte getKcd()
     {
         return ( byte )kcd.getValue(field_33_Highlight);
-
+        
     }
 
     /**
      * Sets the fNavHighlight field value.
-     *
+     * 
      */
     public void setFNavHighlight(boolean value)
     {
         field_33_Highlight = (short)fNavHighlight.setBoolean(field_33_Highlight, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fNavHighlight field value.
      */
     public boolean isFNavHighlight()
     {
         return fNavHighlight.isSet(field_33_Highlight);
-
+        
     }
 
     /**
      * Sets the fChsDiff field value.
-     *
+     * 
      */
     public void setFChsDiff(boolean value)
     {
         field_33_Highlight = (short)fChsDiff.setBoolean(field_33_Highlight, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fChsDiff field value.
      */
     public boolean isFChsDiff()
     {
         return fChsDiff.isSet(field_33_Highlight);
-
+        
     }
 
     /**
      * Sets the fMacChs field value.
-     *
+     * 
      */
     public void setFMacChs(boolean value)
     {
         field_33_Highlight = (short)fMacChs.setBoolean(field_33_Highlight, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fMacChs field value.
      */
     public boolean isFMacChs()
     {
         return fMacChs.isSet(field_33_Highlight);
-
+        
     }
 
     /**
      * Sets the fFtcAsciSym field value.
-     *
+     * 
      */
     public void setFFtcAsciSym(boolean value)
     {
         field_33_Highlight = (short)fFtcAsciSym.setBoolean(field_33_Highlight, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fFtcAsciSym field value.
      */
     public boolean isFFtcAsciSym()
     {
         return fFtcAsciSym.isSet(field_33_Highlight);
-
+        
     }
 
 

src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes/definitions/FIBAbstractType.java

@@ -62,7 +62,7 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
-import org.apache.poi.hwpf.model.hdftypes.HDFType;
+import org.apache.poi.hdf.model.hdftypes.HDFType;
 
 /**
  * File information Block.
@@ -81,29 +81,29 @@ public abstract class FIBAbstractType
     private  int field_4_lid;
     private  int field_5_pnNext;
     private  short field_6_options;
-        private BitField  fDot = new BitField(0x0001);
+        private static BitField  fDot = new BitField(0x0001);
-        private BitField  fGlsy = new BitField(0x0002);
+        private static BitField  fGlsy = new BitField(0x0002);
-        private BitField  fComplex = new BitField(0x0004);
+        private static BitField  fComplex = new BitField(0x0004);
-        private BitField  fHasPic = new BitField(0x0008);
+        private static BitField  fHasPic = new BitField(0x0008);
-        private BitField  cQuickSaves = new BitField(0x00F0);
+        private static BitField  cQuickSaves = new BitField(0x00F0);
-        private BitField  fEncrypted = new BitField(0x0100);
+        private static BitField  fEncrypted = new BitField(0x0100);
-        private BitField  fWhichTblStm = new BitField(0x0200);
+        private static BitField  fWhichTblStm = new BitField(0x0200);
-        private BitField  fReadOnlyRecommended = new BitField(0x0400);
+        private static BitField  fReadOnlyRecommended = new BitField(0x0400);
-        private BitField  fWriteReservation = new BitField(0x0800);
+        private static BitField  fWriteReservation = new BitField(0x0800);
-        private BitField  fExtChar = new BitField(0x1000);
+        private static BitField  fExtChar = new BitField(0x1000);
-        private BitField  fLoadOverride = new BitField(0x2000);
+        private static BitField  fLoadOverride = new BitField(0x2000);
-        private BitField  fFarEast = new BitField(0x4000);
+        private static BitField  fFarEast = new BitField(0x4000);
-        private BitField  fCrypto = new BitField(0x8000);
+        private static BitField  fCrypto = new BitField(0x8000);
     private  int field_7_nFibBack;
     private  int field_8_lKey;
     private  int field_9_envr;
     private  short field_10_history;
-        private BitField  fMac = new BitField(0x0001);
+        private static BitField  fMac = new BitField(0x0001);
-        private BitField  fEmptySpecial = new BitField(0x0002);
+        private static BitField  fEmptySpecial = new BitField(0x0002);
-        private BitField  fLoadOverridePage = new BitField(0x0004);
+        private static BitField  fLoadOverridePage = new BitField(0x0004);
-        private BitField  fFutureSavedUndo = new BitField(0x0008);
+        private static BitField  fFutureSavedUndo = new BitField(0x0008);
-        private BitField  fWord97Saved = new BitField(0x0010);
+        private static BitField  fWord97Saved = new BitField(0x0010);
-        private BitField  fSpare0 = new BitField(0x00FE);
+        private static BitField  fSpare0 = new BitField(0x00FE);
     private  int field_11_chs;
     private  int field_12_chsTables;
     private  int field_13_fcMin;
@@ -5888,401 +5888,401 @@ public abstract class FIBAbstractType
 
     /**
      * Sets the fDot field value.
-     *
+     * 
      */
     public void setFDot(boolean value)
     {
         field_6_options = (short)fDot.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fDot field value.
      */
     public boolean isFDot()
     {
         return fDot.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fGlsy field value.
-     *
+     * 
      */
     public void setFGlsy(boolean value)
     {
         field_6_options = (short)fGlsy.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fGlsy field value.
      */
     public boolean isFGlsy()
     {
         return fGlsy.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fComplex field value.
-     *
+     * 
      */
     public void setFComplex(boolean value)
     {
         field_6_options = (short)fComplex.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fComplex field value.
      */
     public boolean isFComplex()
     {
         return fComplex.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fHasPic field value.
-     *
+     * 
      */
     public void setFHasPic(boolean value)
     {
         field_6_options = (short)fHasPic.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fHasPic field value.
      */
     public boolean isFHasPic()
     {
         return fHasPic.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the cQuickSaves field value.
-     *
+     * 
      */
     public void setCQuickSaves(byte value)
     {
         field_6_options = (short)cQuickSaves.setValue(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the cQuickSaves field value.
      */
     public byte getCQuickSaves()
     {
         return ( byte )cQuickSaves.getValue(field_6_options);
-
+        
     }
 
     /**
      * Sets the fEncrypted field value.
-     *
+     * 
      */
     public void setFEncrypted(boolean value)
     {
         field_6_options = (short)fEncrypted.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fEncrypted field value.
      */
     public boolean isFEncrypted()
     {
         return fEncrypted.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fWhichTblStm field value.
-     *
+     * 
      */
     public void setFWhichTblStm(boolean value)
     {
         field_6_options = (short)fWhichTblStm.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fWhichTblStm field value.
      */
     public boolean isFWhichTblStm()
     {
         return fWhichTblStm.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fReadOnlyRecommended field value.
-     *
+     * 
      */
     public void setFReadOnlyRecommended(boolean value)
     {
         field_6_options = (short)fReadOnlyRecommended.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fReadOnlyRecommended field value.
      */
     public boolean isFReadOnlyRecommended()
     {
         return fReadOnlyRecommended.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fWriteReservation field value.
-     *
+     * 
      */
     public void setFWriteReservation(boolean value)
     {
         field_6_options = (short)fWriteReservation.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fWriteReservation field value.
      */
     public boolean isFWriteReservation()
     {
         return fWriteReservation.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fExtChar field value.
-     *
+     * 
      */
     public void setFExtChar(boolean value)
     {
         field_6_options = (short)fExtChar.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fExtChar field value.
      */
     public boolean isFExtChar()
     {
         return fExtChar.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fLoadOverride field value.
-     *
+     * 
      */
     public void setFLoadOverride(boolean value)
     {
         field_6_options = (short)fLoadOverride.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fLoadOverride field value.
      */
     public boolean isFLoadOverride()
     {
         return fLoadOverride.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fFarEast field value.
-     *
+     * 
      */
     public void setFFarEast(boolean value)
     {
         field_6_options = (short)fFarEast.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fFarEast field value.
      */
     public boolean isFFarEast()
     {
         return fFarEast.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fCrypto field value.
-     *
+     * 
      */
     public void setFCrypto(boolean value)
     {
         field_6_options = (short)fCrypto.setBoolean(field_6_options, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fCrypto field value.
      */
     public boolean isFCrypto()
     {
         return fCrypto.isSet(field_6_options);
-
+        
     }
 
     /**
      * Sets the fMac field value.
-     *
+     * 
      */
     public void setFMac(boolean value)
     {
         field_10_history = (short)fMac.setBoolean(field_10_history, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fMac field value.
      */
     public boolean isFMac()
     {
         return fMac.isSet(field_10_history);
-
+        
     }
 
     /**
      * Sets the fEmptySpecial field value.
-     *
+     * 
      */
     public void setFEmptySpecial(boolean value)
     {
         field_10_history = (short)fEmptySpecial.setBoolean(field_10_history, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fEmptySpecial field value.
      */
     public boolean isFEmptySpecial()
     {
         return fEmptySpecial.isSet(field_10_history);
-
+        
     }
 
     /**
      * Sets the fLoadOverridePage field value.
-     *
+     * 
      */
     public void setFLoadOverridePage(boolean value)
     {
         field_10_history = (short)fLoadOverridePage.setBoolean(field_10_history, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fLoadOverridePage field value.
      */
     public boolean isFLoadOverridePage()
     {
         return fLoadOverridePage.isSet(field_10_history);
-
+        
     }
 
     /**
      * Sets the fFutureSavedUndo field value.
-     *
+     * 
      */
     public void setFFutureSavedUndo(boolean value)
     {
         field_10_history = (short)fFutureSavedUndo.setBoolean(field_10_history, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fFutureSavedUndo field value.
      */
     public boolean isFFutureSavedUndo()
     {
         return fFutureSavedUndo.isSet(field_10_history);
-
+        
     }
 
     /**
      * Sets the fWord97Saved field value.
-     *
+     * 
      */
     public void setFWord97Saved(boolean value)
     {
         field_10_history = (short)fWord97Saved.setBoolean(field_10_history, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fWord97Saved field value.
      */
     public boolean isFWord97Saved()
     {
         return fWord97Saved.isSet(field_10_history);
-
+        
     }
 
     /**
      * Sets the fSpare0 field value.
-     *
+     * 
      */
     public void setFSpare0(byte value)
     {
         field_10_history = (short)fSpare0.setValue(field_10_history, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fSpare0 field value.
      */
     public byte getFSpare0()
     {
         return ( byte )fSpare0.getValue(field_10_history);
-
+        
     }
 
 

src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes/definitions/PAPAbstractType.java

@@ -62,7 +62,7 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
-import org.apache.poi.hwpf.model.hdftypes.HDFType;
+import org.apache.poi.hdf.model.hdftypes.HDFType;
 
 /**
  * Paragraph Properties.
@@ -110,9 +110,9 @@ public abstract class PAPAbstractType
     private  byte field_33_fAutoSpaceDN;
     private  int field_34_wAlignFont;
     private  short field_35_fontAlign;
-        private BitField  fVertical = new BitField(0x0001);
+        private static BitField  fVertical = new BitField(0x0001);
-        private BitField  fBackward = new BitField(0x0002);
+        private static BitField  fBackward = new BitField(0x0002);
-        private BitField  fRotateFont = new BitField(0x0004);
+        private static BitField  fRotateFont = new BitField(0x0004);
     private  byte field_36_fBackward;
     private  byte field_37_fRotateFont;
     private  byte field_38_fInTable;
@@ -1236,65 +1236,65 @@ public abstract class PAPAbstractType
 
     /**
      * Sets the fVertical field value.
-     *
+     * 
      */
     public void setFVertical(boolean value)
     {
         field_35_fontAlign = (short)fVertical.setBoolean(field_35_fontAlign, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fVertical field value.
      */
     public boolean isFVertical()
     {
         return fVertical.isSet(field_35_fontAlign);
-
+        
     }
 
     /**
      * Sets the fBackward field value.
-     *
+     * 
      */
     public void setFBackward(boolean value)
     {
         field_35_fontAlign = (short)fBackward.setBoolean(field_35_fontAlign, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fBackward field value.
      */
     public boolean isFBackward()
     {
         return fBackward.isSet(field_35_fontAlign);
-
+        
     }
 
     /**
      * Sets the fRotateFont field value.
-     *
+     * 
      */
     public void setFRotateFont(boolean value)
     {
         field_35_fontAlign = (short)fRotateFont.setBoolean(field_35_fontAlign, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fRotateFont field value.
      */
     public boolean isFRotateFont()
     {
         return fRotateFont.isSet(field_35_fontAlign);
-
+        
     }
 
 

src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes/definitions/SEPAbstractType.java

@@ -62,7 +62,7 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
-import org.apache.poi.hwpf.model.hdftypes.HDFType;
+import org.apache.poi.hdf.model.hdftypes.HDFType;
 
 /**
  * Section Properties.

src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes/definitions/TAPAbstractType.java

@@ -62,7 +62,7 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
-import org.apache.poi.hwpf.model.hdftypes.HDFType;
+import org.apache.poi.hdf.model.hdftypes.HDFType;
 
 /**
  * Table Properties.

src/scratchpad/src/org/apache/poi/hwpf/model/hdftypes/definitions/TCAbstractType.java

@@ -62,7 +62,7 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 import org.apache.poi.util.HexDump;
-import org.apache.poi.hwpf.model.hdftypes.HDFType;
+import org.apache.poi.hdf.model.hdftypes.HDFType;
 
 /**
  * Table Cell Descriptor.
@@ -76,14 +76,14 @@ public abstract class TCAbstractType
 {
 
     private  short field_1_rgf;
-        private BitField  fFirstMerged = new BitField(0x0001);
+        private static BitField  fFirstMerged = new BitField(0x0001);
-        private BitField  fMerged = new BitField(0x0002);
+        private static BitField  fMerged = new BitField(0x0002);
-        private BitField  fVertical = new BitField(0x0004);
+        private static BitField  fVertical = new BitField(0x0004);
-        private BitField  fBackward = new BitField(0x0008);
+        private static BitField  fBackward = new BitField(0x0008);
-        private BitField  fRotateFont = new BitField(0x0010);
+        private static BitField  fRotateFont = new BitField(0x0010);
-        private BitField  fVertMerge = new BitField(0x0020);
+        private static BitField  fVertMerge = new BitField(0x0020);
-        private BitField  fVertRestart = new BitField(0x0040);
+        private static BitField  fVertRestart = new BitField(0x0040);
-        private BitField  vertAlign = new BitField(0x0180);
+        private static BitField  vertAlign = new BitField(0x0180);
     private  short field_2_unused;
     private  short[] field_3_brcTop;
     private  short[] field_4_brcLeft;
@@ -204,170 +204,170 @@ public abstract class TCAbstractType
 
     /**
      * Sets the fFirstMerged field value.
-     *
+     * 
      */
     public void setFFirstMerged(boolean value)
     {
         field_1_rgf = (short)fFirstMerged.setBoolean(field_1_rgf, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fFirstMerged field value.
      */
     public boolean isFFirstMerged()
     {
         return fFirstMerged.isSet(field_1_rgf);
-
+        
     }
 
     /**
      * Sets the fMerged field value.
-     *
+     * 
      */
     public void setFMerged(boolean value)
     {
         field_1_rgf = (short)fMerged.setBoolean(field_1_rgf, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fMerged field value.
      */
     public boolean isFMerged()
     {
         return fMerged.isSet(field_1_rgf);
-
+        
     }
 
     /**
      * Sets the fVertical field value.
-     *
+     * 
      */
     public void setFVertical(boolean value)
     {
         field_1_rgf = (short)fVertical.setBoolean(field_1_rgf, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fVertical field value.
      */
     public boolean isFVertical()
     {
         return fVertical.isSet(field_1_rgf);
-
+        
     }
 
     /**
      * Sets the fBackward field value.
-     *
+     * 
      */
     public void setFBackward(boolean value)
     {
         field_1_rgf = (short)fBackward.setBoolean(field_1_rgf, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fBackward field value.
      */
     public boolean isFBackward()
     {
         return fBackward.isSet(field_1_rgf);
-
+        
     }
 
     /**
      * Sets the fRotateFont field value.
-     *
+     * 
      */
     public void setFRotateFont(boolean value)
     {
         field_1_rgf = (short)fRotateFont.setBoolean(field_1_rgf, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fRotateFont field value.
      */
     public boolean isFRotateFont()
     {
         return fRotateFont.isSet(field_1_rgf);
-
+        
     }
 
     /**
      * Sets the fVertMerge field value.
-     *
+     * 
      */
     public void setFVertMerge(boolean value)
     {
         field_1_rgf = (short)fVertMerge.setBoolean(field_1_rgf, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fVertMerge field value.
      */
     public boolean isFVertMerge()
     {
         return fVertMerge.isSet(field_1_rgf);
-
+        
     }
 
     /**
      * Sets the fVertRestart field value.
-     *
+     * 
      */
     public void setFVertRestart(boolean value)
     {
         field_1_rgf = (short)fVertRestart.setBoolean(field_1_rgf, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the fVertRestart field value.
      */
     public boolean isFVertRestart()
     {
         return fVertRestart.isSet(field_1_rgf);
-
+        
     }
 
     /**
      * Sets the vertAlign field value.
-     *
+     * 
      */
     public void setVertAlign(byte value)
     {
         field_1_rgf = (short)vertAlign.setValue(field_1_rgf, value);
 
-
+        
     }
 
     /**
-     *
+     * 
      * @return  the vertAlign field value.
      */
     public byte getVertAlign()
     {
         return ( byte )vertAlign.getValue(field_1_rgf);
-
+        
     }