svn commit: r1833116 - in /poi/trunk/src/ooxml/java/org/apache/poi: xslf/usermodel/XSLFTable.java xslf/usermodel/XSLFTableStyles.java xslf/usermodel/XSLFTextParagraph.java xssf/usermodel/helpers/ColumnHelper.java

[fanningpj]

Author: fanningpj
Date: Thu Jun  7 12:01:49 2018
New Revision: 1833116

URL: http://svn.apache.org/viewvc?rev=1833116&view=rev
Log:
fix some deprecation warnings

Modified:
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
    
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
    
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java?rev=1833116&r1=1833115&r2=1833116&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java 
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java Thu 
Jun  7 12:01:49 2018
@@ -81,7 +81,7 @@ public class XSLFTable extends XSLFGraph
         }
 
         _rows = new ArrayList<>(_table.sizeOfTrArray());
-        for(CTTableRow row : _table.getTrArray()) {
+        for(CTTableRow row : _table.getTrList()) {
             _rows.add(new XSLFTableRow(row, this));
         }
         updateRowColIndexes();

Modified: 
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java?rev=1833116&r1=1833115&r2=1833116&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java 
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java 
Thu Jun  7 12:01:49 2018
@@ -50,9 +50,9 @@ public class XSLFTableStyles extends POI
         TblStyleLstDocument styleDoc = TblStyleLstDocument.Factory.parse(is);
         is.close();
         _tblStyleLst = styleDoc.getTblStyleLst();
-        CTTableStyle[] tblStyleArray = _tblStyleLst.getTblStyleArray();
-        _styles = new ArrayList<>(tblStyleArray.length);
-        for(CTTableStyle c : tblStyleArray){
+        List<CTTableStyle> tblStyles = _tblStyleLst.getTblStyleList();
+        _styles = new ArrayList<>(tblStyles.size());
+        for(CTTableStyle c : tblStyles){
             _styles.add(new XSLFTableStyle(c));
         }
     }

Modified: 
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java?rev=1833116&r1=1833115&r2=1833116&view=diff
==============================================================================
--- 
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java 
(original)
+++ 
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java 
Thu Jun  7 12:01:49 2018
@@ -838,7 +838,7 @@ public class XSLFTextParagraph implement
         
         List<XSLFTextRun> otherRs = other.getTextRuns();
         int i=0;
-        for(CTRegularTextRun rtr : thisP.getRArray()) {
+        for(CTRegularTextRun rtr : thisP.getRList()) {
             XSLFTextRun run = newTextRun(rtr);
             run.copy(otherRs.get(i++));
             _runs.add(run);

Modified: 
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java?rev=1833116&r1=1833115&r2=1833116&view=diff
==============================================================================
--- 
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
 (original)
+++ 
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
 Thu Jun  7 12:01:49 2018
@@ -53,8 +53,7 @@ public class ColumnHelper {
         int i = 0;
         for (i = 0; i < colsArray.length; i++) {
             CTCols cols = colsArray[i];
-            CTCol[] colArray = cols.getColArray();
-            for (CTCol col : colArray) {
+            for (CTCol col : cols.getColList()) {
                 addCleanColIntoCols(newCols, col, trackedCols);
             }
         }
@@ -310,7 +309,7 @@ public class ColumnHelper {
     }
 
     private boolean columnExists(CTCols cols, long min, long max) {
-        for (CTCol col : cols.getColArray()) {
+        for (CTCol col : cols.getColList()) {
             if (col.getMin() == min && col.getMax() == max) {
                 return true;
             }
@@ -321,7 +320,7 @@ public class ColumnHelper {
     public int getIndexOfColumn(CTCols cols, CTCol searchCol) {
         if (cols == null || searchCol == null) return -1;
         int i = 0;
-        for (CTCol col : cols.getColArray()) {
+        for (CTCol col : cols.getColList()) {
             if (col.getMin() == searchCol.getMin() && col.getMax() == 
searchCol.getMax()) {
                 return i;
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org