poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r898769 - in /poi/trunk/src/java/org/apache/poi: hssf/usermodel/HSSFWorkbook.java ss/usermodel/Workbook.java
Date Wed, 13 Jan 2010 14:25:32 GMT
Author: nick
Date: Wed Jan 13 14:25:31 2010
New Revision: 898769

URL: http://svn.apache.org/viewvc?rev=898769&view=rev
Log:
Tweak the generics definition on workbook so that method signatures on hssf and xssf won't
need to change

Modified:
    poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
    poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java

Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=898769&r1=898768&r2=898769&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java Wed Jan 13 14:25:31
2010
@@ -1569,10 +1569,10 @@
      *
      * @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 @@
      * @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())

Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java?rev=898769&r1=898768&r2=898769&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/Workbook.java Wed Jan 13 14:25:31 2010
@@ -405,7 +405,7 @@
      *
      * @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



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message