You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2010/07/02 23:35:07 UTC
svn commit: r960115 - in /poi/trunk/src/ooxml/java/org/apache/poi/xwpf:
model/ usermodel/
Author: nick
Date: Fri Jul 2 21:35:06 2010
New Revision: 960115
URL: http://svn.apache.org/viewvc?rev=960115&view=rev
Log:
Fix deprecated warnings
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java Fri Jul 2 21:35:06 2010
@@ -39,7 +39,7 @@ public class XWPFCommentsDecorator exten
XWPFComment comment;
commentText = new StringBuffer();
- for(CTMarkupRange anchor : paragraph.getCTP().getCommentRangeStartArray())
+ for(CTMarkupRange anchor : paragraph.getCTP().getCommentRangeStartList())
{
if((comment = paragraph.getDocument().getCommentByID(anchor.getId().toString())) != null)
commentText.append("\tComment by " + comment.getAuthor()+": "+comment.getText());
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java Fri Jul 2 21:35:06 2010
@@ -242,8 +242,8 @@ public class XWPFHeaderFooterPolicy {
}
else {
CTP p = ftr.addNewP();
- byte[] rsidr = doc.getDocument().getBody().getPArray()[0].getRsidR();
- byte[] rsidrdefault = doc.getDocument().getBody().getPArray()[0].getRsidRDefault();
+ byte[] rsidr = doc.getDocument().getBody().getPArray(0).getRsidR();
+ byte[] rsidrdefault = doc.getDocument().getBody().getPArray(0).getRsidRDefault();
p.setRsidP(rsidr);
p.setRsidRDefault(rsidrdefault);
CTPPr pPr = p.addNewPPr();
@@ -274,8 +274,8 @@ public class XWPFHeaderFooterPolicy {
}
else {
CTP p = ftr.addNewP();
- byte[] rsidr = doc.getDocument().getBody().getPArray()[0].getRsidR();
- byte[] rsidrdefault = doc.getDocument().getBody().getPArray()[0].getRsidRDefault();
+ byte[] rsidr = doc.getDocument().getBody().getPArray(0).getRsidR();
+ byte[] rsidrdefault = doc.getDocument().getBody().getPArray(0).getRsidRDefault();
p.setRsidP(rsidr);
p.setRsidRDefault(rsidrdefault);
CTPPr pPr = p.addNewPPr();
@@ -400,8 +400,8 @@ public class XWPFHeaderFooterPolicy {
*/
private XWPFParagraph getWatermarkParagraph(String text, int idx) {
CTP p = CTP.Factory.newInstance();
- byte[] rsidr = doc.getDocument().getBody().getPArray()[0].getRsidR();
- byte[] rsidrdefault = doc.getDocument().getBody().getPArray()[0].getRsidRDefault();
+ byte[] rsidr = doc.getDocument().getBody().getPArray(0).getRsidR();
+ byte[] rsidrdefault = doc.getDocument().getBody().getPArray(0).getRsidRDefault();
p.setRsidP(rsidr);
p.setRsidRDefault(rsidrdefault);
CTPPr pPr = p.addNewPPr();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java Fri Jul 2 21:35:06 2010
@@ -49,10 +49,10 @@ public class XWPFHyperlinkDecorator exte
hyperlinkText = new StringBuffer();
// loop over hyperlink anchors
- for(CTHyperlink link : paragraph.getCTP().getHyperlinkArray()){
- for (CTR r : link.getRArray()) {
+ for(CTHyperlink link : paragraph.getCTP().getHyperlinkList()){
+ for (CTR r : link.getRList()) {
// Loop over text runs
- for (CTText text : r.getTArray()){
+ for (CTText text : r.getTList()){
hyperlinkText.append(text.getStringValue());
}
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java Fri Jul 2 21:35:06 2010
@@ -37,7 +37,7 @@ public class XWPFComment
id = comment.getId().toString();
author = comment.getAuthor();
- for(CTP ctp : comment.getPArray())
+ for(CTP ctp : comment.getPList())
{
XWPFParagraph p = new XWPFParagraph(ctp, null);
text.append(p.getText());
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java Fri Jul 2 21:35:06 2010
@@ -179,7 +179,7 @@ public class XWPFDocument extends POIXML
else if(relation.equals(XWPFRelation.COMMENT.getRelation())){
CommentsDocument cmntdoc = CommentsDocument.Factory.parse(p.getPackagePart().getInputStream());
- for(CTComment ctcomment : cmntdoc.getComments().getCommentArray()) {
+ for(CTComment ctcomment : cmntdoc.getComments().getCommentList()) {
comments.add(new XWPFComment(ctcomment));
}
}
@@ -217,13 +217,13 @@ public class XWPFDocument extends POIXML
if(relation.equals(XWPFRelation.FOOTNOTE.getRelation())){
FootnotesDocument footnotesDocument = FootnotesDocument.Factory.parse(p.getPackagePart().getInputStream());
- for(CTFtnEdn ctFtnEdn : footnotesDocument.getFootnotes().getFootnoteArray()) {
+ for(CTFtnEdn ctFtnEdn : footnotesDocument.getFootnotes().getFootnoteList()) {
footnotes.put(ctFtnEdn.getId().intValue(), new XWPFFootnote(this, ctFtnEdn));
}
} else if (relation.equals(XWPFRelation.ENDNOTE.getRelation())){
EndnotesDocument endnotesDocument = EndnotesDocument.Factory.parse(p.getPackagePart().getInputStream());
- for(CTFtnEdn ctFtnEdn : endnotesDocument.getEndnotes().getEndnoteArray()) {
+ for(CTFtnEdn ctFtnEdn : endnotesDocument.getEndnotes().getEndnoteList()) {
endnotes.put(ctFtnEdn.getId().intValue(), new XWPFFootnote(this, ctFtnEdn));
}
}
@@ -944,7 +944,7 @@ public class XWPFDocument extends POIXML
public void insertTable(int pos, XWPFTable table) {
bodyElements.add(pos, table);
int i;
- for (i = 0; i < ctDocument.getBody().getTblArray().length; i++) {
+ for (i = 0; i < ctDocument.getBody().getTblList().size(); i++) {
CTTbl tbl = ctDocument.getBody().getTblArray(i);
if(tbl == table.getCTTbl()){
break;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java Fri Jul 2 21:35:06 2010
@@ -27,7 +27,7 @@ public class XWPFFootnote implements Ite
private List<XWPFParagraph> paragraphs = new ArrayList<XWPFParagraph>();
public XWPFFootnote(XWPFDocument document, CTFtnEdn body) {
- for (CTP p : body.getPArray()) {
+ for (CTP p : body.getPList()) {
paragraphs.add(new XWPFParagraph(p, document));
}
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java Fri Jul 2 21:35:06 2010
@@ -457,7 +457,7 @@ public abstract class XWPFHeaderFooter e
public void insertTable(int pos, XWPFTable table) {
bodyElements.add(pos, table);
int i;
- for (i = 0; i < headerFooter.getTblArray().length; i++) {
+ for (i = 0; i < headerFooter.getTblList().size(); i++) {
CTTbl tbl = headerFooter.getTblArray(i);
if(tbl == table.getCTTbl()){
break;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java Fri Jul 2 21:35:06 2010
@@ -39,7 +39,7 @@ public class XWPFLatentStyles {
* checks wheter specific LatentStyleID is a latentStyle
*/
protected boolean isLatentStyle(String latentStyleID){
- for ( CTLsdException lsd: latentStyles.getLsdExceptionArray()) {
+ for ( CTLsdException lsd: latentStyles.getLsdExceptionList()) {
if(lsd.getName().equals(latentStyleID));
return true;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java Fri Jul 2 21:35:06 2010
@@ -72,10 +72,10 @@ public class XWPFNumbering extends POIXM
numberingDoc = NumberingDocument.Factory.parse(is);
ctNumbering = numberingDoc.getNumbering();
//get any Nums
- for(CTNum ctNum : ctNumbering.getNumArray()) {
+ for(CTNum ctNum : ctNumbering.getNumList()) {
nums.add(new XWPFNum(ctNum, this));
}
- for(CTAbstractNum ctAbstractNum : ctNumbering.getAbstractNumArray()){
+ for(CTAbstractNum ctAbstractNum : ctNumbering.getAbstractNumList()){
abstractNums.add(new XWPFAbstractNum(ctAbstractNum, this));
}
isNew = false;
@@ -129,7 +129,7 @@ public class XWPFNumbering extends POIXM
*/
public BigInteger addNum(XWPFNum num){
ctNumbering.addNewNum();
- int pos = (ctNumbering.getNumArray().length) - 1;
+ int pos = (ctNumbering.getNumList().size()) - 1;
ctNumbering.setNumArray(pos, num.getCTNum());
nums.add(num);
return num.getCTNum().getNumId();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java Fri Jul 2 21:35:06 2010
@@ -18,12 +18,9 @@ package org.apache.poi.xwpf.usermodel;
import java.math.BigInteger;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.util.Internal;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
@@ -46,7 +43,6 @@ import org.openxmlformats.schemas.wordpr
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtRun;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSpacing;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTString;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTextAlignment;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBorder;
@@ -1139,10 +1135,10 @@ public class XWPFParagraph implements IB
*/
protected void addRun(CTR run){
int pos;
- pos = paragraph.getRArray().length;
+ pos = paragraph.getRList().size();
paragraph.addNewR();
paragraph.setRArray(pos, run);
- for (CTText ctText: paragraph.getRArray(pos).getTArray()) {
+ for (CTText ctText: paragraph.getRArray(pos).getTList()) {
this.text.append(ctText.getStringValue());
}
}
@@ -1162,7 +1158,7 @@ public class XWPFParagraph implements IB
startChar = startPos.getChar();
int beginRunPos = 0, candCharPos = 0;
boolean newList = false;
- for (int runPos=startRun; runPos<paragraph.getRArray().length; runPos++) {
+ for (int runPos=startRun; runPos<paragraph.getRList().size(); runPos++) {
int beginTextPos = 0,beginCharPos = 0, textPos = 0, charPos = 0;
CTR ctRun = paragraph.getRArray(runPos);
XmlCursor c = ctRun.newCursor();
@@ -1246,7 +1242,7 @@ public class XWPFParagraph implements IB
int charEnd = segment.getEndChar();
StringBuffer out = new StringBuffer();
for(int i=runBegin; i<=runEnd;i++){
- int startText=0, endText = paragraph.getRArray(i).getTArray().length-1;
+ int startText=0, endText = paragraph.getRArray(i).getTList().size()-1;
if(i==runBegin)
startText=textBegin;
if(i==runEnd)
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java Fri Jul 2 21:35:06 2010
@@ -127,7 +127,7 @@ public class XWPFRun {
* @param value the literal text which shall be displayed in the document
*/
public void setText(String value) {
- setText(value,run.getTArray().length);
+ setText(value,run.getTList().size());
}
/**
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java Fri Jul 2 21:35:06 2010
@@ -75,7 +75,7 @@ public class XWPFStyles extends POIXMLDo
throw new POIXMLException();
}
//get any Style
- for(CTStyle style : ctStyles.getStyleArray()) {
+ for(CTStyle style : ctStyles.getStyleList()) {
listStyle.add(new XWPFStyle(style, this));
}
}
@@ -117,7 +117,7 @@ public class XWPFStyles extends POIXMLDo
public void addStyle(XWPFStyle style){
listStyle.add(style);
ctStyles.addNewStyle();
- int pos = (ctStyles.getStyleArray().length) - 1;
+ int pos = (ctStyles.getStyleList().size()) - 1;
ctStyles.setStyleArray(pos, style.getCTStyle());
}
/**
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java Fri Jul 2 21:35:06 2010
@@ -71,12 +71,12 @@ public class XWPFTable implements IBodyE
if (table.sizeOfTrArray() == 0)
createEmptyTable(table);
- for (CTRow row : table.getTrArray()) {
+ for (CTRow row : table.getTrList()) {
StringBuffer rowText = new StringBuffer();
XWPFTableRow tabRow = new XWPFTableRow(row, this);
tableRows.add(tabRow);
- for (CTTc cell : row.getTcArray()) {
- for (CTP ctp : cell.getPArray()) {
+ for (CTTc cell : row.getTcList()) {
+ for (CTP ctp : cell.getPList()) {
XWPFParagraph p = new XWPFParagraph(ctp, part);
if (rowText.length() > 0) {
rowText.append('\t');
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java?rev=960115&r1=960114&r2=960115&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java Fri Jul 2 21:35:06 2010
@@ -127,7 +127,7 @@ public class XWPFTableRow {
public List<XWPFTableCell> getTableCells(){
if(tableCells == null){
List<XWPFTableCell> cells = new ArrayList<XWPFTableCell>();
- for (CTTc tableCell : ctRow.getTcArray()) {
+ for (CTTc tableCell : ctRow.getTcList()) {
cells.add(new XWPFTableCell(tableCell, this, table.getPart()));
}
this.tableCells = cells;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org