You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by on...@apache.org on 2016/06/17 00:55:22 UTC
svn commit: r1748783 - in /poi/trunk/src/scratchpad:
src/org/apache/poi/hslf/extractor/ src/org/apache/poi/hslf/record/
src/org/apache/poi/hslf/usermodel/ src/org/apache/poi/hwpf/
testcases/org/apache/poi/hwpf/extractor/
Author: onealj
Date: Fri Jun 17 00:55:22 2016
New Revision: 1748783
URL: http://svn.apache.org/viewvc?rev=1748783&view=rev
Log:
bug 59170: remove deprecated HSLF and HWPF methods
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java?rev=1748783&r1=1748782&r2=1748783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java Fri Jun 17 00:55:22 2016
@@ -118,14 +118,6 @@ public final class PowerPointExtractor e
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
*
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java?rev=1748783&r1=1748782&r2=1748783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java Fri Jun 17 00:55:22 2016
@@ -85,17 +85,6 @@ public final class PersistPtrHolder exte
}
/**
- * 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
*/
protected PersistPtrHolder(byte[] source, int start, int len) {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java?rev=1748783&r1=1748782&r2=1748783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java Fri Jun 17 00:55:22 2016
@@ -193,16 +193,6 @@ public abstract class HSLFPictureData im
}
/**
- * 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
*/
public int getIndex() {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java?rev=1748783&r1=1748782&r2=1748783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java Fri Jun 17 00:55:22 2016
@@ -141,21 +141,6 @@ public final class HSLFSlideShowImpl ext
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
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java?rev=1748783&r1=1748782&r2=1748783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java Fri Jun 17 00:55:22 2016
@@ -189,22 +189,6 @@ public final class HWPFDocument extends
/**
* 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.
* Used typically to open embeded documents.
*
* @param directory The DirectoryNode that contains the Word document.
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java?rev=1748783&r1=1748782&r2=1748783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java Fri Jun 17 00:55:22 2016
@@ -44,11 +44,6 @@ public class HWPFOldDocument extends HWP
this(fs.getRoot());
}
- @Deprecated
- public HWPFOldDocument(DirectoryNode directory, POIFSFileSystem fs)
- throws IOException {
- this(directory);
- }
public HWPFOldDocument(DirectoryNode directory)
throws IOException {
super(directory);
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java?rev=1748783&r1=1748782&r2=1748783&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java Fri Jun 17 00:55:22 2016
@@ -161,7 +161,7 @@ public final class TestWordExtractor ext
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 ext
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());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org