Tweak the generics definition on workbook so that method signatures on hssf and xssf...

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

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
index d71d62dbd941d07a01580b993251d8feee6502ac..5c8c30eed72f7e9fed5c9030c8fb8345e84085c5 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
@@ -1569,10 +1569,10 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      *
      * @return the list of pictures (a list of {@link HSSFPictureData} objects.)
      */
-    public List<PictureData> getAllPictures()
+    public List<HSSFPictureData> getAllPictures()
     {
         // The drawing group record always exists at the top level, so we won't need to do this recursively.
-        List<PictureData> pictures = new ArrayList<PictureData>();
+        List<HSSFPictureData> pictures = new ArrayList<HSSFPictureData>();
         Iterator<Record> recordIter = workbook.getRecords().iterator();
         while (recordIter.hasNext())
         {
@@ -1593,7 +1593,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
      * @param escherRecords the escher records.
      * @param pictures the list to populate with the pictures.
      */
-    private void searchForPictures(List escherRecords, List<PictureData> pictures)
+    private void searchForPictures(List escherRecords, List<HSSFPictureData> pictures)
     {
         Iterator recordIter = escherRecords.iterator();
         while (recordIter.hasNext())

diff --git a/src/java/org/apache/poi/ss/usermodel/Workbook.java b/src/java/org/apache/poi/ss/usermodel/Workbook.java
index 53ddb8fa53d1047aadfce4bcef8895c6938fb09d..5967d8dedbbc298ff68163158603ac360b2813dd 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/Workbook.java
+++ b/src/java/org/apache/poi/ss/usermodel/Workbook.java
@@ -405,7 +405,7 @@ public interface Workbook {
      *
      * @return the list of pictures (a list of {@link PictureData} objects.)
      */
-    List<PictureData> getAllPictures();
+    List<? extends PictureData> getAllPictures();
 
     /**
      * Returns an object that handles instantiating concrete