From 9f975dbc252a9e2f3c5719882b0f4f6b8bda33a2 Mon Sep 17 00:00:00 2001 From: Sergey Vladimirov Date: Tue, 9 Aug 2011 05:53:28 +0000 Subject: [PATCH] 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 --- .../apache/poi/hwpf/model/BookmarkFirstDescriptor.java | 2 ++ .../src/org/apache/poi/hwpf/model/BookmarksTables.java | 2 ++ src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java | 2 ++ .../org/apache/poi/hwpf/model/CPSplitCalculator.java | 2 ++ .../org/apache/poi/hwpf/model/CachedPropertyNode.java | 2 ++ .../org/apache/poi/hwpf/model/CharIndexTranslator.java | 3 +++ .../org/apache/poi/hwpf/model/ComplexFileTable.java | 2 ++ .../org/apache/poi/hwpf/model/DocumentProperties.java | 2 ++ .../org/apache/poi/hwpf/model/EscherRecordHolder.java | 2 ++ .../src/org/apache/poi/hwpf/model/FIBFieldHandler.java | 2 ++ .../src/org/apache/poi/hwpf/model/FIBLongHandler.java | 2 ++ .../src/org/apache/poi/hwpf/model/FIBShortHandler.java | 2 ++ .../org/apache/poi/hwpf/model/FSPADocumentPart.java | 3 +++ src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java | 5 ++++- .../src/org/apache/poi/hwpf/model/FieldDescriptor.java | 2 ++ .../org/apache/poi/hwpf/model/FieldsDocumentPart.java | 3 +++ .../src/org/apache/poi/hwpf/model/FieldsTables.java | 2 ++ .../apache/poi/hwpf/model/FileInformationBlock.java | 2 ++ .../src/org/apache/poi/hwpf/model/FontTable.java | 3 +++ .../poi/hwpf/model/FootnoteReferenceDescriptor.java | 2 ++ .../org/apache/poi/hwpf/model/FormattedDiskPage.java | 2 ++ .../org/apache/poi/hwpf/model/GenericPropertyNode.java | 3 +++ .../src/org/apache/poi/hwpf/model/HDFType.java | 4 ++++ .../src/org/apache/poi/hwpf/model/Hyphenation.java | 2 ++ .../src/org/apache/poi/hwpf/model/ListData.java | 10 ++++++---- .../org/apache/poi/hwpf/model/ListFormatOverride.java | 2 ++ .../apache/poi/hwpf/model/ListFormatOverrideLevel.java | 10 ++++++---- .../src/org/apache/poi/hwpf/model/ListLevel.java | 2 ++ .../src/org/apache/poi/hwpf/model/ListTables.java | 2 ++ .../src/org/apache/poi/hwpf/model/NoteType.java | 3 +++ .../src/org/apache/poi/hwpf/model/NotesTables.java | 2 ++ .../src/org/apache/poi/hwpf/model/OldCHPBinTable.java | 2 ++ .../src/org/apache/poi/hwpf/model/OldPAPBinTable.java | 2 ++ .../src/org/apache/poi/hwpf/model/OldSectionTable.java | 2 ++ .../src/org/apache/poi/hwpf/model/ParagraphHeight.java | 4 +++- .../org/apache/poi/hwpf/model/PictureDescriptor.java | 2 ++ .../src/org/apache/poi/hwpf/model/PicturesTable.java | 2 ++ .../src/org/apache/poi/hwpf/model/PieceDescriptor.java | 2 ++ .../src/org/apache/poi/hwpf/model/PlexOfField.java | 4 +++- .../org/apache/poi/hwpf/model/PropertyModifier.java | 2 ++ .../src/org/apache/poi/hwpf/model/PropertyNode.java | 2 ++ .../apache/poi/hwpf/model/RevisionMarkAuthorTable.java | 5 +++-- src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java | 2 ++ .../src/org/apache/poi/hwpf/model/SavedByEntry.java | 3 +++ .../src/org/apache/poi/hwpf/model/SavedByTable.java | 2 ++ .../org/apache/poi/hwpf/model/SectionDescriptor.java | 2 ++ .../src/org/apache/poi/hwpf/model/SectionTable.java | 2 ++ .../src/org/apache/poi/hwpf/model/ShapesTable.java | 2 ++ .../src/org/apache/poi/hwpf/model/SttbfUtils.java | 2 ++ .../org/apache/poi/hwpf/model/StyleDescription.java | 5 +++-- .../src/org/apache/poi/hwpf/model/StyleSheet.java | 8 +++++--- .../src/org/apache/poi/hwpf/model/SubdocumentType.java | 3 +++ .../src/org/apache/poi/hwpf/model/TextPieceTable.java | 2 ++ src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java | 3 +++ .../apache/poi/hwpf/model/UnhandledDataStructure.java | 3 +++ .../org/apache/poi/hwpf/model/io/HWPFFileSystem.java | 3 +++ .../org/apache/poi/hwpf/model/io/HWPFOutputStream.java | 3 +++ .../apache/poi/hwpf/model/types/BKFAbstractType.java | 2 ++ .../apache/poi/hwpf/model/types/DOPAbstractType.java | 2 ++ .../apache/poi/hwpf/model/types/FIBAbstractType.java | 2 ++ .../apache/poi/hwpf/model/types/FLDAbstractType.java | 2 ++ .../apache/poi/hwpf/model/types/FRDAbstractType.java | 2 ++ .../apache/poi/hwpf/model/types/HRESIAbstractType.java | 3 +++ .../apache/poi/hwpf/model/types/LFOAbstractType.java | 2 ++ .../apache/poi/hwpf/model/types/PAPAbstractType.java | 2 ++ .../apache/poi/hwpf/model/types/SEPAbstractType.java | 2 ++ .../apache/poi/hwpf/model/types/TAPAbstractType.java | 2 ++ .../apache/poi/hwpf/model/types/TCAbstractType.java | 2 ++ .../apache/poi/hwpf/model/types/TLPAbstractType.java | 2 ++ 69 files changed, 170 insertions(+), 18 deletions(-) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java index d6493f239..2e2a5e314 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java b/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java index ead86a60d..127cbc368 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java +++ b/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 ); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java index cb5425c3b..5789c8245 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CPSplitCalculator.java b/src/scratchpad/src/org/apache/poi/hwpf/model/CPSplitCalculator.java index 3ad722cb7..381cc155c 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/CPSplitCalculator.java +++ b/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) { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java b/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java index ebc3a5f2e..f6b0f06e6 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/CachedPropertyNode.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java b/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java index 2ef8b55b0..6272b1afe 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java +++ b/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. diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java index d679c03e9..7b9eecb22 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java b/src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java index 489b35af5..f0aafda6c 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java b/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java index 329707832..e993efcef 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/EscherRecordHolder.java +++ b/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 escherRecords; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java index ec43bea1e..38e7f8a0a 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java +++ b/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 diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBLongHandler.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBLongHandler.java index 1578bb8ee..1036d28d2 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBLongHandler.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBShortHandler.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBShortHandler.java index 28ffe22a6..ce1731e58 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBShortHandler.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java index 53ce9dbbb..494fe843a 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java +++ b/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 ), diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java b/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java index b3ddb356c..e4b4e61f4 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java +++ b/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. diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java index daafedd4c..58e55a46c 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java +++ b/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 */ +@Internal public final class FieldDescriptor extends FLDAbstractType { public static final int FIELD_BEGIN_MARK = 0x13; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java index f2e654cf7..99be64249 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java +++ b/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 { /** diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java index 3bc59fbf6..cb15dfac0 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java +++ b/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 * */ +@Internal public class FieldsTables { // The size in bytes of the FLD data structure diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java index 60a22ab1b..ec9453dce 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java index 7a2f29475..b5ffa17a1 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java +++ b/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); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java index 73f6103cd..326cf954f 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java index bbb56f5b1..4be886aa2 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java b/src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java index 32b478912..806a7e7f0 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/HDFType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/HDFType.java index b1791132e..aabf02451 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/HDFType.java +++ b/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 { } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java b/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java index d8be60b9d..4ef53f56b 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java +++ b/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() diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java index be95dd17c..b0738c63f 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverride.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverride.java index 0e8ed8b22..7cdf119b2 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverride.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java index 48fd1a70f..f0ae04cd9 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java index 0eb594cbc..43593bef2 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java index b8529f55f..a44690cfb 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java index 2c43337db..8168e96ae 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java +++ b/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 ), diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java b/src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java index 21f5ba3c8..8755331c3 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java +++ b/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( diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java index fd8edc940..dff5f3d70 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java +++ b/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 { /** diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java index 34267e2cf..088ca33f2 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java index 7901f0832..521e73e0c 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java +++ b/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 { /** diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java index 698dba32f..993f1a21b 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PictureDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PictureDescriptor.java index 22ee6cd9c..2435d842f 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PictureDescriptor.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java index cce3526e4..1d5b28459 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java index 52ae78ffd..a190f1db0 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java index a287c8b9c..c354b3ada 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java +++ b/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 - * */ +@Internal public class PlexOfField { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java index 51da09c0d..e4167b7a1 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java +++ b/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 { /** diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java index ed6c2ac38..78a536e27 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java +++ b/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> implements Comparable, Cloneable { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java index c8b98734a..1f86dc64f 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java +++ b/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 diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java index f98b6e09c..4e1c0ce73 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java index f4dc3e00e..2e15092a9 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java index 88d3256ab..078acd109 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java index 7f17dfc75..0fba191f9 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java index b2cbc4219..054011159 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java +++ b/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); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java index 542821513..5c228a1aa 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ShapesTable.java +++ b/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 _shapes; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SttbfUtils.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SttbfUtils.java index de19edb95..177abebcd 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SttbfUtils.java +++ b/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 ) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java b/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java index 26e3ac43a..7c7858ed5 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java b/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java index 5cbe03a88..ab13b0979 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java +++ b/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.hwpf.sprm.CharacterSprmUncompressor; +import org.apache.poi.util.Internal; +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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java index 109081489..ea9bdcefe 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java +++ b/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 ), diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java index b3063aa5b..82fb71eae 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java +++ b/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 diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java b/src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java index 736d66ec8..acf7d355f 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java b/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java index 46989804a..441ec0310 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java b/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java index 79e9b8d62..9663f0177 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java +++ b/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 _streams = new HashMap(); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFOutputStream.java b/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFOutputStream.java index b95f4b620..0ed0205a8 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFOutputStream.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java index 684797f87..33fd6aece 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java index b623f4a27..724ecdf31 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FIBAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/FIBAbstractType.java index 32c308e38..58253a971 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FIBAbstractType.java +++ b/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; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java index d24fea095..a56e673f6 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java index 8ee32e7f3..9923fe64e 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java index 03a026b8c..7c4f5d685 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java +++ b/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). *

@@ -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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java index 339be5160..d3dca54fd 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java index 176b77efa..cfb3951b2 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java index 9c21f6eb5..c74408faa 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java index 595a0f22f..58d83584f 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java index 13ebdd9bc..431b87812 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java +++ b/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 { diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java b/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java index c99e52ac3..067727ba0 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java +++ b/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 {