Remove paragraphs from tables

Up until now, removing paragraphs from a table via `removeIfExists` failed, as it was not found. This is fixed in this release
DDS-GmbH · Jun 10, 2024 · af06346 · af06346
1 parent 34dc258
commit af06346
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 group 'com.docutools'
-version = '3.0.0'
+version = '3.0.1'
 
 java {
     toolchain {

diff --git a/src/main/java/com/docutools/jocument/impl/word/WordUtilities.java b/src/main/java/com/docutools/jocument/impl/word/WordUtilities.java
@@ -10,7 +10,6 @@
 import java.util.MissingResourceException;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.OptionalInt;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -145,8 +144,8 @@ public static void removeIfExists(IBodyElement element) {
         XmlObject object = getParentObject(xmlCursor);
         if (object.equals(document.getBody())) {
           findPositionInBody(element).ifPresent(pos -> body.getXWPFDocument().removeBodyElement(pos));
-        } else if (object instanceof CTTc ctTc) {
-          removeElementFromTable(element, ctTc, xmlCursor, body);
+        } else if (object instanceof CTTc) {
+          removeElementFromTable(xwpfParagraph);
         } else if (object instanceof CTHdrFtr ctHdrFtr) {
           xmlCursor.toParent();
           new XWPFFooter(body.getXWPFDocument(), ctHdrFtr).removeParagraph(xwpfParagraph);
@@ -159,8 +158,8 @@ public static void removeIfExists(IBodyElement element) {
         XmlObject object = getParentObject(xmlCursor);
         if (object.equals(document.getBody())) {
           findPositionInBody(element).ifPresent(pos -> body.getXWPFDocument().removeBodyElement(pos));
-        } else if (object instanceof CTTc ctTc) {
-          removeElementFromTable(element, ctTc, xmlCursor, body);
+        } else if (object instanceof CTTc) {
+          removeElementFromTable(xwpfTable);
         } else if (object instanceof CTHdrFtr ctHdrFtr) {
           xmlCursor.toParent();
           new XWPFFooter(body.getXWPFDocument(), ctHdrFtr).removeTable(xwpfTable);
@@ -176,11 +175,16 @@ private static XmlObject getParentObject(XmlCursor xmlCursor) {
     return xmlCursor.getObject();
   }
 
-  private static void removeElementFromTable(IBodyElement element, CTTc ctTc, XmlCursor xmlCursor, IBody body) {
-    XmlObject rowObject = getParentObject(xmlCursor);
-    XmlObject tableObject = getParentObject(xmlCursor);
-    XWPFTableCell cell = new XWPFTableCell(ctTc, new XWPFTableRow((CTRow) rowObject, new XWPFTable((CTTbl) tableObject, body)), body);
-    findPositionInParagraphs(element, cell.getParagraphs()).ifPresent(cell::removeParagraph);
+  private static void removeElementFromTable(XWPFParagraph xwpfParagraph) {
+    while (!xwpfParagraph.runsIsEmpty()) {
+      xwpfParagraph.removeRun(0);
+    }
+  }
+
+  private static void removeElementFromTable(XWPFTable xwpfTable) {
+    for (int i = 0; i < xwpfTable.getNumberOfRows(); i++) {
+      xwpfTable.removeRow(0);
+    }
   }
 
   private static boolean findInHeader(IBodyElement element) {
@@ -262,17 +266,6 @@ private static boolean findInParagraphs(IBodyElement element, List<XWPFParagraph
     return false;
   }
 
-  private static OptionalInt findPositionInParagraphs(IBodyElement element, List<XWPFParagraph> paragraphs) {
-    var position = 0;
-    for (XWPFParagraph paragraph : paragraphs) {
-      if (element.equals(paragraph)) {
-        return OptionalInt.of(position);
-      }
-      position++;
-    }
-    return OptionalInt.empty();
-  }
-
   private static boolean findInTables(IBodyElement element, List<XWPFTable> tables) {
     for (XWPFTable nestedTable : tables) {
       if ((element instanceof XWPFTable && element.equals(nestedTable)) || findInTable(element, nestedTable)) {
@@ -375,7 +368,7 @@ public static Collection<Locale> detectLanguages(XWPFDocument document) {
   }
 
   /**
-   * Get all of the paragraphs which are embedded in a table.
+   * Get all the paragraphs which are embedded in a table.
    * This is done recursively, so paragraphs in tables in a table cell will also be found.
    *
    * @param table The table to check for embedded paragraphs
@@ -386,8 +379,8 @@ public static Collection<XWPFParagraph> getTableEmbeddedParagraphs(XWPFTable tab
     for (XWPFTableRow row : table.getRows()) {
       for (XWPFTableCell cell : row.getTableCells()) {
         paragraphs.addAll(cell.getParagraphs());
-        for (XWPFTable subtable : cell.getTables()) {
-          paragraphs.addAll(getTableEmbeddedParagraphs(subtable));
+        for (XWPFTable subTable : cell.getTables()) {
+          paragraphs.addAll(getTableEmbeddedParagraphs(subTable));
         }
       }
     }

diff --git a/src/test/java/com/docutools/jocument/impl/word/WordGeneratorTest.java b/src/test/java/com/docutools/jocument/impl/word/WordGeneratorTest.java
@@ -31,7 +31,6 @@
 import org.apache.poi.xwpf.usermodel.XWPFRun;
 import org.apache.xmlbeans.XmlAnySimpleType;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -133,7 +132,6 @@ void shouldReplacePlaceholdersInTables() throws InterruptedException, IOExceptio
     }
 
     @Test
-    @Disabled("Pending apache poi 5.2.4 release")
     @DisplayName("Replace custom placeholders in tables.")
     void shouldReplaceCustomPlaceholderInTable() throws InterruptedException, IOException {
         // Arrange