Generics fixes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1614788 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2014-07-30 23:05:58 +00:00
parent bdb9bbccc1
commit bf860eccf1

View File

@ -22,13 +22,14 @@ import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener;
import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener; import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener;
import org.apache.poi.hssf.eventusermodel.HSSFEventFactory; import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
import org.apache.poi.hssf.eventusermodel.HSSFListener; import org.apache.poi.hssf.eventusermodel.HSSFListener;
import org.apache.poi.hssf.eventusermodel.HSSFRequest; import org.apache.poi.hssf.eventusermodel.HSSFRequest;
import org.apache.poi.hssf.eventusermodel.MissingRecordAwareHSSFListener; import org.apache.poi.hssf.eventusermodel.MissingRecordAwareHSSFListener;
import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener;
import org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord; import org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord;
import org.apache.poi.hssf.eventusermodel.dummyrecord.MissingCellDummyRecord; import org.apache.poi.hssf.eventusermodel.dummyrecord.MissingCellDummyRecord;
import org.apache.poi.hssf.model.HSSFFormulaParser; import org.apache.poi.hssf.model.HSSFFormulaParser;
@ -75,7 +76,7 @@ public class XLS2CSVmra implements HSSFListener {
/** So we known which sheet we're on */ /** So we known which sheet we're on */
private int sheetIndex = -1; private int sheetIndex = -1;
private BoundSheetRecord[] orderedBSRs; private BoundSheetRecord[] orderedBSRs;
private ArrayList boundSheetRecords = new ArrayList(); private List<BoundSheetRecord> boundSheetRecords = new ArrayList<BoundSheetRecord>();
// For handling formulas with string results // For handling formulas with string results
private int nextRow; private int nextRow;
@ -140,7 +141,7 @@ public class XLS2CSVmra implements HSSFListener {
switch (record.getSid()) switch (record.getSid())
{ {
case BoundSheetRecord.sid: case BoundSheetRecord.sid:
boundSheetRecords.add(record); boundSheetRecords.add((BoundSheetRecord)record);
break; break;
case BOFRecord.sid: case BOFRecord.sid:
BOFRecord br = (BOFRecord)record; BOFRecord br = (BOFRecord)record;