From dac67e887ea42125dfc794e1665e16271882e9be Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Thu, 9 Sep 2010 14:28:14 +0000 Subject: [PATCH] Fix generics warnings git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@995445 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/org/apache/poi/hwpf/HWPFDocument.java | 7 ++- .../apache/poi/hwpf/model/PicturesTable.java | 62 ++++++++----------- .../org/apache/poi/hwpf/TestHWPFPictures.java | 22 +++---- 3 files changed, 41 insertions(+), 50 deletions(-) diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java index 86b0ef2bf..a4b6fad8d 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Iterator; +import java.util.List; import org.apache.poi.hwpf.model.CHPBinTable; import org.apache.poi.hwpf.model.CPSplitCalculator; @@ -354,13 +355,13 @@ public final class HWPFDocument extends HWPFDocumentCore */ public int characterLength() { - java.util.List textPieces = _tpt.getTextPieces(); - Iterator textIt = textPieces.iterator(); + List textPieces = _tpt.getTextPieces(); + Iterator textIt = textPieces.iterator(); int length = 0; while(textIt.hasNext()) { - TextPiece tp = (TextPiece)textIt.next(); + TextPiece tp = textIt.next(); length += tp.characterLength(); } return length; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java index 1ffcaaa6c..57c1e5ce0 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java @@ -25,7 +25,6 @@ import org.apache.poi.hwpf.usermodel.Range; import java.util.List; import java.util.ArrayList; -import java.util.Iterator; import org.apache.poi.ddf.DefaultEscherRecordFactory; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherBlipRecord; @@ -146,42 +145,33 @@ public final class PicturesTable * @param escherRecords the escher records. * @param pictures the list to populate with the pictures. */ - private void searchForPictures(List escherRecords, List pictures) + private void searchForPictures(List escherRecords, List pictures) { - Iterator recordIter = escherRecords.iterator(); - while (recordIter.hasNext()) - { - Object obj = recordIter.next(); - if (obj instanceof EscherRecord) - { - EscherRecord escherRecord = (EscherRecord) obj; + for(EscherRecord escherRecord : escherRecords) { + if (escherRecord instanceof EscherBSERecord) { + EscherBSERecord bse = (EscherBSERecord) escherRecord; + EscherBlipRecord blip = bse.getBlipRecord(); + if (blip != null) + { + pictures.add(new Picture(blip.getPicturedata())); + } + else if (bse.getOffset() > 0) + { + // Blip stored in delay stream, which in a word doc, is the main stream + EscherRecordFactory recordFactory = new DefaultEscherRecordFactory(); + EscherRecord record = recordFactory.createRecord(_mainStream, bse.getOffset()); - if (escherRecord instanceof EscherBSERecord) - { - EscherBSERecord bse = (EscherBSERecord) escherRecord; - EscherBlipRecord blip = bse.getBlipRecord(); - if (blip != null) - { - pictures.add(new Picture(blip.getPicturedata())); - } - else if (bse.getOffset() > 0) - { - // Blip stored in delay stream, which in a word doc, is the main stream - EscherRecordFactory recordFactory = new DefaultEscherRecordFactory(); - EscherRecord record = recordFactory.createRecord(_mainStream, bse.getOffset()); + if (record instanceof EscherBlipRecord) { + record.fillFields(_mainStream, bse.getOffset(), recordFactory); + blip = (EscherBlipRecord) record; + pictures.add(new Picture(blip.getPicturedata())); + } + } + } - if (record instanceof EscherBlipRecord) { - record.fillFields(_mainStream, bse.getOffset(), recordFactory); - blip = (EscherBlipRecord) record; - pictures.add(new Picture(blip.getPicturedata())); - } - } - } - - // Recursive call. - searchForPictures(escherRecord.getChildRecords(), pictures); - } - } + // Recursive call. + searchForPictures(escherRecord.getChildRecords(), pictures); + } } /** @@ -190,8 +180,8 @@ public final class PicturesTable * * @return a list of Picture objects found in current document */ - public List getAllPictures() { - ArrayList pictures = new ArrayList(); + public List getAllPictures() { + ArrayList pictures = new ArrayList(); Range range = _document.getOverallRange(); for (int i = 0; i < range.numCharacterRuns(); i++) { diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java b/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java index 27189db74..f650f0d89 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java @@ -57,8 +57,8 @@ public final class TestHWPFPictures extends TestCase { * Test just opening the files */ public void testOpen() { - HWPFDocument docA = HWPFTestDataSamples.openSampleFile(docAFile); - HWPFDocument docB = HWPFTestDataSamples.openSampleFile(docBFile); + HWPFTestDataSamples.openSampleFile(docAFile); + HWPFTestDataSamples.openSampleFile(docBFile); } /** @@ -74,8 +74,8 @@ public final class TestHWPFPictures extends TestCase { PicturesTable picA = docA.getPicturesTable(); PicturesTable picB = docB.getPicturesTable(); - List picturesA = picA.getAllPictures(); - List picturesB = picB.getAllPictures(); + List picturesA = picA.getAllPictures(); + List picturesB = picB.getAllPictures(); assertEquals(7, picturesA.size()); assertEquals(2, picturesB.size()); @@ -87,12 +87,12 @@ public final class TestHWPFPictures extends TestCase { public void testImageData() { HWPFDocument docB = HWPFTestDataSamples.openSampleFile(docBFile); PicturesTable picB = docB.getPicturesTable(); - List picturesB = picB.getAllPictures(); + List picturesB = picB.getAllPictures(); assertEquals(2, picturesB.size()); - Picture pic1 = (Picture)picturesB.get(0); - Picture pic2 = (Picture)picturesB.get(1); + Picture pic1 = picturesB.get(0); + Picture pic2 = picturesB.get(1); assertNotNull(pic1); assertNotNull(pic2); @@ -114,11 +114,11 @@ public final class TestHWPFPictures extends TestCase { public void testCompressedImageData() { HWPFDocument docC = HWPFTestDataSamples.openSampleFile(docCFile); PicturesTable picC = docC.getPicturesTable(); - List picturesC = picC.getAllPictures(); + List picturesC = picC.getAllPictures(); assertEquals(1, picturesC.size()); - Picture pic = (Picture)picturesC.get(0); + Picture pic = picturesC.get(0); assertNotNull(pic); // Check the same @@ -134,11 +134,11 @@ public final class TestHWPFPictures extends TestCase { */ public void BROKENtestEscherDrawing() { HWPFDocument docD = HWPFTestDataSamples.openSampleFile(docDFile); - List allPictures = docD.getPicturesTable().getAllPictures(); + List allPictures = docD.getPicturesTable().getAllPictures(); assertEquals(1, allPictures.size()); - Picture pic = (Picture) allPictures.get(0); + Picture pic = allPictures.get(0); assertNotNull(pic); byte[] picD = readFile(imgDFile);