// 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<Object> spanList = new ArrayList<Object>();
spanList.add(span);
//add spns to the row
ctRow.setSpans(spanList);
}
-}
\ No newline at end of file
+}
* @return found hyperlinks or <code>null</code> if not found
*/
protected static Hyperlink[] find(TextRun run){
- ArrayList lst = new ArrayList();
+ List<Hyperlink> lst = new ArrayList<Hyperlink>();
SlideShow ppt = run.getSheet().getSlideShow();
//document-level container which stores info about all links in a presentation
ExObjList exobj = ppt.getDocumentRecord().getExObjList();
* @return found hyperlink or <code>null</code>
*/
protected static Hyperlink find(Shape shape){
- ArrayList lst = new ArrayList();
+ List<Hyperlink> lst = new ArrayList<Hyperlink>();
SlideShow ppt = shape.getSheet().getSlideShow();
//document-level container which stores info about all links in a presentation
ExObjList exobj = ppt.getDocumentRecord().getExObjList();
}
}
- 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<Hyperlink> out){
for (int i = 0; i < records.length; i++) {
//see if we have InteractiveInfo in the textrun's records
if( records[i] instanceof InteractiveInfo){
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<Shape>(){
+ 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<List<Shape>> lst = new ArrayList<List<Shape>>();
+ List<Shape> 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<Shape>();
lst.add(row);
}
row.add(sh[i]);
}
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());
.getLogger( CHPBinTable.class );
/** List of character properties.*/
- protected ArrayList<CHPX> _textRuns = new ArrayList<CHPX>();
+ protected List<CHPX> _textRuns = new ArrayList<CHPX>();
public CHPBinTable()
{
int endingFc = translator.getByteIndex( _textRuns.get(
_textRuns.size() - 1 ).getEnd() );
- ArrayList<CHPX> overflow = _textRuns;
+ List<CHPX> overflow = _textRuns;
do
{
CHPX startingProp = overflow.get(0);
private final static POILogger _logger = POILogFactory.getLogger(SectionTable.class);
private static final int SED_SIZE = 12;
- protected ArrayList<SEPX> _sections = new ArrayList<SEPX>();
+ protected List<SEPX> _sections = new ArrayList<SEPX>();
protected List<TextPiece> _text;
/** So we can know if things are unicode or not */
- private TextPieceTable tpt;
+ //private TextPieceTable tpt;
public 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();
// return FC;
// }
- public ArrayList<SEPX> getSections()
+ public List<SEPX> getSections()
{
return _sections;
}
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;
public void testRead() throws IOException {
SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("text_shapes.ppt"));
- ArrayList lst1 = new ArrayList();
+ List<String> lst1 = new ArrayList<String>();
Slide slide = ppt.getSlides()[0];
Shape[] shape = slide.getShapes();
for (int i = 0; i < shape.length; i++) {
lst1.add(run.getText());
}
- ArrayList lst2 = new ArrayList();
+ List<String> lst2 = new ArrayList<String>();
TextRun[] run = slide.getTextRuns();
for (int i = 0; i < run.length; i++) {
lst2.add(run[i].getText());
Slide slide = ppt.getSlides()[0];
- HashMap map = new HashMap();
+ Map<String, TextShape> map = new HashMap<String, TextShape>();
Shape[] shape = slide.getShapes();
for (int i = 0; i < shape.length; i++) {
if(shape[i] instanceof TextShape){
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);
package org.apache.poi.hwpf.model;
import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
+import java.util.List;
import junit.framework.TestCase;
CHPBinTable newBinTable = new CHPBinTable(newMainStream, newTableStream, 0, newTableStream.length, fakeTPT);
- ArrayList oldTextRuns = _cHPBinTable._textRuns;
- ArrayList newTextRuns = newBinTable._textRuns;
+ List<CHPX> oldTextRuns = _cHPBinTable._textRuns;
+ List<CHPX> 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));
}
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.*;
newMainStream, newTableStream, 0,
newTableStream.length, 0, tpt, fib.getSubdocumentTextStreamLength( SubdocumentType.MAIN ));
- ArrayList oldSections = sectionTable.getSections();
- ArrayList newSections = newSectionTable.getSections();
+ List<SEPX> oldSections = sectionTable.getSections();
+ List<SEPX> newSections = newSectionTable.getSections();
assertEquals(oldSections.size(), newSections.size());
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);
}
}
package org.apache.poi.hwpf.usermodel;
-import java.util.ArrayList;
+import java.util.List;
import junit.framework.TestCase;
HWPFDocument hwpfDocument = new HWPFDocument( POIDataSamples
.getDocumentInstance().openResourceAsStream( "Bug46817.doc" ) );
- final ArrayList<SEPX> sections = hwpfDocument.getSectionTable()
+ final List<SEPX> sections = hwpfDocument.getSectionTable()
.getSections();
assertEquals( sections.size(), 1 );
private static int[] diffInternal(InputStream isA, InputStream isB, int[] allowableDifferenceRegions)
throws IOException {
int offset = 0;
- List temp = new ArrayList();
+ List<Integer> temp = new ArrayList<Integer>();
while (true) {
int b = isA.read();
int b2 = isB.read();
return false;
}
- private static int[] toPrimitiveIntArray(List temp) {
+ private static int[] toPrimitiveIntArray(List<Integer> temp) {
int nItems = temp.size();
if(nItems < 1) {
return null;
{
for (int j = 0; j <= 8; j++)
{
- List foo = new ArrayList();
+ List<Object> foo = new ArrayList<Object>();
for (int k = 0; k < j; k++)
{
projects / poi.git / commitdiff