moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

bug 59170: remove deprecated HSLF and HWPF methods

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1748783 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-06-17 00:55:22 +00:00
parent 45ec02487c
commit ae12cfcd57
7 changed files with 2 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
View File

@ -118,14 +118,6 @@ public final class PowerPointExtractor extends POIOLE2TextExtractor {
this(new HSLFSlideShowImpl(dir));
}
/**
* @deprecated Use {@link #PowerPointExtractor(DirectoryNode)} instead
*/
@Deprecated
public PowerPointExtractor(DirectoryNode dir, POIFSFileSystem fs) throws IOException {
this(new HSLFSlideShowImpl(dir, fs));
}
/**
* Creates a PowerPointExtractor, from a HSLFSlideShow
*

11
src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
View File

@ -84,17 +84,6 @@ public final class PersistPtrHolder extends PositionDependentRecordAtom
return _slideLocations;
}
/**
* Get the lookup from slide numbers to their offsets inside
* _ptrData, used when adding or moving slides.
*
* @deprecated since POI 3.11, not supported anymore
*/
@Deprecated
public Hashtable<Integer,Integer> getSlideOffsetDataLocationsLookup() {
throw new UnsupportedOperationException("PersistPtrHolder.getSlideOffsetDataLocationsLookup() is not supported since 3.12-Beta1");
}
/**
* Create a new holder for a PersistPtr record
*/

10
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
View File

@ -192,16 +192,6 @@ public abstract class HSLFPictureData implements PictureData {
return header;
}
/**
* Return image size in bytes
*
* @return the size of the picture in bytes
* @deprecated Use <code>getData().length</code> instead.
*/
public int getSize(){
return getData().length;
}
/**
* @return the 1-based index of this pictures within the pictures stream
*/

15
src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
View File

@ -141,21 +141,6 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable {
this(filesystem.getRoot());
}
/**
* Constructs a Powerpoint document from a specific point in a
* POIFS Filesystem. Parses the document and places all the
* important stuff into data structures.
*
* @deprecated Use {@link #HSLFSlideShowImpl(DirectoryNode)} instead
* @param dir the POIFS directory to read from
* @param filesystem the POIFS FileSystem to read from
* @throws IOException if there is a problem while parsing the document.
*/
@Deprecated
public HSLFSlideShowImpl(DirectoryNode dir, POIFSFileSystem filesystem) throws IOException {
this(dir);
}
/**
* Constructs a Powerpoint document from a specific point in a
* POIFS Filesystem. Parses the document and places all the

16
src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
View File

@ -186,22 +186,6 @@ public final class HWPFDocument extends HWPFDocumentCore
this(pfilesystem.getRoot());
}
/**
* This constructor loads a Word document from a specific point
* in a POIFSFileSystem, probably not the default.
* Used typically to open embedded documents.
*
* @param pfilesystem The POIFSFileSystem that contains the Word document.
* @throws IOException If there is an unexpected IOException from the passed
* in POIFSFileSystem.
* @deprecated Use {@link #HWPFDocument(DirectoryNode)} instead
*/
@Deprecated
public HWPFDocument(DirectoryNode directory, POIFSFileSystem pfilesystem) throws IOException
{
this(directory);
}
/**
* This constructor loads a Word document from a specific point
* in a POIFSFileSystem, probably not the default.

5
src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
View File

@ -44,11 +44,6 @@ public class HWPFOldDocument extends HWPFDocumentCore {
this(fs.getRoot());
}
@Deprecated
public HWPFOldDocument(DirectoryNode directory, POIFSFileSystem fs)
throws IOException {
this(directory);
}
public HWPFOldDocument(DirectoryNode directory)
throws IOException {
super(directory);

4
src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
View File

@ -161,7 +161,7 @@ public final class TestWordExtractor extends TestCase {
assertNotNull(dirB.getEntry("WordDocument"));
// Check each in turn
doc = new HWPFDocument(dirA, fs);
doc = new HWPFDocument(dirA);
extractor3 = new WordExtractor(doc);
assertNotNull(extractor3.getText());
@ -171,7 +171,7 @@ public final class TestWordExtractor extends TestCase {
assertEquals("Sample Doc 1", extractor3.getSummaryInformation().getTitle());
assertEquals("Sample Test", extractor3.getSummaryInformation().getSubject());
doc = new HWPFDocument(dirB, fs);
doc = new HWPFDocument(dirB);
extractor3 = new WordExtractor(doc);
assertNotNull(extractor3.getText());