This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi.git
The following commit(s) were added to refs/heads/trunk by this push:
new 05098040dc use pattern variables more (#1193)
05098040dc is described below
commit 05098040dc69fb0a48c5a13edacfa1a36f85c8ee
Author: PJ Fanning <[email protected]>
AuthorDate: Tue Jul 28 16:37:24 2026 +0100
use pattern variables more (#1193)
---
.../poi/xwpf/extractor/XWPFWordExtractor.java | 46 +++++++--------
.../usermodel/XWPFAbstractFootnoteEndnote.java | 12 ++--
.../org/apache/poi/xwpf/usermodel/XWPFComment.java | 12 ++--
.../apache/poi/xwpf/usermodel/XWPFComments.java | 3 +-
.../apache/poi/xwpf/usermodel/XWPFDocument.java | 36 ++++++------
.../poi/xwpf/usermodel/XWPFHeaderFooter.java | 12 ++--
.../apache/poi/xwpf/usermodel/XWPFParagraph.java | 65 ++++++++++------------
.../org/apache/poi/xwpf/usermodel/XWPFRun.java | 27 ++++-----
.../apache/poi/xwpf/usermodel/XWPFTableCell.java | 15 +++--
9 files changed, 107 insertions(+), 121 deletions(-)
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
index 3ef53d636a..cf63536b47 100644
---
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
+++
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
@@ -17,8 +17,6 @@
package org.apache.poi.xwpf.extractor;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import org.apache.poi.ooxml.extractor.POIXMLTextExtractor;
@@ -45,13 +43,11 @@ import
org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSectPr;
* Helper class to extract text from an OOXML Word file
*/
public class XWPFWordExtractor implements POIXMLTextExtractor {
- public static final List<XWPFRelation> SUPPORTED_TYPES =
Collections.unmodifiableList(
- Arrays.asList(
- XWPFRelation.DOCUMENT,
- XWPFRelation.TEMPLATE,
- XWPFRelation.MACRO_DOCUMENT,
- XWPFRelation.MACRO_TEMPLATE_DOCUMENT
- )
+ public static final List<XWPFRelation> SUPPORTED_TYPES = List.of(
+ XWPFRelation.DOCUMENT,
+ XWPFRelation.TEMPLATE,
+ XWPFRelation.MACRO_DOCUMENT,
+ XWPFRelation.MACRO_TEMPLATE_DOCUMENT
);
private final XWPFDocument document;
@@ -104,12 +100,12 @@ public class XWPFWordExtractor implements
POIXMLTextExtractor {
}
public void appendBodyElementText(StringBuilder text, IBodyElement e) {
- if (e instanceof XWPFParagraph) {
- appendParagraphText(text, (XWPFParagraph) e);
- } else if (e instanceof XWPFTable) {
- appendTableText(text, (XWPFTable) e);
- } else if (e instanceof XWPFSDT) {
- text.append(((XWPFSDT) e).getContent().getText());
+ if (e instanceof XWPFParagraph paragraph) {
+ appendParagraphText(text, paragraph);
+ } else if (e instanceof XWPFTable table) {
+ appendTableText(text, table);
+ } else if (e instanceof XWPFSDT sdt) {
+ text.append(sdt.getContent().getText());
}
}
@@ -127,15 +123,15 @@ public class XWPFWordExtractor implements
POIXMLTextExtractor {
}
for (IRunElement run : paragraph.getIRuns()) {
- if (run instanceof XWPFSDT) {
- text.append(((XWPFSDT) run).getContent().getText());
- } else if (! concatenatePhoneticRuns && run instanceof XWPFRun) {
- text.append(((XWPFRun)run).text());
+ if (run instanceof XWPFSDT xwpfsdt) {
+ text.append(xwpfsdt.getContent().getText());
+ } else if (!concatenatePhoneticRuns && run instanceof XWPFRun
xwpfRun) {
+ text.append(xwpfRun.text());
} else {
text.append(run);
}
- if (run instanceof XWPFHyperlinkRun && fetchHyperlinks) {
- XWPFHyperlink link = ((XWPFHyperlinkRun)
run).getHyperlink(document);
+ if (run instanceof XWPFHyperlinkRun xwpfHyperlinkRun &&
fetchHyperlinks) {
+ XWPFHyperlink link = xwpfHyperlinkRun.getHyperlink(document);
if (link != null)
text.append(" <").append(link.getURL()).append(">");
}
@@ -165,10 +161,10 @@ public class XWPFWordExtractor implements
POIXMLTextExtractor {
List<ICell> cells = row.getTableICells();
for (int i = 0; i < cells.size(); i++) {
ICell cell = cells.get(i);
- if (cell instanceof XWPFTableCell) {
- text.append(((XWPFTableCell) cell).getTextRecursively());
- } else if (cell instanceof XWPFSDTCell) {
- text.append(((XWPFSDTCell) cell).getContent().getText());
+ if (cell instanceof XWPFTableCell xwpfTableCell) {
+ text.append(xwpfTableCell.getTextRecursively());
+ } else if (cell instanceof XWPFSDTCell xwpfSdtCell) {
+ text.append(xwpfSdtCell.getContent().getText());
}
if (i < cells.size() - 1) {
text.append("\t");
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
index a4fa553b33..2360bd7b7d 100644
---
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
+++
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
@@ -79,16 +79,16 @@ public abstract class XWPFAbstractFootnoteEndnote
implements Iterable<XWPFParag
cursor.selectPath("./*");
while (cursor.toNextSelection()) {
XmlObject o = cursor.getObject();
- if (o instanceof CTP) {
- XWPFParagraph p = new XWPFParagraph((CTP) o, this);
+ if (o instanceof CTP ctp) {
+ XWPFParagraph p = new XWPFParagraph(ctp, this);
bodyElements.add(p);
paragraphs.add(p);
- } else if (o instanceof CTTbl) {
- XWPFTable t = new XWPFTable((CTTbl) o, this, false);
+ } else if (o instanceof CTTbl cttbl) {
+ XWPFTable t = new XWPFTable(cttbl, this, false);
bodyElements.add(t);
tables.add(t);
- } else if (o instanceof CTSdtBlock) {
- XWPFSDT c = new XWPFSDT((CTSdtBlock) o, this);
+ } else if (o instanceof CTSdtBlock ctsdtBlock) {
+ XWPFSDT c = new XWPFSDT(ctsdtBlock, this);
bodyElements.add(c);
}
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
index b5640c600a..af1876cac2 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
@@ -51,16 +51,16 @@ public class XWPFComment implements IBody {
cursor.selectPath("./*");
while (cursor.toNextSelection()) {
XmlObject o = cursor.getObject();
- if (o instanceof CTP) {
- XWPFParagraph p = new XWPFParagraph((CTP) o, this);
+ if (o instanceof CTP ctp) {
+ XWPFParagraph p = new XWPFParagraph(ctp, this);
bodyElements.add(p);
paragraphs.add(p);
- } else if (o instanceof CTTbl) {
- XWPFTable t = new XWPFTable((CTTbl) o, this, false);
+ } else if (o instanceof CTTbl table) {
+ XWPFTable t = new XWPFTable(table, this, false);
bodyElements.add(t);
tables.add(t);
- } else if (o instanceof CTSdtBlock) {
- XWPFSDT c = new XWPFSDT((CTSdtBlock) o, this);
+ } else if (o instanceof CTSdtBlock block) {
+ XWPFSDT c = new XWPFSDT(block, this);
bodyElements.add(c);
}
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
index 6ab26a8c31..c48fedb0cc 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
@@ -94,8 +94,7 @@ public class XWPFComments extends POIXMLDocumentPart {
}
for (POIXMLDocumentPart poixmlDocumentPart : getRelations()) {
- if (poixmlDocumentPart instanceof XWPFPictureData) {
- XWPFPictureData xwpfPicData = (XWPFPictureData)
poixmlDocumentPart;
+ if (poixmlDocumentPart instanceof XWPFPictureData xwpfPicData) {
pictures.add(xwpfPicData);
document.registerPackagePictureData(xwpfPicData);
}
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
index ce26befae7..e4562eb9aa 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
@@ -226,16 +226,16 @@ public class XWPFDocument extends POIXMLDocument
implements Document, IBody {
bodyCursor.selectPath("./*");
while (bodyCursor.toNextSelection()) {
XmlObject bodyObj = bodyCursor.getObject();
- if (bodyObj instanceof CTP) {
- XWPFParagraph p = new XWPFParagraph((CTP)
bodyObj, this);
+ if (bodyObj instanceof CTP ctp) {
+ XWPFParagraph p = new XWPFParagraph(ctp,
this);
bodyElements.add(p);
paragraphs.add(p);
- } else if (bodyObj instanceof CTTbl) {
- XWPFTable t = new XWPFTable((CTTbl)
bodyObj, this, false);
+ } else if (bodyObj instanceof CTTbl table) {
+ XWPFTable t = new XWPFTable(table, this,
false);
bodyElements.add(t);
tables.add(t);
- } else if (bodyObj instanceof CTSdtBlock) {
- XWPFSDT c = new XWPFSDT((CTSdtBlock)
bodyObj, this);
+ } else if (bodyObj instanceof CTSdtBlock
sdtBlock) {
+ XWPFSDT c = new XWPFSDT(sdtBlock, this);
bodyElements.add(c);
contentControls.add(c);
}
@@ -763,10 +763,10 @@ public class XWPFDocument extends POIXMLDocument
implements Document, IBody {
private void insertIntoParentElement(IBodyElement iBodyElement,
Deque<XmlObject> path) {
XmlObject firstObject = path.pop();
if (path.isEmpty()) {
- if (iBodyElement instanceof XWPFParagraph) {
- insertIntoParagraphsAndElements((XWPFParagraph) iBodyElement,
paragraphs, bodyElements);
- } else if (iBodyElement instanceof XWPFTable) {
- insertIntoTablesAndElements((XWPFTable) iBodyElement, tables,
bodyElements);
+ if (iBodyElement instanceof XWPFParagraph xwpfParagraph) {
+ insertIntoParagraphsAndElements(xwpfParagraph, paragraphs,
bodyElements);
+ } else if (iBodyElement instanceof XWPFTable xwpfTable) {
+ insertIntoTablesAndElements(xwpfTable, tables, bodyElements);
}
} else {
CTTbl ctTbl = (CTTbl) path.pop(); //first object is always the
body, we want the second one
@@ -873,10 +873,10 @@ public class XWPFDocument extends POIXMLDocument
implements Document, IBody {
}
private Optional<XmlCursor> getNewCursor(IBodyElement iBodyElement) {
- if (iBodyElement instanceof XWPFParagraph) {
- return Optional.ofNullable(((XWPFParagraph)
iBodyElement).getCTP().newCursor());
- } else if (iBodyElement instanceof XWPFTable) {
- return Optional.ofNullable(((XWPFTable)
iBodyElement).getCTTbl().newCursor());
+ if (iBodyElement instanceof XWPFParagraph paragraph) {
+ return Optional.ofNullable(paragraph.getCTP().newCursor());
+ } else if (iBodyElement instanceof XWPFTable table) {
+ return Optional.ofNullable(table.getCTTbl().newCursor());
}
return Optional.empty();
}
@@ -902,10 +902,10 @@ public class XWPFDocument extends POIXMLDocument
implements Document, IBody {
private void insertElementIntoCell(XWPFTableCell tableCell, IBodyElement
iBodyElement, Deque<XmlObject> path) {
if (path.isEmpty()) {
- if (iBodyElement instanceof XWPFParagraph) {
- insertIntoParagraphsAndElements((XWPFParagraph) iBodyElement,
tableCell.paragraphs, tableCell.bodyElements);
- } else if (iBodyElement instanceof XWPFTable) {
- insertIntoTablesAndElements((XWPFTable) iBodyElement,
tableCell.tables, tableCell.bodyElements);
+ if (iBodyElement instanceof XWPFParagraph paragraph) {
+ insertIntoParagraphsAndElements(paragraph,
tableCell.paragraphs, tableCell.bodyElements);
+ } else if (iBodyElement instanceof XWPFTable table) {
+ insertIntoTablesAndElements(table, tableCell.tables,
tableCell.bodyElements);
}
} else {
// another table
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
index b0ec0f4dd1..929ac2904a 100644
---
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
+++
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
@@ -137,7 +137,7 @@ public abstract class XWPFHeaderFooter extends
POIXMLDocumentPart implements IBo
for (XWPFParagraph paragraph : paragraphs) {
if (!paragraph.isEmpty()) {
String text = paragraph.getText();
- if (text != null && text.length() > 0) {
+ if (text != null && !text.isEmpty()) {
t.append(text);
t.append('\n');
}
@@ -146,7 +146,7 @@ public abstract class XWPFHeaderFooter extends
POIXMLDocumentPart implements IBo
for (XWPFTable table : tables) {
String text = table.getText();
- if (text != null && text.length() > 0) {
+ if (text != null && !text.isEmpty()) {
t.append(text);
t.append('\n');
}
@@ -543,13 +543,13 @@ public abstract class XWPFHeaderFooter extends
POIXMLDocumentPart implements IBo
cursor.selectPath("./*");
while (cursor.toNextSelection()) {
XmlObject o = cursor.getObject();
- if (o instanceof CTP) {
- XWPFParagraph p = new XWPFParagraph((CTP) o, this);
+ if (o instanceof CTP ctp) {
+ XWPFParagraph p = new XWPFParagraph(ctp, this);
paragraphs.add(p);
bodyElements.add(p);
}
- if (o instanceof CTTbl) {
- XWPFTable t = new XWPFTable((CTTbl) o, this, false);
+ if (o instanceof CTTbl table) {
+ XWPFTable t = new XWPFTable(table, this, false);
tables.add(t);
bodyElements.add(t);
}
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
index 62c81e1e81..2ff9ed0027 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
@@ -77,8 +77,7 @@ public class XWPFParagraph implements IBodyElement, IRunBody,
ISDTContents, Para
c.selectPath("child::*");
while (c.toNextSelection()) {
XmlObject o = c.getObject();
- if (o instanceof CTFtnEdnRef) {
- CTFtnEdnRef ftn = (CTFtnEdnRef) o;
+ if (o instanceof CTFtnEdnRef ftn) {
final BigInteger id = ftn.getId();
footnoteText.append(" [").append(id).append(": ");
XWPFAbstractFootnoteEndnote footnote =
@@ -115,37 +114,34 @@ public class XWPFParagraph implements IBodyElement,
IRunBody, ISDTContents, Para
c.selectPath("child::*");
while (c.toNextSelection()) {
XmlObject o = c.getObject();
- if (o instanceof CTR) {
- XWPFRun r = new XWPFRun((CTR) o, (IRunBody) this);
+ if (o instanceof CTR ctr) {
+ XWPFRun r = new XWPFRun(ctr, (IRunBody) this);
runs.add(r);
iruns.add(r);
}
- if (o instanceof CTHyperlink) {
- CTHyperlink link = (CTHyperlink)o;
+ if (o instanceof CTHyperlink link) {
for (CTR r : link.getRArray()) {
XWPFHyperlinkRun hr = new XWPFHyperlinkRun(link, r,
this);
runs.add(hr);
iruns.add(hr);
}
}
- if (o instanceof CTSimpleField) {
- CTSimpleField field = (CTSimpleField)o;
+ if (o instanceof CTSimpleField field) {
for (CTR r : field.getRArray()) {
XWPFFieldRun fr = new XWPFFieldRun(field, r, this);
runs.add(fr);
iruns.add(fr);
}
}
- if (o instanceof CTSdtBlock) {
- XWPFSDT cc = new XWPFSDT((CTSdtBlock) o, part);
+ if (o instanceof CTSdtBlock block) {
+ XWPFSDT cc = new XWPFSDT(block, part);
iruns.add(cc);
}
- if (o instanceof CTSdtRun) {
- XWPFSDT cc = new XWPFSDT((CTSdtRun) o, part);
+ if (o instanceof CTSdtRun run) {
+ XWPFSDT cc = new XWPFSDT(run, part);
iruns.add(cc);
}
- if (o instanceof CTRunTrackChange) {
- final CTRunTrackChange parentRecord = (CTRunTrackChange) o;
+ if (o instanceof CTRunTrackChange parentRecord) {
for (CTR r : parentRecord.getRArray()) {
XWPFRun cr = new XWPFRun(r, (IRunBody) this);
runs.add(cr);
@@ -201,14 +197,13 @@ public class XWPFParagraph implements IBodyElement,
IRunBody, ISDTContents, Para
public String getText() {
StringBuilder out = new StringBuilder(64);
for (IRunElement run : iruns) {
- if (run instanceof XWPFRun) {
- XWPFRun xRun = (XWPFRun) run;
+ if (run instanceof XWPFRun xRun) {
// don't include the text if reviewing is enabled and this is
a deleted run
if (xRun.getCTR().sizeOfDelTextArray() == 0) {
out.append(xRun);
}
- } else if (run instanceof XWPFSDT) {
- out.append(((XWPFSDT) run).getContent().getText());
+ } else if (run instanceof XWPFSDT xSdt) {
+ out.append(xSdt.getContent().getText());
} else {
out.append(run);
}
@@ -466,7 +461,7 @@ public class XWPFParagraph implements IBodyElement,
IRunBody, ISDTContents, Para
StringBuilder out = new StringBuilder(64);
for (XWPFRun run : runs) {
String pictureText = run.getPictureText();
- if (out.length() > 0 && pictureText.length() > 0) {
+ if (!out.isEmpty() && !pictureText.isEmpty()) {
out.append("\n");
}
out.append(pictureText);
@@ -1718,9 +1713,9 @@ public class XWPFParagraph implements IBodyElement,
IRunBody, ISDTContents, Para
c.selectPath("./*");
while (c.toNextSelection()) {
XmlObject o = c.getObject();
- if (o instanceof CTText) {
+ if (o instanceof CTText ctText) {
if (textPos >= startText) {
- String candidate = ((CTText) o).getStringValue();
+ String candidate = ctText.getStringValue();
if (runPos == startRun) {
charPos = startChar;
} else {
@@ -1811,9 +1806,9 @@ public class XWPFParagraph implements IBodyElement,
IRunBody, ISDTContents, Para
if (pos >= 0 && pos < runs.size()) {
XWPFRun run = runs.get(pos);
// CTP -> CTHyperlink -> R array
- if (run instanceof XWPFHyperlinkRun
- && isTheOnlyCTHyperlinkInRuns((XWPFHyperlinkRun) run)) {
- try (XmlCursor c = ((XWPFHyperlinkRun)
run).getCTHyperlink().newCursor()) {
+ if (run instanceof XWPFHyperlinkRun hyperlinkRun
+ && isTheOnlyCTHyperlinkInRuns(hyperlinkRun)) {
+ try (XmlCursor c = hyperlinkRun.getCTHyperlink().newCursor()) {
c.removeXml();
}
runs.remove(pos);
@@ -1821,9 +1816,9 @@ public class XWPFParagraph implements IBodyElement,
IRunBody, ISDTContents, Para
return true;
}
// CTP -> CTField -> R array
- if (run instanceof XWPFFieldRun
- && isTheOnlyCTFieldInRuns((XWPFFieldRun) run)) {
- try (XmlCursor c = ((XWPFFieldRun)
run).getCTField().newCursor()) {
+ if (run instanceof XWPFFieldRun fieldRun
+ && isTheOnlyCTFieldInRuns(fieldRun)) {
+ try (XmlCursor c = fieldRun.getCTField().newCursor()) {
c.removeXml();
}
runs.remove(pos);
@@ -1847,8 +1842,8 @@ public class XWPFParagraph implements IBodyElement,
IRunBody, ISDTContents, Para
*/
private boolean isTheOnlyCTHyperlinkInRuns(XWPFHyperlinkRun run) {
CTHyperlink ctHyperlink = run.getCTHyperlink();
- long count = runs.stream().filter(r -> (r instanceof XWPFHyperlinkRun
- && ctHyperlink == ((XWPFHyperlinkRun) r).getCTHyperlink()))
+ long count = runs.stream().filter(r -> (r instanceof XWPFHyperlinkRun
hyperlinkRun
+ && ctHyperlink == hyperlinkRun.getCTHyperlink()))
.count();
return count <= 1;
}
@@ -1860,8 +1855,8 @@ public class XWPFParagraph implements IBodyElement,
IRunBody, ISDTContents, Para
*/
private boolean isTheOnlyCTFieldInRuns(XWPFFieldRun run) {
CTSimpleField ctField = run.getCTField();
- long count = runs.stream().filter(r -> (r instanceof XWPFFieldRun
- && ctField == ((XWPFFieldRun) r).getCTField())).count();
+ long count = runs.stream().filter(r -> (r instanceof XWPFFieldRun
fieldRun
+ && ctField == fieldRun.getCTField())).count();
return count <= 1;
}
@@ -1934,10 +1929,10 @@ public class XWPFParagraph implements IBodyElement,
IRunBody, ISDTContents, Para
XWPFRun run = createRun();
CTR ctRun = run.getCTR();
ctRun.addNewRPr().addNewRStyle().setVal("FootnoteReference");
- if (footnote instanceof XWPFEndnote) {
- ctRun.addNewEndnoteReference().setId(footnote.getId());
- } else {
- ctRun.addNewFootnoteReference().setId(footnote.getId());
+ if (footnote instanceof XWPFEndnote endnote) {
+ ctRun.addNewEndnoteReference().setId(endnote.getId());
+ } else if (footnote instanceof XWPFFootnote footnoteRef) {
+ ctRun.addNewFootnoteReference().setId(footnoteRef.getId());
}
}
}
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
index 6049606509..43540699e5 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
@@ -121,7 +121,7 @@ public class XWPFRun implements ISDTContents, IRunElement,
CharacterRun {
NodeList kids = t.getDomNode().getChildNodes();
for (int n = 0; n < kids.getLength(); n++) {
if (kids.item(n) instanceof Text) {
- if (text.length() > 0) {
+ if (!text.isEmpty()) {
text.append("\n");
}
text.append(kids.item(n).getNodeValue());
@@ -145,8 +145,8 @@ public class XWPFRun implements ISDTContents, IRunElement,
CharacterRun {
for (XmlObject chartRel : chartRels) {
if (chartRel instanceof CTRelId) {
POIXMLDocumentPart chart =
getDocument().getRelationById(((CTRelId) chartRel).getId());
- if (chart instanceof XWPFChart) {
- charts.add((XWPFChart) chart);
+ if (chart instanceof XWPFChart xwpfChart) {
+ charts.add(xwpfChart);
}
}
}
@@ -190,8 +190,8 @@ public class XWPFRun implements ISDTContents, IRunElement,
CharacterRun {
throw new POIXMLException(e);
}
}
- if (pict instanceof CTPicture) {
- pics.add((CTPicture) pict);
+ if (pict instanceof CTPicture ctPicture) {
+ pics.add(ctPicture);
}
}
return pics;
@@ -223,8 +223,8 @@ public class XWPFRun implements ISDTContents, IRunElement,
CharacterRun {
*/
@Deprecated
public XWPFParagraph getParagraph() {
- if (parent instanceof XWPFParagraph) {
- return (XWPFParagraph) parent;
+ if (parent instanceof XWPFParagraph xwpfParagraph) {
+ return xwpfParagraph;
}
return null;
}
@@ -625,8 +625,8 @@ public class XWPFRun implements ISDTContents, IRunElement,
CharacterRun {
if (underline != null) {
Object rawValue = underline.getColor();
if (rawValue != null) {
- if (rawValue instanceof String) {
- colorName = (String) rawValue;
+ if (rawValue instanceof String str) {
+ colorName = str;
} else {
byte[] rgbColor = (byte[]) rawValue;
colorName = HexDump.toHex(rgbColor[0]) +
HexDump.toHex(rgbColor[1]) + HexDump.toHex(rgbColor[2]);
@@ -1270,12 +1270,10 @@ public class XWPFRun implements ISDTContents,
IRunElement, CharacterRun {
// Work out what to add the picture to, then add both the
// picture and the relationship for it
// TODO Should we have an interface for this sort of thing?
- if (parent.getPart() instanceof XWPFHeaderFooter) {
- XWPFHeaderFooter headerFooter = (XWPFHeaderFooter)
parent.getPart();
+ if (parent.getPart() instanceof XWPFHeaderFooter headerFooter) {
relationId = headerFooter.addPictureData(pictureData, pictureType);
picData = (XWPFPictureData)
headerFooter.getRelationById(relationId);
- } else if (parent.getPart() instanceof XWPFComments) {
- XWPFComments comments = (XWPFComments) parent.getPart();
+ } else if (parent.getPart() instanceof XWPFComments comments) {
relationId = comments.addPictureData(pictureData, pictureType);
picData = (XWPFPictureData) comments.getRelationById(relationId);
} else {
@@ -1614,8 +1612,7 @@ public class XWPFRun implements ISDTContents,
IRunElement, CharacterRun {
}
}
}
- if (o instanceof CTFtnEdnRef) {
- CTFtnEdnRef ftn = (CTFtnEdnRef) o;
+ if (o instanceof CTFtnEdnRef ftn) {
final int i = ftn.getId() == null ? -1 : ftn.getId().intValue();
String footnoteRef =
ftn.getDomNode().getLocalName().equals("footnoteReference") ?
"[footnoteRef:" + i + "]" : "[endnoteRef:" + i + "]";
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
index cf5846a772..20e33682e3 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
@@ -471,13 +471,12 @@ public class XWPFTableCell implements IBody, ICell {
}
private void appendBodyElementText(StringBuilder text, IBodyElement e,
boolean isLast) {
- if (e instanceof XWPFParagraph) {
- text.append(((XWPFParagraph) e).getText());
+ if (e instanceof XWPFParagraph paragraph) {
+ text.append(paragraph.getText());
if (!isLast) {
text.append('\t');
}
- } else if (e instanceof XWPFTable) {
- XWPFTable eTable = (XWPFTable) e;
+ } else if (e instanceof XWPFTable eTable) {
for (XWPFTableRow row : eTable.getRows()) {
for (XWPFTableCell cell : row.getTableCells()) {
List<IBodyElement> localBodyElements =
cell.getBodyElements();
@@ -491,8 +490,8 @@ public class XWPFTableCell implements IBody, ICell {
if (!isLast) {
text.append('\n');
}
- } else if (e instanceof XWPFSDT) {
- text.append(((XWPFSDT) e).getContent().getText());
+ } else if (e instanceof XWPFSDT sdt) {
+ text.append(sdt.getContent().getText());
if (!isLast) {
text.append('\t');
}
@@ -549,8 +548,8 @@ public class XWPFTableCell implements IBody, ICell {
if (depth > MAX_RECURSION_DEPTH) {
throw new IllegalStateException("Recursion depth exceeded while
trying to get XWPFDocument from XWPFTableCell");
}
- if (cell.part instanceof XWPFTableCell) {
- return getCellDocument((XWPFTableCell) cell.part, depth + 1);
+ if (cell.part instanceof XWPFTableCell tableCell) {
+ return getCellDocument(tableCell, depth + 1);
} else {
return cell.part.getXWPFDocument();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]