Author: nick
Date: Wed Jan 13 13:42:15 2010
New Revision: 898748
URL: http://svn.apache.org/viewvc?rev=898748&view=rev
Log:
Fix a few generics warnings
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
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/record/AbstractEscherHolderRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java?rev=898748&r1=898747&r2=898748&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
Wed Jan 13 13:42:15 2010
@@ -46,18 +46,18 @@
}
}
- private List escherRecords;
+ private List<EscherRecord> escherRecords;
private byte[] rawData;
public AbstractEscherHolderRecord()
{
- escherRecords = new ArrayList();
+ escherRecords = new ArrayList<EscherRecord>();
}
public AbstractEscherHolderRecord(RecordInputStream in)
{
- escherRecords = new ArrayList();
+ escherRecords = new ArrayList<EscherRecord>();
if (! DESERIALISE )
{
rawData = in.readRemainder();
@@ -93,9 +93,9 @@
buffer.append('[' + getRecordName() + ']' + nl);
if (escherRecords.size() == 0)
buffer.append("No Escher Records Decoded" + nl);
- for ( Iterator iterator = escherRecords.iterator();
iterator.hasNext(); )
+ for ( Iterator<EscherRecord> iterator = escherRecords.iterator();
iterator.hasNext(); )
{
- EscherRecord r = (EscherRecord) iterator.next();
+ EscherRecord r = iterator.next();
buffer.append(r.toString());
}
buffer.append("[/" + getRecordName() + ']' + nl);
@@ -120,9 +120,9 @@
LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4));
int pos = offset + 4;
- for ( Iterator iterator = escherRecords.iterator();
iterator.hasNext(); )
+ for ( Iterator<EscherRecord> iterator = escherRecords.iterator();
iterator.hasNext(); )
{
- EscherRecord r = (EscherRecord) iterator.next();
+ EscherRecord r = iterator.next();
pos += r.serialize( pos, data, new
NullEscherSerializationListener() );
}
return getRecordSize();
@@ -133,9 +133,9 @@
return rawData.length;
}
int size = 0;
- for ( Iterator iterator = escherRecords.iterator();
iterator.hasNext(); )
+ for ( Iterator<EscherRecord> iterator = escherRecords.iterator();
iterator.hasNext(); )
{
- EscherRecord r = (EscherRecord) iterator.next();
+ EscherRecord r = iterator.next();
size += r.getRecordSize();
}
return size;
@@ -160,7 +160,7 @@
return escherRecords.add( element );
}
- public List getEscherRecords()
+ public List<EscherRecord> getEscherRecords()
{
return escherRecords;
}
@@ -176,8 +176,8 @@
* then return that.
*/
public EscherContainerRecord getEscherContainer() {
- for(Iterator it = escherRecords.iterator(); it.hasNext();) {
- Object er = it.next();
+ for(Iterator<EscherRecord> it = escherRecords.iterator();
it.hasNext();) {
+ EscherRecord er = it.next();
if(er instanceof EscherContainerRecord) {
return (EscherContainerRecord)er;
}
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=898748&r1=898747&r2=898748&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 13:42:15 2010
@@ -67,6 +67,7 @@
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.ss.usermodel.CreationHelper;
+import org.apache.poi.ss.usermodel.PictureData;
import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
import org.apache.poi.ss.formula.FormulaType;
import org.apache.poi.util.POILogFactory;
@@ -1568,18 +1569,18 @@
*
* @return the list of pictures (a list of {...@link HSSFPictureData}
objects.)
*/
- public List<HSSFPictureData> getAllPictures()
+ public List<PictureData> getAllPictures()
{
// The drawing group record always exists at the top level, so we
won't need to do this recursively.
- List<HSSFPictureData> pictures = new ArrayList<HSSFPictureData>();
- Iterator recordIter = workbook.getRecords().iterator();
+ List<PictureData> pictures = new ArrayList<PictureData>();
+ Iterator<Record> recordIter = workbook.getRecords().iterator();
while (recordIter.hasNext())
{
- Object obj = recordIter.next();
- if (obj instanceof AbstractEscherHolderRecord)
+ Record r = recordIter.next();
+ if (r instanceof AbstractEscherHolderRecord)
{
- ((AbstractEscherHolderRecord) obj).decode();
- List escherRecords = ((AbstractEscherHolderRecord)
obj).getEscherRecords();
+ ((AbstractEscherHolderRecord) r).decode();
+ List<EscherRecord> escherRecords =
((AbstractEscherHolderRecord) r).getEscherRecords();
searchForPictures(escherRecords, pictures);
}
}
@@ -1592,7 +1593,7 @@
* @param escherRecords the escher records.
* @param pictures the list to populate with the pictures.
*/
- private void searchForPictures(List escherRecords, List<HSSFPictureData>
pictures)
+ private void searchForPictures(List escherRecords, List<PictureData>
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=898748&r1=898747&r2=898748&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
13:42:15 2010
@@ -405,7 +405,7 @@
*
* @return the list of pictures (a list of {...@link PictureData} objects.)
*/
- List getAllPictures();
+ List<PictureData> getAllPictures();
/**
* Returns an object that handles instantiating concrete
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
