Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 59170: remove deprecated WordExtractor constructor; add version when deprecated to HWPF HeaderStories 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1748786 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-06-17 01:19:36 +00:00
parent 56ff882bef
commit 2a884279c1
2 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
View File

@ -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()

43
src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java
View File

@ -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) {