bug 59170: remove deprecated WordExtractor constructor; add version when deprecated...

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

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java b/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
index ee0a615ebfd1b7fef98fc86ee1ba8efb123bed28..d5dc0689243673c3f13ef6dc027285887386722d 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
@@ -64,16 +64,6 @@ public final class WordExtractor extends POIOLE2TextExtractor
         this( new HWPFDocument( fs ) );
     }
 
-    /**
-     * @deprecated Use {@link #WordExtractor(DirectoryNode)} instead
-     */
-    @Deprecated
-    public WordExtractor( DirectoryNode dir, POIFSFileSystem fs )
-            throws IOException
-    {
-        this( dir );
-    }
-
     public WordExtractor( DirectoryNode dir ) throws IOException
     {
         this( new HWPFDocument( dir ) );
@@ -213,6 +203,7 @@ public final class WordExtractor extends POIOLE2TextExtractor
 
     /**
      * Grab the text from the headers
+     * @deprecated 3.8 beta 4
      */
     @Deprecated
     public String getHeaderText()
@@ -238,6 +229,7 @@ public final class WordExtractor extends POIOLE2TextExtractor
 
     /**
      * Grab the text from the footers
+     * @deprecated 3.8 beta 4
      */
     @Deprecated
     public String getFooterText()

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java
index 5b8c80501c2ec29d757a6a00aae0d517e26f7ac6..84a0e9b34a4c0eb4ecca693ae23c4322c98496fe 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java
@@ -82,36 +82,54 @@ public final class HeaderStories {
                 fib.getPlcfHddSize(), 0 );
     }
 
+    /**
+     * @deprecated 3.8 beta 4 
+     */
     @Deprecated
     public String getFootnoteSeparator()
     {
         return getAt( 0 );
     }
 
+    /**
+     * @deprecated 3.8 beta 4 
+     */
     @Deprecated
     public String getFootnoteContSeparator()
     {
         return getAt( 1 );
     }
 
+    /**
+     * @deprecated 3.8 beta 4 
+     */
     @Deprecated
     public String getFootnoteContNote()
     {
         return getAt( 2 );
     }
 
+    /**
+     * @deprecated 3.8 beta 4 
+     */
     @Deprecated
     public String getEndnoteSeparator()
     {
         return getAt( 3 );
     }
 
+    /**
+     * @deprecated 3.8 beta 4 
+     */
     @Deprecated
     public String getEndnoteContSeparator()
     {
         return getAt( 4 );
     }
 
+    /**
+     * @deprecated 3.8 beta 4 
+     */
     @Deprecated
     public String getEndnoteContNote()
     {
@@ -148,16 +166,25 @@ public final class HeaderStories {
         return getSubrangeAt( 5 );
     }
 
+    /**
+     * @deprecated 3.8 beta 4 
+     */
        @Deprecated
        public String getEvenHeader() {
                return getAt(6+0);
        }
+       /**
+     * @deprecated 3.8 beta 4 
+     */
     @Deprecated
-       public String getOddHeader() {
+    public String getOddHeader() {
                return getAt(6+1);
        }
+    /**
+     * @deprecated 3.8 beta 4 
+     */
     @Deprecated
-       public String getFirstHeader() {
+    public String getFirstHeader() {
                return getAt(6+4);
        }
        
@@ -196,18 +223,27 @@ public final class HeaderStories {
                return getOddHeader();
        }
 
-       @Deprecated
+       /**
+     * @deprecated 3.8 beta 4 
+     */
+    @Deprecated
     public String getEvenFooter()
     {
         return getAt( 6 + 2 );
     }
 
+       /**
+     * @deprecated 3.8 beta 4 
+     */
     @Deprecated
     public String getOddFooter()
     {
         return getAt( 6 + 3 );
     }
 
+    /**
+     * @deprecated 3.8 beta 4 
+     */
     @Deprecated
     public String getFirstFooter()
     {
@@ -257,6 +293,7 @@ public final class HeaderStories {
        /**
         * Get the string that's pointed to by the
         *  given plcfHdd index
+        * @deprecated 3.8 beta 4
         */
     @Deprecated
        private String getAt(int plcfHddIndex) {