From efceea044f79c99035349ca35d46eb13f48b19eb Mon Sep 17 00:00:00 2001
From: Sergey Vladimirov <sergey@apache.org>
Date: Tue, 9 Aug 2011 07:00:02 +0000
Subject: [PATCH] deprecate org.apache.poi.hdf package

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1155233 13f79535-47bb-0310-9956-ffa450edef68
---
 src/scratchpad/src/org/apache/poi/hdf/event/EventBridge.java   | 1 +
 .../org/apache/poi/hdf/event/HDFLowLevelParsingListener.java   | 1 +
 .../src/org/apache/poi/hdf/event/HDFParsingListener.java       | 1 +
 src/scratchpad/src/org/apache/poi/hdf/extractor/CHP.java       | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/extractor/FontTable.java | 2 +-
 .../src/org/apache/poi/hdf/extractor/HeaderFooter.java         | 2 +-
 .../src/org/apache/poi/hdf/extractor/NewOleFile.java           | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/extractor/PAP.java       | 2 +-
 .../src/org/apache/poi/hdf/extractor/PropertySet.java          | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/extractor/SEP.java       | 2 +-
 .../src/org/apache/poi/hdf/extractor/StyleDescription.java     | 2 +-
 .../src/org/apache/poi/hdf/extractor/StyleSheet.java           | 1 +
 src/scratchpad/src/org/apache/poi/hdf/extractor/TAP.java       | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/extractor/TC.java        | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/extractor/TableRow.java  | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/extractor/TextPiece.java | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/extractor/Utils.java     | 2 +-
 .../src/org/apache/poi/hdf/extractor/WordDocument.java         | 1 +
 src/scratchpad/src/org/apache/poi/hdf/extractor/data/DOP.java  | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFO.java  | 2 +-
 .../src/org/apache/poi/hdf/extractor/data/LFOLVL.java          | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/extractor/data/LST.java  | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/extractor/data/LVL.java  | 3 +--
 .../src/org/apache/poi/hdf/extractor/data/ListTables.java      | 2 +-
 .../src/org/apache/poi/hdf/extractor/util/BTreeSet.java        | 2 +-
 .../src/org/apache/poi/hdf/extractor/util/ChpxNode.java        | 2 +-
 .../src/org/apache/poi/hdf/extractor/util/NumberFormatter.java | 2 +-
 .../src/org/apache/poi/hdf/extractor/util/PapxNode.java        | 2 +-
 .../src/org/apache/poi/hdf/extractor/util/PropertyNode.java    | 2 +-
 .../src/org/apache/poi/hdf/extractor/util/SepxNode.java        | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java   | 1 +
 .../src/org/apache/poi/hdf/model/HDFObjectFactory.java         | 1 +
 .../src/org/apache/poi/hdf/model/HDFObjectModel.java           | 1 +
 .../apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java    | 1 +
 .../org/apache/poi/hdf/model/hdftypes/CharacterProperties.java | 2 +-
 .../src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java        | 2 +-
 .../org/apache/poi/hdf/model/hdftypes/DocumentProperties.java  | 2 +-
 .../apache/poi/hdf/model/hdftypes/FileInformationBlock.java    | 1 +
 .../src/org/apache/poi/hdf/model/hdftypes/FontTable.java       | 2 +-
 .../org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java   | 1 +
 .../src/org/apache/poi/hdf/model/hdftypes/HDFType.java         | 1 +
 .../src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java    | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java  | 2 +-
 .../src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java          | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java  | 2 +-
 src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java  | 3 +--
 .../src/org/apache/poi/hdf/model/hdftypes/ListTables.java      | 2 +-
 .../apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java    | 1 +
 .../src/org/apache/poi/hdf/model/hdftypes/PapxNode.java        | 2 +-
 .../org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java | 2 +-
 .../src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java       | 1 +
 .../src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java    | 1 +
 .../org/apache/poi/hdf/model/hdftypes/SectionProperties.java   | 2 +-
 .../src/org/apache/poi/hdf/model/hdftypes/SepxNode.java        | 2 +-
 .../org/apache/poi/hdf/model/hdftypes/StyleDescription.java    | 2 +-
 .../src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java      | 1 +
 .../org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java | 2 +-
 .../src/org/apache/poi/hdf/model/hdftypes/TableProperties.java | 2 +-
 .../src/org/apache/poi/hdf/model/hdftypes/TextPiece.java       | 2 +-
 .../poi/hdf/model/hdftypes/definitions/CHPAbstractType.java    | 1 +
 .../poi/hdf/model/hdftypes/definitions/DOPAbstractType.java    | 1 +
 .../poi/hdf/model/hdftypes/definitions/FIBAbstractType.java    | 1 +
 .../poi/hdf/model/hdftypes/definitions/PAPAbstractType.java    | 1 +
 .../poi/hdf/model/hdftypes/definitions/SEPAbstractType.java    | 1 +
 .../poi/hdf/model/hdftypes/definitions/TAPAbstractType.java    | 1 +
 .../poi/hdf/model/hdftypes/definitions/TCAbstractType.java     | 1 +
 src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java | 2 +-
 .../src/org/apache/poi/hdf/model/util/NumberFormatter.java     | 2 +-
 .../src/org/apache/poi/hdf/model/util/ParsingState.java        | 1 +
 69 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/src/scratchpad/src/org/apache/poi/hdf/event/EventBridge.java b/src/scratchpad/src/org/apache/poi/hdf/event/EventBridge.java
