From acfc276396132b8cc0c8abfdcc85b7227f892319 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Mon, 20 Apr 2015 19:15:21 +0000 Subject: [PATCH] Fix usage of Generics in some classes git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1674964 13f79535-47bb-0310-9956-ffa450edef68 --- .../xssf/usermodel/examples/AligningCells.java | 5 +++-- .../org/apache/poi/hslf/model/Hyperlink.java | 8 ++++---- .../src/org/apache/poi/hslf/model/Table.java | 17 +++++++++-------- .../org/apache/poi/hwpf/model/CHPBinTable.java | 4 ++-- .../org/apache/poi/hwpf/model/SectionTable.java | 8 ++++---- .../apache/poi/hslf/model/TestTextShape.java | 16 +++++++++------- .../apache/poi/hwpf/model/TestCHPBinTable.java | 10 +++++----- .../apache/poi/hwpf/model/TestSectionTable.java | 10 +++++----- .../apache/poi/hwpf/usermodel/TestRange.java | 4 ++-- .../poi/hssf/usermodel/StreamUtility.java | 4 ++-- .../poifs/storage/TestSmallDocumentBlock.java | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/examples/src/org/apache/poi/xssf/usermodel/examples/AligningCells.java b/src/examples/src/org/apache/poi/xssf/usermodel/examples/AligningCells.java index 6ed76081b..aa96056e4 100644 --- a/src/examples/src/org/apache/poi/xssf/usermodel/examples/AligningCells.java +++ b/src/examples/src/org/apache/poi/xssf/usermodel/examples/AligningCells.java @@ -114,16 +114,17 @@ public class AligningCells { // Make the selection CTRowImpl ctRow = (CTRowImpl) row.getCTRow(); - List spanList = new ArrayList(); // Add object with format start_coll:end_coll. For example 1:3 will span from // cell 1 to cell 3, where the column index starts with 0 // // You can add multiple spans for one row Object span = start_column + ":" + end_column; + + List spanList = new ArrayList(); spanList.add(span); //add spns to the row ctRow.setSpans(spanList); } -} \ No newline at end of file +} diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Hyperlink.java b/src/scratchpad/src/org/apache/poi/hslf/model/Hyperlink.java index fbdd2e7ae..56c8a6a98 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/Hyperlink.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/Hyperlink.java @@ -152,7 +152,7 @@ public final class Hyperlink { * @return found hyperlinks or null if not found */ protected static Hyperlink[] find(TextRun run){ - ArrayList lst = new ArrayList(); + List lst = new ArrayList(); SlideShow ppt = run.getSheet().getSlideShow(); //document-level container which stores info about all links in a presentation ExObjList exobj = ppt.getDocumentRecord().getExObjList(); @@ -177,7 +177,7 @@ public final class Hyperlink { * @return found hyperlink or null */ protected static Hyperlink find(Shape shape){ - ArrayList lst = new ArrayList(); + List lst = new ArrayList(); SlideShow ppt = shape.getSheet().getSlideShow(); //document-level container which stores info about all links in a presentation ExObjList exobj = ppt.getDocumentRecord().getExObjList(); @@ -195,10 +195,10 @@ public final class Hyperlink { } } - return lst.size() == 1 ? (Hyperlink)lst.get(0) : null; + return lst.size() == 1 ? lst.get(0) : null; } - private static void find(Record[] records, ExObjList exobj, List out){ + private static void find(Record[] records, ExObjList exobj, List out){ for (int i = 0; i < records.length; i++) { //see if we have InteractiveInfo in the textrun's records if( records[i] instanceof InteractiveInfo){ diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Table.java b/src/scratchpad/src/org/apache/poi/hslf/model/Table.java index bafc85182..5c253b13d 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/Table.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/Table.java @@ -150,25 +150,26 @@ public final class Table extends ShapeGroup { protected void initTable(){ Shape[] sh = getShapes(); - Arrays.sort(sh, new Comparator(){ - public int compare( Object o1, Object o2 ) { - Rectangle anchor1 = ((Shape)o1).getAnchor(); - Rectangle anchor2 = ((Shape)o2).getAnchor(); + Arrays.sort(sh, new Comparator(){ + public int compare( Shape o1, Shape o2 ) { + Rectangle anchor1 = o1.getAnchor(); + Rectangle anchor2 = o2.getAnchor(); int delta = anchor1.y - anchor2.y; if(delta == 0) delta = anchor1.x - anchor2.x; return delta; } }); + int y0 = (sh.length > 0) ? sh[0].getAnchor().y - 1 : -1; int maxrowlen = 0; - ArrayList lst = new ArrayList(); - ArrayList row = null; + List> lst = new ArrayList>(); + List row = null; for (int i = 0; i < sh.length; i++) { if(sh[i] instanceof TextShape){ Rectangle anchor = sh[i].getAnchor(); if(anchor.y != y0){ y0 = anchor.y; - row = new ArrayList(); + row = new ArrayList(); lst.add(row); } row.add(sh[i]); @@ -177,7 +178,7 @@ public final class Table extends ShapeGroup { } cells = new TableCell[lst.size()][maxrowlen]; for (int i = 0; i < lst.size(); i++) { - row = (ArrayList)lst.get(i); + row = lst.get(i); for (int j = 0; j < row.size(); j++) { TextShape tx = (TextShape)row.get(j); cells[i][j] = new TableCell(tx.getSpContainer(), getParent()); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java index 33100e5f8..18747c436 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java @@ -53,7 +53,7 @@ public class CHPBinTable .getLogger( CHPBinTable.class ); /** List of character properties.*/ - protected ArrayList _textRuns = new ArrayList(); + protected List _textRuns = new ArrayList(); public CHPBinTable() { @@ -498,7 +498,7 @@ public class CHPBinTable int endingFc = translator.getByteIndex( _textRuns.get( _textRuns.size() - 1 ).getEnd() ); - ArrayList overflow = _textRuns; + List overflow = _textRuns; do { CHPX startingProp = overflow.get(0); diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java index 5414c2797..956b1b962 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java @@ -38,11 +38,11 @@ public class SectionTable private final static POILogger _logger = POILogFactory.getLogger(SectionTable.class); private static final int SED_SIZE = 12; - protected ArrayList _sections = new ArrayList(); + protected List _sections = new ArrayList(); protected List _text; /** So we can know if things are unicode or not */ - private TextPieceTable tpt; + //private TextPieceTable tpt; public SectionTable() { @@ -54,7 +54,7 @@ public class SectionTable TextPieceTable tpt, int mainLength) { PlexOfCps sedPlex = new PlexOfCps(tableStream, offset, size, SED_SIZE); - this.tpt = tpt; + //this.tpt = tpt; this._text = tpt.getTextPieces(); int length = sedPlex.length(); @@ -160,7 +160,7 @@ public class SectionTable // return FC; // } - public ArrayList getSections() + public List getSections() { return _sections; } diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java index 48b6df54a..8d6324fd9 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java @@ -22,6 +22,8 @@ import junit.framework.TestCase; import java.io.*; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.apache.poi.hslf.usermodel.SlideShow; import org.apache.poi.hslf.record.TextHeaderAtom; @@ -73,7 +75,7 @@ public final class TestTextShape extends TestCase { public void testRead() throws IOException { SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("text_shapes.ppt")); - ArrayList lst1 = new ArrayList(); + List lst1 = new ArrayList(); Slide slide = ppt.getSlides()[0]; Shape[] shape = slide.getShapes(); for (int i = 0; i < shape.length; i++) { @@ -110,7 +112,7 @@ public final class TestTextShape extends TestCase { lst1.add(run.getText()); } - ArrayList lst2 = new ArrayList(); + List lst2 = new ArrayList(); TextRun[] run = slide.getTextRuns(); for (int i = 0; i < run.length; i++) { lst2.add(run[i].getText()); @@ -160,7 +162,7 @@ public final class TestTextShape extends TestCase { Slide slide = ppt.getSlides()[0]; - HashMap map = new HashMap(); + Map map = new HashMap(); Shape[] shape = slide.getShapes(); for (int i = 0; i < shape.length; i++) { if(shape[i] instanceof TextShape){ @@ -171,25 +173,25 @@ public final class TestTextShape extends TestCase { TextShape tx; - tx = (TextShape)map.get("TEST1"); + tx = map.get("TEST1"); assertEquals(0.1, tx.getMarginLeft()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.1, tx.getMarginRight()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.39, tx.getMarginTop()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.05, tx.getMarginBottom()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); - tx = (TextShape)map.get("TEST2"); + tx = map.get("TEST2"); assertEquals(0.1, tx.getMarginLeft()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.1, tx.getMarginRight()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.05, tx.getMarginTop()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.39, tx.getMarginBottom()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); - tx = (TextShape)map.get("TEST3"); + tx = map.get("TEST3"); assertEquals(0.39, tx.getMarginLeft()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.1, tx.getMarginRight()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.05, tx.getMarginTop()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.05, tx.getMarginBottom()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); - tx = (TextShape)map.get("TEST4"); + tx = map.get("TEST4"); assertEquals(0.1, tx.getMarginLeft()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.39, tx.getMarginRight()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); assertEquals(0.05, tx.getMarginTop()*Shape.EMU_PER_POINT/Shape.EMU_PER_INCH, 0.01); diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java b/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java index a36a729d5..d98390dac 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java @@ -18,7 +18,7 @@ package org.apache.poi.hwpf.model; import java.io.ByteArrayOutputStream; -import java.util.ArrayList; +import java.util.List; import junit.framework.TestCase; @@ -59,16 +59,16 @@ public final class TestCHPBinTable CHPBinTable newBinTable = new CHPBinTable(newMainStream, newTableStream, 0, newTableStream.length, fakeTPT); - ArrayList oldTextRuns = _cHPBinTable._textRuns; - ArrayList newTextRuns = newBinTable._textRuns; + List oldTextRuns = _cHPBinTable._textRuns; + List newTextRuns = newBinTable._textRuns; assertEquals(oldTextRuns.size(), newTextRuns.size()); int size = oldTextRuns.size(); for (int x = 0; x < size; x++) { - PropertyNode oldNode = (PropertyNode)oldTextRuns.get(x); - PropertyNode newNode = (PropertyNode)newTextRuns.get(x); + CHPX oldNode = oldTextRuns.get(x); + CHPX newNode = newTextRuns.get(x); assertTrue(oldNode.equals(newNode)); } diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java b/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java index 61e537674..6fb92165c 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java @@ -20,7 +20,7 @@ package org.apache.poi.hwpf.model; import junit.framework.*; import java.io.ByteArrayOutputStream; -import java.util.ArrayList; +import java.util.List; import org.apache.poi.hwpf.*; import org.apache.poi.hwpf.model.io.*; @@ -58,8 +58,8 @@ public final class TestSectionTable newMainStream, newTableStream, 0, newTableStream.length, 0, tpt, fib.getSubdocumentTextStreamLength( SubdocumentType.MAIN )); - ArrayList oldSections = sectionTable.getSections(); - ArrayList newSections = newSectionTable.getSections(); + List oldSections = sectionTable.getSections(); + List newSections = newSectionTable.getSections(); assertEquals(oldSections.size(), newSections.size()); @@ -79,8 +79,8 @@ public final class TestSectionTable int size = oldSections.size(); for (int x = 0; x < size; x++) { - PropertyNode oldNode = (PropertyNode)oldSections.get(x); - PropertyNode newNode = (PropertyNode)newSections.get(x); + SEPX oldNode = oldSections.get(x); + SEPX newNode = newSections.get(x); assertEquals(oldNode, newNode); } } diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java index ab4a19673..a7eabe56a 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java @@ -17,7 +17,7 @@ package org.apache.poi.hwpf.usermodel; -import java.util.ArrayList; +import java.util.List; import junit.framework.TestCase; @@ -62,7 +62,7 @@ public final class TestRange extends TestCase HWPFDocument hwpfDocument = new HWPFDocument( POIDataSamples .getDocumentInstance().openResourceAsStream( "Bug46817.doc" ) ); - final ArrayList sections = hwpfDocument.getSectionTable() + final List sections = hwpfDocument.getSectionTable() .getSections(); assertEquals( sections.size(), 1 ); diff --git a/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java b/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java index b9f39a03c..06aa0b84b 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java @@ -82,7 +82,7 @@ public final class StreamUtility { private static int[] diffInternal(InputStream isA, InputStream isB, int[] allowableDifferenceRegions) throws IOException { int offset = 0; - List temp = new ArrayList(); + List temp = new ArrayList(); while (true) { int b = isA.read(); int b2 = isB.read(); @@ -114,7 +114,7 @@ public final class StreamUtility { return false; } - private static int[] toPrimitiveIntArray(List temp) { + private static int[] toPrimitiveIntArray(List temp) { int nItems = temp.size(); if(nItems < 1) { return null; diff --git a/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java b/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java index b061483c6..24278e207 100644 --- a/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java +++ b/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java @@ -142,7 +142,7 @@ public final class TestSmallDocumentBlock extends TestCase { { for (int j = 0; j <= 8; j++) { - List foo = new ArrayList(); + List foo = new ArrayList(); for (int k = 0; k < j; k++) {