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

Tweak the generics definition on workbook so that method signatures on hssf and xssf won't need to change

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@898769 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2010-01-13 14:25:31 +00:00
parent b5ccd57cd6
commit 0d7ef148b5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
View File

@ -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.) * @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. // 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(); Iterator<Record> recordIter = workbook.getRecords().iterator();
while (recordIter.hasNext()) while (recordIter.hasNext())
{ {
@ -1593,7 +1593,7 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss
* @param escherRecords the escher records. * @param escherRecords the escher records.
* @param pictures the list to populate with the pictures. * @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(); Iterator recordIter = escherRecords.iterator();
while (recordIter.hasNext()) while (recordIter.hasNext())

2
src/java/org/apache/poi/ss/usermodel/Workbook.java
View File

@ -405,7 +405,7 @@ public interface Workbook {
* *
* @return the list of pictures (a list of {@link PictureData} objects.) * @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 * Returns an object that handles instantiating concrete