index b93ac1f6d..d4f69476b 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/event/EventBridge.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/event/EventBridge.java
@@ -26,6 +26,7 @@ import org.apache.poi.util.LittleEndian;
 
 import java.util.ArrayList;
 
+@Deprecated
 public final class EventBridge implements HDFLowLevelParsingListener
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java b/src/scratchpad/src/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java
index 3358832d3..6e087bf5f 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/event/HDFLowLevelParsingListener.java
@@ -26,6 +26,7 @@ import org.apache.poi.hdf.model.hdftypes.FontTable;
 import org.apache.poi.hdf.model.hdftypes.ListTables;
 import org.apache.poi.hdf.model.hdftypes.StyleSheet;
 
+@Deprecated
 public interface HDFLowLevelParsingListener
 {
   public void mainDocument(byte[] mainDocument);
diff --git a/src/scratchpad/src/org/apache/poi/hdf/event/HDFParsingListener.java b/src/scratchpad/src/org/apache/poi/hdf/event/HDFParsingListener.java
index aa8f2b5c7..4221d09c5 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/event/HDFParsingListener.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/event/HDFParsingListener.java
@@ -23,6 +23,7 @@ import org.apache.poi.hdf.model.hdftypes.ParagraphProperties;
 import org.apache.poi.hdf.model.hdftypes.TableProperties;
 import org.apache.poi.hdf.model.hdftypes.DocumentProperties;
 
+@Deprecated
 public interface HDFParsingListener
 {
   public void document(DocumentProperties dop);
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/CHP.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/CHP.java
index 50bfc1a36..bf6ff7ac2 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/CHP.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/CHP.java
@@ -23,7 +23,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class CHP implements Cloneable
 {
   boolean _bold;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/FontTable.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/FontTable.java
index 1c9eab6e9..f51c5078b 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/FontTable.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/FontTable.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class FontTable
 {
   String[] fontNames;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java
index 3a3ea083a..41fbb623a 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/HeaderFooter.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class HeaderFooter
 {
   public static final int HEADER_EVEN = 1;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/NewOleFile.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/NewOleFile.java
index e09da018d..857b52ddb 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/NewOleFile.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/NewOleFile.java
@@ -25,7 +25,7 @@ import java.util.*;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class NewOleFile extends RandomAccessFile
 {
     private byte[] LAOLA_ID_ARRAY = new byte[]{(byte)0xd0, (byte)0xcf, (byte)0x11,
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/PAP.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/PAP.java
index 1075e145d..08ff91179 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/PAP.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/PAP.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class PAP implements Cloneable
 {
   int _istd;//index to style descriptor.
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/PropertySet.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/PropertySet.java
index 61b7dc52b..3b8f630ba 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/PropertySet.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/PropertySet.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class PropertySet
 {
     private String _name;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/SEP.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/SEP.java
index 300c2f8ad..0c136e24c 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/SEP.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/SEP.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class SEP
 {
   int _index;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleDescription.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleDescription.java
index b011b425e..e01590fa5 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleDescription.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleDescription.java
@@ -23,7 +23,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class StyleDescription
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java
index 4681f85cf..3c1cfda4b 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/StyleSheet.java
@@ -22,6 +22,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
+@Deprecated
 public final class StyleSheet {
 
   private static final int NIL_STYLE = 4095;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TAP.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/TAP.java
index 42ccde284..d28980637 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/TAP.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/TAP.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class TAP
 {
   short _jc;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TC.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/TC.java
index be201b52c..54dcdf575 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/TC.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/TC.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class TC
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TableRow.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/TableRow.java
index c95d0980a..ff737f298 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/TableRow.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/TableRow.java
@@ -24,7 +24,7 @@ import java.util.*;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class TableRow
 {
   TAP _descriptor;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/TextPiece.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/TextPiece.java
index 378b78fb9..059b467a3 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/TextPiece.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/TextPiece.java
@@ -24,7 +24,7 @@ import org.apache.poi.hdf.extractor.util.*;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class TextPiece extends PropertyNode implements Comparable
 {
   private boolean _usesUnicode;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/Utils.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/Utils.java
index 7c222ec81..6caf73b0c 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/Utils.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/Utils.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class Utils
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java
index 3a4651d4f..a779b6fc4 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/WordDocument.java
@@ -35,6 +35,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Ryan Ackley
  */
+@Deprecated
 public final class WordDocument {
 	// TODO - name this constant properly
 	private static final float K_1440_0F = 1440.0f;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/DOP.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/DOP.java
index 9e5ae6ce2..5be8537fa 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/DOP.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/DOP.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor.data;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class DOP
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFO.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFO.java
index 86e4cf0f2..81c41b9b5 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFO.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFO.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor.data;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class LFO
 {
   int _lsid;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFOLVL.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFOLVL.java
index 2984d9748..7bcceb636 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFOLVL.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LFOLVL.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor.data;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class LFOLVL
 {
   int _iStartAt;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LST.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LST.java
index 932a921c7..2332c2a08 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LST.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LST.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor.data;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class LST
 {
   int _lsid;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LVL.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LVL.java
index 0e0ed23f6..3b4b8f2e7 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LVL.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/LVL.java
@@ -22,8 +22,7 @@ package org.apache.poi.hdf.extractor.data;
  *
  * @author Ryan Ackley
  */
-
-
+@Deprecated
 public final class LVL
 {
   public int _iStartAt;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/ListTables.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/ListTables.java
index d9a8d481b..0e5fb4ccf 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/data/ListTables.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/data/ListTables.java
@@ -27,7 +27,7 @@ import org.apache.poi.hdf.extractor.*;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class ListTables
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
index 39e8d1e86..6e4647d2d 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/BTreeSet.java
@@ -34,7 +34,7 @@ import java.util.*;
  * @author Ryan Ackley
  *
 */
-
+@Deprecated
 public final class BTreeSet extends AbstractSet implements Set {
 
     /*
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/ChpxNode.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/ChpxNode.java
index 35e0da232..a87290635 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/ChpxNode.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/ChpxNode.java
@@ -23,7 +23,7 @@ package org.apache.poi.hdf.extractor.util;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class ChpxNode extends PropertyNode
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/NumberFormatter.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/NumberFormatter.java
index 5c9e7205d..dd383acc9 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/NumberFormatter.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/NumberFormatter.java
@@ -23,7 +23,7 @@ package org.apache.poi.hdf.extractor.util;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class NumberFormatter
 {
   private final static int ARABIC = 0;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PapxNode.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PapxNode.java
index 7ba34c029..b13877e4d 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PapxNode.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PapxNode.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor.util;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class PapxNode extends PropertyNode
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PropertyNode.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PropertyNode.java
index aea50f1bf..05e35b3b7 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PropertyNode.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/PropertyNode.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor.util;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public abstract class PropertyNode implements Comparable {
   private byte[] _grpprl;
   private int _fcStart;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/SepxNode.java b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/SepxNode.java
index f5391d097..76cac5f31 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/extractor/util/SepxNode.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/extractor/util/SepxNode.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.extractor.util;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class SepxNode extends PropertyNode
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java b/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java
index 058f11118..3a09d7614 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/HDFDocument.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import org.apache.poi.hdf.event.HDFParsingListener;
 import org.apache.poi.hdf.event.EventBridge;
 
+@Deprecated
 public final class HDFDocument
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java b/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java
index f137944a6..3df1b5d58 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectFactory.java
@@ -35,6 +35,7 @@ import org.apache.poi.util.LittleEndian;
  * that represent the data.
  * @author  andy
  */
+@Deprecated
 public final class HDFObjectFactory {
 
     /** OLE stuff*/
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java b/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java
index e0c84314f..d6bba0d6e 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/HDFObjectModel.java
@@ -30,6 +30,7 @@ import org.apache.poi.hdf.model.hdftypes.ListTables;
 import org.apache.poi.hdf.model.hdftypes.StyleSheet;
 
 
+@Deprecated
 public final class HDFObjectModel implements HDFLowLevelParsingListener
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java
index 7eb167ead..8141705e6 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CHPFormattedDiskPage.java
@@ -35,6 +35,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Ryan Ackley
  */
+@Deprecated
 public final class CHPFormattedDiskPage extends FormattedDiskPage
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java
index a85edbad4..6cd868c4d 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/CharacterProperties.java
@@ -23,7 +23,7 @@ import org.apache.poi.hdf.model.hdftypes.definitions.CHPAbstractType;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class CharacterProperties extends CHPAbstractType implements Cloneable
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java
index ab0845358..94de02806 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ChpxNode.java
@@ -23,7 +23,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class ChpxNode extends PropertyNode
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java
index 2020d78f4..0a21beba6 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/DocumentProperties.java
@@ -23,7 +23,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class DocumentProperties implements HDFType
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java
index bd3bfb326..74ad9a20c 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FileInformationBlock.java
@@ -24,6 +24,7 @@ import org.apache.poi.hdf.model.hdftypes.definitions.FIBAbstractType;
  *
  * @author  andy
  */
+@Deprecated
 public final class FileInformationBlock extends FIBAbstractType
 {
 /*
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java
index e1aa22f82..1d115b4df 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FontTable.java
@@ -23,7 +23,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class FontTable implements HDFType
 {
   String[] fontNames;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java
index ba912cb7c..9e8726909 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/FormattedDiskPage.java
@@ -39,6 +39,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Ryan Ackley
  */
+@Deprecated
 public abstract class FormattedDiskPage
 {
     protected byte[] _fkp;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java
index f82a0295b..7e2c87454 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HDFType.java
@@ -21,6 +21,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author  andy
  */
+@Deprecated
 public interface HDFType {
 
 }
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
index f42fb2251..650d8c2ed 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/HeaderFooter.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class HeaderFooter
 {
   public static final int HEADER_EVEN = 1;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java
index 0294ed43d..e5357d554 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFO.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class LFO
 {
   int _lsid;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java
index 78425fa60..dda687a3e 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LFOLVL.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class LFOLVL
 {
   int _iStartAt;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java
index fd8405b97..4b0bbe238 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LST.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class LST
 {
   int _lsid;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java
index 68e891a0b..4fe8e173d 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/LVL.java
@@ -22,8 +22,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
-
-
+@Deprecated
 public final class LVL
 {
   public int _iStartAt;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java
index 8107210a6..279285b43 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ListTables.java
@@ -27,7 +27,7 @@ import org.apache.poi.hdf.extractor.*;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class ListTables implements HDFType
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java
index 40b712f9d..70e7e229a 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PAPFormattedDiskPage.java
@@ -35,6 +35,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Ryan Ackley
  */
+@Deprecated
 public final class PAPFormattedDiskPage extends FormattedDiskPage
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java
index 14a000f82..12e282973 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PapxNode.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class PapxNode extends PropertyNode
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java
index ce4495ac3..686e75d42 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/ParagraphProperties.java
@@ -23,7 +23,7 @@ import org.apache.poi.hdf.model.hdftypes.definitions.PAPAbstractType;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class ParagraphProperties  extends PAPAbstractType implements Cloneable
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java
index b757be7be..98a9e69a3 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PlexOfCps.java
@@ -28,6 +28,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
+@Deprecated
 public final class PlexOfCps
 {
     private int _count;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java
index d41e63d1e..82b5aeead 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/PropertyNode.java
@@ -24,6 +24,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
+@Deprecated
 public abstract class PropertyNode implements Comparable {
   private byte[] _grpprl;
   private int _fcStart;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java
index ec480cbc2..463c9056d 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SectionProperties.java
@@ -23,7 +23,7 @@ import org.apache.poi.hdf.model.hdftypes.definitions.SEPAbstractType;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class SectionProperties extends SEPAbstractType implements HDFType
 {
   /*int _index;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java
index f7d293ce5..dd4fc6806 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/SepxNode.java
@@ -22,7 +22,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class SepxNode extends PropertyNode
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java
index d3297c213..9e3d6c239 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleDescription.java
@@ -23,7 +23,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class StyleDescription implements HDFType
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
index 7f575e59e..9ddb2da82 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/StyleSheet.java
@@ -28,6 +28,7 @@ import org.apache.poi.hdf.model.hdftypes.definitions.TCAbstractType;
  *
  * @author Ryan Ackley
  */
+@Deprecated
 public final class StyleSheet implements HDFType {
 
   private static final int NIL_STYLE = 4095;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java
index c58f5f05b..bbab0ea85 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableCellDescriptor.java
@@ -24,7 +24,7 @@ import org.apache.poi.util.LittleEndian;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class TableCellDescriptor extends TCAbstractType implements HDFType
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java
index af029a290..e011e5c62 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TableProperties.java
@@ -24,7 +24,7 @@ import org.apache.poi.hdf.model.hdftypes.definitions.TAPAbstractType;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class TableProperties extends TAPAbstractType
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java
index 61da53bc2..ef5bea8cc 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/TextPiece.java
@@ -24,7 +24,7 @@ package org.apache.poi.hdf.model.hdftypes;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class TextPiece extends PropertyNode implements Comparable
 {
   private boolean _usesUnicode;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java
index 1c123e851..86fb5a825 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/CHPAbstractType.java
@@ -29,6 +29,7 @@ import org.apache.poi.hdf.model.hdftypes.HDFType;
 
  * @author S. Ryan Ackley
  */
+@Deprecated
 public abstract class CHPAbstractType
     implements HDFType
 {
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java
index 43fe561bb..2f49e3a89 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/DOPAbstractType.java
@@ -32,6 +32,7 @@ import org.apache.poi.hdf.model.hdftypes.HDFType;
 
  * @author S. Ryan Ackley
  */
+@Deprecated
 public abstract class DOPAbstractType
     implements HDFType
 {
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java
index 1eb3f0b5a..bfdaf50bb 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/FIBAbstractType.java
@@ -31,6 +31,7 @@ import org.apache.poi.hdf.model.hdftypes.HDFType;
 
  * @author Andrew C. Oliver
  */
+@Deprecated
 public abstract class FIBAbstractType
     implements HDFType
 {
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java
index 0d825e49f..6fbade2c6 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/PAPAbstractType.java
@@ -29,6 +29,7 @@ import org.apache.poi.hdf.model.hdftypes.HDFType;
 
  * @author S. Ryan Ackley
  */
+@Deprecated
 public abstract class PAPAbstractType
     implements HDFType
 {
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java
index e790f8d3b..fda860f33 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/SEPAbstractType.java
@@ -27,6 +27,7 @@ import org.apache.poi.hdf.model.hdftypes.HDFType;
 
  * @author S. Ryan Ackley
  */
+@Deprecated
 public abstract class SEPAbstractType
     implements HDFType
 {
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java
index 512dd3761..9fa50802e 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TAPAbstractType.java
@@ -26,6 +26,7 @@ import org.apache.poi.hdf.model.hdftypes.HDFType;
 
  * @author S. Ryan Ackley
  */
+@Deprecated
 public abstract class TAPAbstractType
     implements HDFType
 {
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java
index a365d65e5..4fba7fe3e 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/hdftypes/definitions/TCAbstractType.java
@@ -28,6 +28,7 @@ import org.apache.poi.hdf.model.hdftypes.HDFType;
 
  * @author S. Ryan Ackley
  */
+@Deprecated
 public abstract class TCAbstractType
     implements HDFType
 {
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java b/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
index a9241f914..848e74a80 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/util/BTreeSet.java
@@ -35,7 +35,7 @@ import org.apache.poi.hdf.model.hdftypes.PropertyNode;
  * @author Ryan Ackley
  *
 */
-
+@Deprecated
 public final class BTreeSet extends AbstractSet
 {
 
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java b/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java
index 48ccceb54..981c4b29c 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/util/NumberFormatter.java
@@ -23,7 +23,7 @@ package org.apache.poi.hdf.model.util;
  *
  * @author Ryan Ackley
  */
-
+@Deprecated
 public final class NumberFormatter
 {
   private final static int ARABIC = 0;
diff --git a/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java b/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java
index 77950d7ed..70b39d0ef 100644
--- a/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java
+++ b/src/scratchpad/src/org/apache/poi/hdf/model/util/ParsingState.java
@@ -19,6 +19,7 @@ package org.apache.poi.hdf.model.util;
 
 import org.apache.poi.hdf.model.hdftypes.FormattedDiskPage;
 
+@Deprecated
 public final class ParsingState
 {