svn commit: r1925646 - in /poi/trunk: poi-examples/src/main/java/org/apache/poi/examples/hwpf/ poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/ poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ poi/src/main/java/org/apache/poi/poifs/property/

[fanningpj]

Author: fanningpj
Date: Sat May 17 15:57:29 2025
New Revision: 1925646

URL: http://svn.apache.org/viewvc?rev=1925646&view=rev
Log:
code refactor

Modified:
    
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
    poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
    
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
    
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
    poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java

Modified: 
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java?rev=1925646&r1=1925645&r2=1925646&view=diff
==============================================================================
--- 
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
 (original)
+++ 
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
 Sat May 17 15:57:29 2025
@@ -59,7 +59,7 @@ public final class Word2Forrest
     {
       Paragraph p = r.getParagraph (x);
       String text = p.text ();
-      if (text.trim ().length () == 0)
+      if (text.trim().isEmpty())
       {
         continue;
       }

Modified: 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java?rev=1925646&r1=1925645&r2=1925646&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java 
(original)
+++ 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java 
Sat May 17 15:57:29 2025
@@ -608,7 +608,7 @@ public class XSSFRow implements Row, Com
         }
 
         // remove any remaining illegal references in _rows.cArray
-        while(_row.getCArray().length > _cells.size()) {
+        while(_row.sizeOfCArray() > _cells.size()) {
             _row.removeC(_cells.size());
         }
     }

Modified: 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1925646&r1=1925645&r2=1925646&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
 (original)
+++ 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
 Sat May 17 15:57:29 2025
@@ -1155,7 +1155,7 @@ public class XWPFDocument extends POIXML
      * @return the LastParagraph of the document
      */
     public XWPFParagraph getLastParagraph() {
-        int lastPos = paragraphs.toArray().length - 1;
+        final int lastPos = paragraphs.size() - 1;
         return paragraphs.get(lastPos);
     }
 

Modified: 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java?rev=1925646&r1=1925645&r2=1925646&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
 (original)
+++ 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
 Sat May 17 15:57:29 2025
@@ -203,7 +203,7 @@ public class XWPFParagraph implements IB
             if (run instanceof XWPFRun) {
                 XWPFRun xRun = (XWPFRun) run;
                 // don't include the text if reviewing is enabled and this is 
a deleted run
-                if (xRun.getCTR().getDelTextArray().length == 0) {
+                if (xRun.getCTR().sizeOfDelTextArray() == 0) {
                     out.append(xRun);
                 }
             } else if (run instanceof XWPFSDT) {

Modified: 
poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java?rev=1925646&r1=1925645&r2=1925646&view=diff
==============================================================================
--- 
poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java 
(original)
+++ 
poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java 
Sat May 17 15:57:29 2025
@@ -83,11 +83,14 @@ public final class PropertyTable impleme
 
         for (ByteBuffer bb : dataSource) {
             // Turn it into an array
-            byte[] data;
-            if (bb.hasArray() && bb.arrayOffset() == 0 &&
-                    bb.array().length == _bigBigBlockSize.getBigBlockSize()) {
-                data = bb.array();
-            } else {
+            byte[] data = null;
+            if (bb.hasArray() && bb.arrayOffset() == 0) {
+                final byte[] array = bb.array();
+                if (array.length == _bigBigBlockSize.getBigBlockSize()) {
+                    data = array;
+                }
+            }
+            if (data == null) {
                 data = 
IOUtils.safelyAllocate(_bigBigBlockSize.getBigBlockSize(), 
POIFSFileSystem.getMaxRecordLength());
 
                 int toRead = data.length;



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