Mailing-List: contact commits-help@poi.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@poi.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1748786 - in /poi/trunk/src/scratchpad/src/org/apache/poi/hwpf:
 extractor/WordExtractor.java usermodel/HeaderStories.java
Date: Fri, 17 Jun 2016 01:19:36 -0000
To: commits@poi.apache.org
From: onealj@apache.org
Message-Id: <20160617011937.0D1B93A0096@svn01-us-west.apache.org>
archived-at: Fri, 17 Jun 2016 01:19:42 -0000

Author: onealj
Date: Fri Jun 17 01:19:36 2016
New Revision: 1748786

URL: http://svn.apache.org/viewvc?rev=1748786&view=rev
Log:
bug 59170: remove deprecated WordExtractor constructor; add version when deprecated to HWPF HeaderStories

Modified:
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
    poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java?rev=1748786&r1=1748785&r2=1748786&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java Fri Jun 17 01:19:36 2016
@@ -64,16 +64,6 @@ public final class WordExtractor extends
         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
 
     /**
      * Grab the text from the headers
+     * @deprecated 3.8 beta 4
      */
     @Deprecated
     public String getHeaderText()
@@ -238,6 +229,7 @@ public final class WordExtractor extends
 
     /**
      * Grab the text from the footers
+     * @deprecated 3.8 beta 4
      */
     @Deprecated
     public String getFooterText()

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java?rev=1748786&r1=1748785&r2=1748786&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java Fri Jun 17 01:19:36 2016
@@ -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) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org