mark classes from org.apache.poi.hwpf.model (and subpackages) as @Internal

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

src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java

@@ -1,7 +1,9 @@
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.hwpf.model.types.BKFAbstractType;
+import org.apache.poi.util.Internal;
 
+@Internal
 public final class BookmarkFirstDescriptor extends BKFAbstractType implements
         Cloneable
 {

src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java

@@ -20,7 +20,9 @@ import java.io.IOException;
 import java.util.Arrays;
 
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.util.Internal;
 
+@Internal
 public class BookmarksTables
 {
     private PlexOfCps descriptorsFirst = new PlexOfCps( 4 );

src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java

@@ -20,6 +20,7 @@ package org.apache.poi.hwpf.model;
 import org.apache.poi.hwpf.sprm.CharacterSprmUncompressor;
 import org.apache.poi.hwpf.sprm.SprmBuffer;
 import org.apache.poi.hwpf.usermodel.CharacterProperties;
+import org.apache.poi.util.Internal;
 
 /**
  * DANGER - works in bytes!
@@ -30,6 +31,7 @@ import org.apache.poi.hwpf.usermodel.CharacterProperties;
  *
  * @author Ryan Ackley
  */
+@Internal
 @SuppressWarnings( "deprecation" )
 public final class CHPX extends BytePropertyNode<CHPX>
 {

src/scratchpad/src/org/apache/poi/hwpf/model/CPSplitCalculator.java

@@ -18,6 +18,7 @@
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.util.Internal;
 
 /**
  * Helper class for {@link HWPFDocument}, which figures out
@@ -25,6 +26,7 @@ import org.apache.poi.hwpf.HWPFDocument;
  *  overall CP splurge.
  */
 @Deprecated
+@Internal
 public final class CPSplitCalculator {
 	private FileInformationBlock fib;
 	public CPSplitCalculator(FileInformationBlock fib) {

src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java

@@ -20,7 +20,9 @@ package org.apache.poi.hwpf.model;
 import java.lang.ref.SoftReference;
 
 import org.apache.poi.hwpf.sprm.SprmBuffer;
+import org.apache.poi.util.Internal;
 
+@Internal
 public final class CachedPropertyNode
   extends PropertyNode<CachedPropertyNode>
 {

src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java

@@ -17,6 +17,9 @@
 
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
+
+@Internal
 public interface CharIndexTranslator {
     /**
      * Calculates the byte index of the given char index.

src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java

@@ -24,8 +24,10 @@ import java.util.List;
 import org.apache.poi.hwpf.model.io.HWPFFileSystem;
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
 import org.apache.poi.hwpf.sprm.SprmBuffer;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
+@Internal
 public final class ComplexFileTable
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java

@@ -18,12 +18,14 @@
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.hwpf.model.types.DOPAbstractType;
+import org.apache.poi.util.Internal;
 
 /**
  * Comment me
  *
  * @author Ryan Ackley
  */
+@Internal
 public final class DocumentProperties extends DOPAbstractType {
 
 

src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java

@@ -25,12 +25,14 @@ import org.apache.poi.ddf.DefaultEscherRecordFactory;
 import org.apache.poi.ddf.EscherContainerRecord;
 import org.apache.poi.ddf.EscherRecord;
 import org.apache.poi.ddf.EscherRecordFactory;
+import org.apache.poi.util.Internal;
 
 /**
  * Based on AbstractEscherRecordHolder from HSSF.
  *
  * @author Squeeself
  */
+@Internal
 public final class EscherRecordHolder {
 	private final ArrayList<EscherRecord> escherRecords;
 

src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java

@@ -24,10 +24,12 @@ import java.util.HashSet;
 import java.util.Map;
 
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 
+@Internal
 public final class FIBFieldHandler
 {
     // 154 == 0x009A; 158 == 0x009E

src/scratchpad/src/org/apache/poi/hwpf/model/FIBLongHandler.java

@@ -17,12 +17,14 @@
 
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
  * Handles the fibRgLw / The FibRgLw97 part of
  *  the FIB (File Information Block)
  */
+@Internal
 public final class FIBLongHandler {
   public static final int CBMAC = 0;
   public static final int PRODUCTCREATED = 1;

src/scratchpad/src/org/apache/poi/hwpf/model/FIBShortHandler.java

@@ -17,12 +17,14 @@
 
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
  * Handles the fibRgW / FibRgW97 part of
  *  the FIB (File Information Block)
  */
+@Internal
 public final class FIBShortHandler {
   public final static int MAGICCREATED = 0;
   public final static int MAGICREVISED = 1;

src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java

@@ -1,5 +1,8 @@
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
+
+@Internal
 public enum FSPADocumentPart {
     HEADER( FIBFieldHandler.PLCSPAHDR ),
 

src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java

@@ -17,10 +17,12 @@
 
 package org.apache.poi.hwpf.model;
 
+import java.util.Arrays;
+
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
-import java.util.Arrays;
 
 /**
  * FFN - Font Family Name. FFN is a data structure that stores the names of the Main
@@ -29,6 +31,7 @@ import java.util.Arrays;
  *
  * @author Praveen Mathew
  */
+@Internal
 public final class Ffn
 {
   private int _cbFfnM1;//total length of FFN - 1.

src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java

@@ -18,12 +18,14 @@
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.hwpf.model.types.FLDAbstractType;
+import org.apache.poi.util.Internal;
 
 /**
  * Class for the FLD structure.
  * 
  * @author Cedric Bosdonnat <cbosdonnat@novell.com>
  */
+@Internal
 public final class FieldDescriptor extends FLDAbstractType
 {
     public static final int FIELD_BEGIN_MARK = 0x13;

src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java

@@ -1,5 +1,8 @@
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
+
+@Internal
 public enum FieldsDocumentPart {
 
     /**

src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java

@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.util.Internal;
 
 /**
  * This class provides access to all the fields Plex.
@@ -32,6 +33,7 @@ import org.apache.poi.hwpf.model.io.HWPFOutputStream;
  * @author Cedric Bosdonnat <cbosdonnat@novell.com>
  * 
  */
+@Internal
 public class FieldsTables
 {
     // The size in bytes of the FLD data structure

src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java

@@ -24,6 +24,7 @@ import java.util.HashSet;
 
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
 import org.apache.poi.hwpf.model.types.FIBAbstractType;
+import org.apache.poi.util.Internal;
 
 /**
  * The File Information Block (FIB). Holds pointers
@@ -41,6 +42,7 @@ import org.apache.poi.hwpf.model.types.FIBAbstractType;
  *
  * @author  andy
  */
+@Internal
 public final class FileInformationBlock extends FIBAbstractType
   implements Cloneable
 {

src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java

@@ -18,8 +18,10 @@
 package org.apache.poi.hwpf.model;
 
 import java.io.IOException;
+
 import org.apache.poi.hwpf.model.io.HWPFFileSystem;
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
@@ -32,6 +34,7 @@ import org.apache.poi.util.POILogger;
  *
  * @author Praveen Mathew
  */
+@Internal
 public final class FontTable
 {
   private final static POILogger _logger = POILogFactory.getLogger(FontTable.class);

src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java

@@ -17,7 +17,9 @@
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.hwpf.model.types.FRDAbstractType;
+import org.apache.poi.util.Internal;
 
+@Internal
 public final class FootnoteReferenceDescriptor extends FRDAbstractType
         implements Cloneable
 {

src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java

@@ -17,6 +17,7 @@
 
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -39,6 +40,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Ryan Ackley
  */
+@Internal
 public abstract class FormattedDiskPage
 {
     protected byte[] _fkp;

src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java

@@ -17,6 +17,9 @@
 
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
+
+@Internal
 public final class GenericPropertyNode
   extends PropertyNode<GenericPropertyNode>
 {

src/scratchpad/src/org/apache/poi/hwpf/model/HDFType.java

@@ -17,10 +17,14 @@
 
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
+
 /**
  *
  * @author  andy
  */
+@Internal
+@Deprecated
 public interface HDFType {
 
 }

src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java

@@ -19,6 +19,7 @@ package org.apache.poi.hwpf.model;
 
 import org.apache.poi.hwpf.model.types.HRESIAbstractType;
 import org.apache.poi.hwpf.usermodel.CharacterProperties;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -26,6 +27,7 @@ import org.apache.poi.util.LittleEndian;
  * 
  * @author Sergey Vladimirov ( vlsergey {at} gmail {dot} com )
  */
+@Internal
 public final class Hyphenation extends HRESIAbstractType implements Cloneable
 {
     public Hyphenation()

src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java

@@ -17,12 +17,14 @@
 
 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;
 
+import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
+import org.apache.poi.util.Internal;
+import org.apache.poi.util.LittleEndian;
+
+@Internal
 public final class ListData
 {
   private int _lsid;

src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverride.java

@@ -18,7 +18,9 @@
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.hwpf.model.types.LFOAbstractType;
+import org.apache.poi.util.Internal;
 
+@Internal
 public final class ListFormatOverride extends LFOAbstractType
 {
     private ListFormatOverrideLevel[] _levelOverrides;

src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java

@@ -17,12 +17,14 @@
 
 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;
 
+import org.apache.poi.util.BitField;
+import org.apache.poi.util.BitFieldFactory;
+import org.apache.poi.util.Internal;
+import org.apache.poi.util.LittleEndian;
+
+@Internal
 public final class ListFormatOverrideLevel
 {
   private static final int BASE_SIZE = 8;

src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java

@@ -20,6 +20,7 @@ package org.apache.poi.hwpf.model;
 import java.util.Arrays;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -27,6 +28,7 @@ import org.apache.poi.util.LittleEndian;
  * 
  * See page 170 for details.
  */
+@Internal
 public final class ListLevel
 {
     private static final int RGBXCH_NUMS_SIZE = 9;

src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java

@@ -30,6 +30,7 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
@@ -37,6 +38,7 @@ import org.apache.poi.util.POILogger;
 /**
  * @author Ryan Ackley
  */
+@Internal
 public final class ListTables
 {
   private static final int LIST_DATA_SIZE = 28;

src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java

@@ -22,6 +22,9 @@
  */
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
+
+@Internal
 public enum NoteType {
     /** Ending note */
     ENDNOTE( FIBFieldHandler.PLCFENDREF, FIBFieldHandler.PLCFENDTXT ),

src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java

@@ -19,12 +19,14 @@ package org.apache.poi.hwpf.model;
 import java.io.IOException;
 
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.util.Internal;
 
 /**
  * Holds information about document notes (footnotes or ending notes)
  * 
  * @author Sergey Vladimirov (vlsergey {at} gmail {doc} com)
  */
+@Internal
 public class NotesTables
 {
     private PlexOfCps descriptors = new PlexOfCps(

src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java

@@ -20,6 +20,7 @@ package org.apache.poi.hwpf.model;
 import java.util.Collections;
 
 import org.apache.poi.poifs.common.POIFSConstants;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -30,6 +31,7 @@ import org.apache.poi.util.LittleEndian;
  * In common with the rest of the old support, it 
  *  is read only
  */
+@Internal
 public final class OldCHPBinTable extends CHPBinTable
 {
   /**

src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java

@@ -20,6 +20,7 @@ package org.apache.poi.hwpf.model;
 import java.util.Collections;
 
 import org.apache.poi.poifs.common.POIFSConstants;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -30,6 +31,7 @@ import org.apache.poi.util.LittleEndian;
  * In common with the rest of the old support, it 
  *  is read only
  */
+@Internal
 public final class OldPAPBinTable extends PAPBinTable
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java

@@ -19,6 +19,7 @@ package org.apache.poi.hwpf.model;
 
 import java.util.Collections;
 
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -29,6 +30,7 @@ import org.apache.poi.util.LittleEndian;
  * In common with the rest of the old support, it 
  *  is read only
  */
+@Internal
 public final class OldSectionTable extends SectionTable
 {
     /**

src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java

@@ -17,13 +17,15 @@
 
 package org.apache.poi.hwpf.model;
 
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
+@Internal
 public final class ParagraphHeight
 {
   private short infoField;

src/scratchpad/src/org/apache/poi/hwpf/model/PictureDescriptor.java

@@ -2,6 +2,7 @@ package org.apache.poi.hwpf.model;
 
 import java.util.Arrays;
 
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -12,6 +13,7 @@ import org.apache.poi.util.LittleEndian;
  * 
  * @author Sergey Vladimirov ( vlsergey {at} gmail {dot} com )
  */
+@Internal
 public class PictureDescriptor
 {
     private static final int LCB_OFFSET = 0x00;

src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java

@@ -29,6 +29,7 @@ import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.usermodel.CharacterRun;
 import org.apache.poi.hwpf.usermodel.Picture;
 import org.apache.poi.hwpf.usermodel.Range;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -48,6 +49,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Dmitry Romanov
  */
+@Internal
 public final class PicturesTable
 {
   static final int TYPE_IMAGE = 0x08;

src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java

@@ -19,8 +19,10 @@ package org.apache.poi.hwpf.model;
 
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
+@Internal
 public final class PieceDescriptor
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java

@@ -21,12 +21,14 @@ package org.apache.poi.hwpf.model;
 
 import java.text.MessageFormat;
 
+import org.apache.poi.util.Internal;
+
 /**
  * Structure describing the Plex for fields (contained plclfd* in the spec).
  * 
  * @author Cedric Bosdonnat <cbosdonnat@novell.com>
- * 
  */
+@Internal
 public class PlexOfField
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java

@@ -1,7 +1,9 @@
 package org.apache.poi.hwpf.model;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.Internal;
 
+@Internal
 public final class PropertyModifier implements Cloneable
 {
     /**

src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java

@@ -20,6 +20,7 @@ package org.apache.poi.hwpf.model;
 import java.util.Arrays;
 import java.util.Comparator;
 
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 
@@ -32,6 +33,7 @@ import org.apache.poi.util.POILogger;
  *
  * @author Ryan Ackley
  */
+@Internal
 public abstract class PropertyNode<T extends PropertyNode<T>>  implements Comparable<T>, Cloneable
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java

@@ -22,17 +22,18 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 
-import org.apache.poi.hwpf.model.io.HWPFOutputStream;
-
 /**
  * String table containing the names of authors of revision marks, e-mails and
  * comments in this document.
  * 
  * @author Ryan Lauck
  */
+@Internal
 public final class RevisionMarkAuthorTable {
 	/**
 	 * must be 0xFFFF

src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java

@@ -21,7 +21,9 @@ import org.apache.poi.hwpf.sprm.SectionSprmCompressor;
 import org.apache.poi.hwpf.sprm.SectionSprmUncompressor;
 import org.apache.poi.hwpf.sprm.SprmBuffer;
 import org.apache.poi.hwpf.usermodel.SectionProperties;
+import org.apache.poi.util.Internal;
 
+@Internal
 public final class SEPX extends PropertyNode<SEPX>
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java

@@ -17,12 +17,15 @@
 
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
+
 
 /**
  * A single entry in the {@link SavedByTable}.
  *
  * @author Daniel Noll
  */
+@Internal
 public final class SavedByEntry
 {
   private String userName;

src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java

@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.util.Internal;
 
 /**
  * String table containing the history of the last few revisions ("saves") of the document.
@@ -30,6 +31,7 @@ import org.apache.poi.hwpf.model.io.HWPFOutputStream;
  *
  * @author Daniel Noll
  */
+@Internal
 public final class SavedByTable
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java

@@ -17,6 +17,7 @@
 
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -24,6 +25,7 @@ import org.apache.poi.util.LittleEndian;
  * 
  * @see page 186 for details
  */
+@Internal
 public final class SectionDescriptor
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java

@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.apache.poi.hwpf.model.io.HWPFFileSystem;
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
@@ -31,6 +32,7 @@ import org.apache.poi.util.POILogger;
 /**
  * @author Ryan Ackley
  */
+@Internal
 public class SectionTable
 {
   private final static POILogger _logger = POILogFactory.getLogger(SectionTable.class);

src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java

@@ -21,7 +21,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.poi.hwpf.usermodel.Shape;
+import org.apache.poi.util.Internal;
 
+@Internal
 @Deprecated
 public final class ShapesTable {
         private List<Shape> _shapes;

src/scratchpad/src/org/apache/poi/hwpf/model/SttbfUtils.java

@@ -3,6 +3,7 @@ package org.apache.poi.hwpf.model;
 import java.io.IOException;
 
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 
@@ -11,6 +12,7 @@ import org.apache.poi.util.StringUtil;
  * 
  * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
  */
+@Internal
 class SttbfUtils
 {
     public static String[] read( byte[] data, int startOffset )

src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java

@@ -22,15 +22,16 @@ import java.util.Arrays;
 
 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;
+import org.apache.poi.util.Internal;
+import org.apache.poi.util.LittleEndian;
 /**
  * Comment me
  *
  * @author Ryan Ackley
  */
-
+@Internal
 public final class StyleDescription implements HDFType
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java

@@ -19,12 +19,13 @@ package org.apache.poi.hwpf.model;
 
 import java.io.IOException;
 
-import org.apache.poi.util.LittleEndian;
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
+import org.apache.poi.hwpf.sprm.CharacterSprmUncompressor;
+import org.apache.poi.hwpf.sprm.ParagraphSprmUncompressor;
 import org.apache.poi.hwpf.usermodel.CharacterProperties;
 import org.apache.poi.hwpf.usermodel.ParagraphProperties;
-import org.apache.poi.hwpf.sprm.ParagraphSprmUncompressor;
+import org.apache.poi.util.Internal;
-import org.apache.poi.hwpf.sprm.CharacterSprmUncompressor;
+import org.apache.poi.util.LittleEndian;
 
 /**
  * Represents a document's stylesheet. A word documents formatting is stored as
@@ -34,6 +35,7 @@ import org.apache.poi.hwpf.sprm.CharacterSprmUncompressor;
  *
  * @author Ryan Ackley
  */
+@Internal
 public final class StyleSheet implements HDFType {
 
   public static final int NIL_STYLE = 4095;

src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java

@@ -1,10 +1,13 @@
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
+
 /**
  * Document text parts that can have text pieces (CPs)
  * 
  * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
  */
+@Internal
 public enum SubdocumentType {
     MAIN( FIBLongHandler.CCPTEXT ),
 

src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java

@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.apache.poi.hwpf.model.io.HWPFOutputStream;
 import org.apache.poi.poifs.common.POIFSConstants;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 
@@ -34,6 +35,7 @@ import org.apache.poi.util.POILogger;
  * 
  * @author Ryan Ackley
  */
+@Internal
 public class TextPieceTable implements CharIndexTranslator
 {
     private static final POILogger logger = POILogFactory

src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java

@@ -19,6 +19,9 @@ package org.apache.poi.hwpf.model;
 
 import java.util.Arrays;
 
+import org.apache.poi.util.Internal;
+
+@Internal
 public final class UPX
 {
   private byte[] _upx;

src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java

@@ -17,6 +17,9 @@
 
 package org.apache.poi.hwpf.model;
 
+import org.apache.poi.util.Internal;
+
+@Internal
 public final class UnhandledDataStructure
 {
   byte[] _buf;

src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java

@@ -21,6 +21,9 @@ package org.apache.poi.hwpf.model.io;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.poi.util.Internal;
+
+@Internal
 public final class HWPFFileSystem
 {
   Map<String, HWPFOutputStream> _streams = new HashMap<String, HWPFOutputStream>();

src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFOutputStream.java

@@ -19,6 +19,9 @@ package org.apache.poi.hwpf.model.io;
 
 import java.io.ByteArrayOutputStream;
 
+import org.apache.poi.util.Internal;
+
+@Internal
 public final class HWPFOutputStream extends ByteArrayOutputStream
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java

@@ -2,6 +2,7 @@
 package org.apache.poi.hwpf.model.types;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -16,6 +17,7 @@ import org.apache.poi.util.LittleEndian;
  * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
  *         File Format (.doc) Specification
  */
+@Internal
 public abstract class BKFAbstractType
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java

@@ -21,6 +21,7 @@ package org.apache.poi.hwpf.model.types;
 import org.apache.poi.hdf.model.hdftypes.HDFType;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -30,6 +31,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author S. Ryan Ackley
  */
+@Internal
 public abstract class DOPAbstractType implements HDFType {
 
     protected  byte field_1_formatFlags;

src/scratchpad/src/org/apache/poi/hwpf/model/types/FIBAbstractType.java

@@ -21,6 +21,7 @@ package org.apache.poi.hwpf.model.types;
 import org.apache.poi.hdf.model.hdftypes.HDFType;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -30,6 +31,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Andrew C. Oliver
  */
+@Internal
 public abstract class FIBAbstractType implements HDFType {
 
     protected  int field_1_wIdent;

src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java

@@ -19,6 +19,7 @@ package org.apache.poi.hwpf.model.types;
 
 import org.apache.poi.hdf.model.hdftypes.HDFType;
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.Internal;
 
 /**
  * Field Descriptor (FLD).
@@ -32,6 +33,7 @@ import org.apache.poi.util.BitField;
  * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
  *         File Format Specification [*.doc]
  */
+@Internal
 public abstract class FLDAbstractType implements HDFType
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java

@@ -16,6 +16,7 @@
 ==================================================================== */
 package org.apache.poi.hwpf.model.types;
 
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -30,6 +31,7 @@ import org.apache.poi.util.LittleEndian;
  * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
  *         File Format (.doc) Specification
  */
+@Internal
 public abstract class FRDAbstractType
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java

@@ -17,6 +17,8 @@
 
 package org.apache.poi.hwpf.model.types;
 
+import org.apache.poi.util.Internal;
+
 /**
  * Hyphenation (HRESI).
  * <p>
@@ -29,6 +31,7 @@ package org.apache.poi.hwpf.model.types;
  * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
  *         File Format (.doc) Specification
  */
+@Internal
 public abstract class HRESIAbstractType
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java

@@ -17,6 +17,7 @@
 package org.apache.poi.hwpf.model.types;
 
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -31,6 +32,7 @@ import org.apache.poi.util.LittleEndian;
  * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
  *         File Format Specification [*.doc]
  */
+@Internal
 public abstract class LFOAbstractType
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java

@@ -23,6 +23,7 @@ import org.apache.poi.hwpf.usermodel.DropCapSpecifier;
 import org.apache.poi.hwpf.usermodel.LineSpacingDescriptor;
 import org.apache.poi.hwpf.usermodel.ShadingDescriptor;
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.Internal;
 
 /**
  * Paragraph Properties.
@@ -31,6 +32,7 @@ import org.apache.poi.util.BitField;
 
  * @author S. Ryan Ackley
  */
+@Internal
 public abstract class PAPAbstractType
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java

@@ -20,6 +20,7 @@ package org.apache.poi.hwpf.model.types;
 
 import org.apache.poi.hwpf.usermodel.BorderCode;
 import org.apache.poi.hwpf.usermodel.DateAndTime;
+import org.apache.poi.util.Internal;
 
 /**
  * Section Properties.
@@ -28,6 +29,7 @@ import org.apache.poi.hwpf.usermodel.DateAndTime;
  *
  * @author S. Ryan Ackley
  */
+@Internal
 public abstract class SEPAbstractType
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java

@@ -23,6 +23,7 @@ import org.apache.poi.hwpf.usermodel.ShadingDescriptor;
 import org.apache.poi.hwpf.usermodel.TableAutoformatLookSpecifier;
 import org.apache.poi.hwpf.usermodel.TableCellDescriptor;
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.Internal;
 
 /**
  * "Table Properties (TAP). This structure is never written out to disk but can
@@ -38,6 +39,7 @@ import org.apache.poi.util.BitField;
  * @author S. Ryan Ackley
  * @author Sergey Vladimirov (vlsergey {at} gmail {dot} com)
  */
+@Internal
 public abstract class TAPAbstractType implements HDFType
 {
 

src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java

@@ -22,6 +22,7 @@ package org.apache.poi.hwpf.model.types;
 import org.apache.poi.hdf.model.hdftypes.HDFType;
 import org.apache.poi.hwpf.usermodel.BorderCode;
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.Internal;
 
 /**
  * Table Cell Descriptor.
@@ -30,6 +31,7 @@ import org.apache.poi.util.BitField;
 
  * @author S. Ryan Ackley
  */
+@Internal
 public abstract class TCAbstractType
     implements HDFType
 {

src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java

@@ -19,6 +19,7 @@ package org.apache.poi.hwpf.model.types;
 
 import org.apache.poi.hdf.model.hdftypes.HDFType;
 import org.apache.poi.util.BitField;
+import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
 
 /**
@@ -33,6 +34,7 @@ import org.apache.poi.util.LittleEndian;
  * @author Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary
  *         File Format Specification [*.doc]
  */
+@Internal
 public abstract class TLPAbstractType implements HDFType
 {