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/06/22 15:59:45 UTC
svn commit: r956900 - in /poi/trunk/src/ooxml/java/org/apache/poi: ./ xslf/
xslf/extractor/ xslf/usermodel/ xssf/eventusermodel/
Author: nick
Date: Tue Jun 22 13:59:44 2010
New Revision: 956900
URL: http://svn.apache.org/viewvc?rev=956900&view=rev
Log:
Remove a few deprecated warnings for when compiling against ooxml-schemas-1.1
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java
poi/trunk/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java?rev=956900&r1=956899&r2=956900&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/POIXMLProperties.java Tue Jun 22 13:59:44 2010
@@ -369,7 +369,7 @@ public class POIXMLProperties {
*/
protected int nextPid(){
int propid = 1;
- for(CTProperty p : props.getProperties().getPropertyArray()){
+ for(CTProperty p : props.getProperties().getPropertyList()){
if(p.getPid() > propid) propid = p.getPid();
}
return propid + 1;
@@ -382,7 +382,7 @@ public class POIXMLProperties {
* @return whether a property with the given name exists in the custom properties
*/
public boolean contains(String name){
- for(CTProperty p : props.getProperties().getPropertyArray()){
+ for(CTProperty p : props.getProperties().getPropertyList()){
if(p.getName().equals(name)) return true;
}
return false;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java?rev=956900&r1=956899&r2=956900&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java Tue Jun 22 13:59:44 2010
@@ -21,6 +21,7 @@ import org.apache.poi.openxml4j.opc.inte
import org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperty;
import java.util.Date;
+import java.util.List;
/**
* A {@link POITextExtractor} for returning the textual
@@ -129,13 +130,13 @@ public class POIXMLPropertiesTextExtract
org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties
props = getDocument().getProperties().getCustomProperties().getUnderlyingProperties();
- CTProperty[] properties = props.getPropertyArray();
- for(int i = 0; i<properties.length; i++) {
+ List<CTProperty> properties = props.getPropertyList();
+ for(int i = 0; i<properties.size(); i++) {
// TODO - finish off
String val = "(not implemented!)";
text.append(
- properties[i].getName() +
+ properties.get(i).getName() +
" = " + val + "\n"
);
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java?rev=956900&r1=956899&r2=956900&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java Tue Jun 22 13:59:44 2010
@@ -81,7 +81,7 @@ public class XSLFSlideShow extends POIXM
PresentationDocument.Factory.parse(getCorePart().getInputStream());
embedds = new LinkedList<PackagePart>();
- for (CTSlideIdListEntry ctSlide : getSlideReferences().getSldIdArray()) {
+ for (CTSlideIdListEntry ctSlide : getSlideReferences().getSldIdList()) {
PackagePart slidePart =
getTargetPart(getCorePart().getRelationship(ctSlide.getId2()));
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java?rev=956900&r1=956899&r2=956900&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java Tue Jun 22 13:59:44 2010
@@ -104,7 +104,7 @@ public class XSLFPowerPointExtractor ext
// Comments too for the slide
if(comments != null) {
- for(CTComment comment : comments.getCmArray()) {
+ for(CTComment comment : comments.getCmList()) {
// TODO - comment authors too
// (They're in another stream)
text.append(
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java?rev=956900&r1=956899&r2=956900&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java Tue Jun 22 13:59:44 2010
@@ -17,6 +17,8 @@
package org.apache.poi.xslf.usermodel;
+import java.util.List;
+
import org.openxmlformats.schemas.drawingml.x2006.main.CTTable;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTableRow;
@@ -28,11 +30,11 @@ public class DrawingTable {
}
public DrawingTableRow[] getRows() {
- CTTableRow[] ctTableRows = table.getTrArray();
- DrawingTableRow[] o = new DrawingTableRow[ctTableRows.length];
+ List<CTTableRow> ctTableRows = table.getTrList();
+ DrawingTableRow[] o = new DrawingTableRow[ctTableRows.size()];
for (int i=0; i<o.length; i++) {
- o[i] = new DrawingTableRow(ctTableRows[i]);
+ o[i] = new DrawingTableRow(ctTableRows.get(i));
}
return o;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java?rev=956900&r1=956899&r2=956900&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java Tue Jun 22 13:59:44 2010
@@ -17,6 +17,8 @@
package org.apache.poi.xslf.usermodel;
+import java.util.List;
+
import org.openxmlformats.schemas.drawingml.x2006.main.CTTableRow;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell;
@@ -28,11 +30,11 @@ public class DrawingTableRow {
}
public DrawingTableCell[] getCells() {
- CTTableCell[] ctTableCells = row.getTcArray();
- DrawingTableCell[] o = new DrawingTableCell[ctTableCells.length];
+ List<CTTableCell> ctTableCells = row.getTcList();
+ DrawingTableCell[] o = new DrawingTableCell[ctTableCells.size()];
for (int i=0; i<o.length; i++) {
- o[i] = new DrawingTableCell(ctTableCells[i]);
+ o[i] = new DrawingTableCell(ctTableCells.get(i));
}
return o;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java?rev=956900&r1=956899&r2=956900&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java Tue Jun 22 13:59:44 2010
@@ -17,6 +17,8 @@
package org.apache.poi.xslf.usermodel;
+import java.util.List;
+
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBody;
import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
@@ -28,11 +30,11 @@ public class DrawingTextBody {
}
public DrawingParagraph[] getParagraphs() {
- CTTextParagraph[] pArray = textBody.getPArray();
- DrawingParagraph[] o = new DrawingParagraph[pArray.length];
+ List<CTTextParagraph> paragraphs = textBody.getPList();
+ DrawingParagraph[] o = new DrawingParagraph[paragraphs.size()];
for (int i=0; i<o.length; i++) {
- o[i] = new DrawingParagraph(pArray[i]);
+ o[i] = new DrawingParagraph(paragraphs.get(i));
}
return o;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java?rev=956900&r1=956899&r2=956900&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java Tue Jun 22 13:59:44 2010
@@ -45,7 +45,7 @@ public class XMLSlideShow implements Sli
// Build the slides list
CTSlideIdList slideIds = slideShow.getSlideReferences();
- slides = new XSLFSlide[slideIds.getSldIdArray().length];
+ slides = new XSLFSlide[slideIds.getSldIdList().size()];
for(int i=0; i<slides.length; i++) {
CTSlideIdListEntry slideId = slideIds.getSldIdArray(i);
CTSlide slide = slideShow.getSlide(slideId);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java?rev=956900&r1=956899&r2=956900&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java Tue Jun 22 13:59:44 2010
@@ -45,12 +45,11 @@ public class XSLFCommonSlideData {
processShape(gs, out);
- for (CTGroupShape shape : gs.getGrpSpArray()) {
+ for (CTGroupShape shape : gs.getGrpSpList()) {
processShape(shape, out);
}
- CTGraphicalObjectFrame[] graphicFrames = gs.getGraphicFrameArray();
- for (CTGraphicalObjectFrame frame: graphicFrames) {
+ for (CTGraphicalObjectFrame frame: gs.getGraphicFrameList()) {
CTGraphicalObjectData data = frame.getGraphic().getGraphicData();
XmlCursor c = data.newCursor();
c.selectPath("./*");
@@ -76,9 +75,9 @@ public class XSLFCommonSlideData {
}
private void processShape(CTGroupShape gs, List<DrawingParagraph> out) {
- CTShape[] shapes = gs.getSpArray();
- for (int i = 0; i < shapes.length; i++) {
- CTTextBody ctTextBody = shapes[i].getTxBody();
+ List<CTShape> shapes = gs.getSpList();
+ for (int i = 0; i < shapes.size(); i++) {
+ CTTextBody ctTextBody = shapes.get(i).getTxBody();
if (ctTextBody==null) {
continue;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java?rev=956900&r1=956899&r2=956900&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java Tue Jun 22 13:59:44 2010
@@ -19,7 +19,6 @@ package org.apache.poi.xssf.eventusermod
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -186,7 +185,7 @@ public class XSSFReader {
//step 2. Read array of CTSheet elements, wrap it in a ArayList and construct an iterator
//Note, using XMLBeans might be expensive, consider refactoring to use SAX or a plain regexp search
CTWorkbook wbBean = WorkbookDocument.Factory.parse(wb.getInputStream()).getWorkbook();
- sheetIterator = Arrays.asList(wbBean.getSheets().getSheetArray()).iterator();
+ sheetIterator = wbBean.getSheets().getSheetList().iterator();
} catch (InvalidFormatException e){
throw new POIXMLException(e);
} catch (XmlException e){
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org