Remove a few deprecated warnings for when compiling against ooxml-schemas-1.1

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@956900 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/java/org/apache/poi/POIXMLProperties.java b/src/ooxml/java/org/apache/poi/POIXMLProperties.java
index 6717c903ac4dd1a9c0fc37659f29949a9cf83ed2..3fa35341e597e99435cf6fc577d6c0dc3b0b0843 100644 (file)
--- a/src/ooxml/java/org/apache/poi/POIXMLProperties.java
+++ b/src/ooxml/java/org/apache/poi/POIXMLProperties.java
@@ -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;

diff --git a/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java b/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
index 6d313405572e96071b38eed414c2d63869baa320..22ff8902c3f4b42f1901cf275f4a3b98d57e24fa 100644 (file)
--- a/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
+++ b/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
@@ -21,6 +21,7 @@ import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
 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 POIXMLPropertiesTextExtractor extends POIXMLTextExtractor {
                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"
                        );
                }

diff --git a/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java b/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java
index c6a9a52ceebae9568e60c6492ede758893ad629c..67fb27fafc9b0d3e9a973616dc5cfc285f9e5253 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java
+++ b/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java
@@ -81,7 +81,7 @@ public class XSLFSlideShow extends POIXMLDocument {
                        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()));
                  

diff --git a/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java b/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
index bcbf176d27362ef20d4a61b1e4c19dfd9d9177e3..fa4c77f8c09407347ccef1f612812307103bc2b4 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
+++ b/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
@@ -104,7 +104,7 @@ public class XSLFPowerPointExtractor extends POIXMLTextExtractor {
                                        
                                        // 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(

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java
index 037ae65d9216be4eb59824da4fad9bfd50a4b6fb..e221cfa7cced1fd17cc3a7f9c6d8567a1e3d1fb6 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java
@@ -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;

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java
index b41a12920edd8f5cab15ad0c693183f473e4aa6a..213dd638d6dd7b008c175d5ecdea93f74a8b2ea1 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java
@@ -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;

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java
index 0697493192fa2a67d2a73110171fb01e31a81c6f..68a12a4d1cb1e5e7b48614701a4a3badbad104d6 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java
@@ -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;

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
index ae8d7229c41feb1675481b692d8b9d8fc3d1c5f8..8e4b3f03a75647a4722027d39f57a9bd810de0a0 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
@@ -45,7 +45,7 @@ public class XMLSlideShow implements SlideShow {
                
                // 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);

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
index b9bb889767899617c327a74d6b1f27eec28c0c20..a926d8b3fc9a48bc700b50d881c5cee9fffef010 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
@@ -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;
             }

diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
index 6814be8c91ddeb73c5092560c5a4a52fefbaf85c..991d6661d3c31928db0cb5cda7d00ae25363c27d 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
+++ b/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
@@ -19,7 +19,6 @@ package org.apache.poi.xssf.eventusermodel;
 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){