bug 59170: remove deprecated HSLF and HWPF methods

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

diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
index 1ce8029f47ba00431671e469b1ac6ad5297e0da9..f248ab633db487c42ecf84524e7c7c762d3a3d55 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java
@@ -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
         *

diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java b/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
index 3095b5e4223e6a18cf16d6be04c54578104a27c3..32b36a21b92e8821b4f3fa39a870900d5c3ec14c 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
@@ -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
         */

diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
index 199ada8fcf3bebf89534f6e255ce1b29b2f4b8dd..f3da76097231aaffb45e9bc1482ef2c3ca71483d 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
@@ -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
      */

diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
index a1e76d560a07361c31185f079f96b6b4e0b3c753..d878182b3715d03832407a8ba1ce3129dfe0b021 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
@@ -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

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
index 8bc5ba6f7888a75c537617e20f1d68a35f40bf12..872ed1d2fde12c6d9854a8bfe4266358f45b6afe 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
@@ -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.

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
index 1ea906a282d9b120dc2003d61c795f3f5bb62494..7930d4ac5522a61e3835787d1b5363a6e5c1aef4 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
@@ -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);

diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java b/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
index 1a69630a2cc15819ab09752b271fcff4e5dcd773..efc5c0a2073932f278d03d3954e7d67f802270d6 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
@@ -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());