You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/11/20 12:48:04 UTC
svn commit: r1895196 - in /poi/trunk/poi-ooxml/src/main/java/org/apache/poi: ooxml/ ooxml/util/ openxml4j/opc/ xslf/usermodel/ xssf/model/ xssf/usermodel/ xwpf/usermodel/
Author: fanningpj
Date: Sat Nov 20 12:48:03 2021
New Revision: 1895196
URL: http://svn.apache.org/viewvc?rev=1895196&view=rev
Log:
use try block to close output streams
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.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/XWPFEndnotes.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java Sat Nov 20 12:48:03 2021
@@ -435,10 +435,10 @@ public class POIXMLDocumentPart {
* <pre>
* protected void commit() throws IOException {
* PackagePart part = getPackagePart();
- * OutputStream out = part.getOutputStream();
- * XmlObject bean = getXmlBean(); //the "model" which holds changes in memory
- * bean.save(out, DEFAULT_XML_OPTIONS);
- * out.close();
+ * try (OutputStream out = part.getOutputStream()) {
+ * XmlObject bean = getXmlBean(); //the "model" which holds changes in memory
+ * bean.save(out, DEFAULT_XML_OPTIONS);
+ * }
* }
* </pre>
*
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java Sat Nov 20 12:48:03 2021
@@ -73,9 +73,9 @@ public final class PackageHelper {
dest.addRelationship(part.getPartName(), rel.getTargetMode(), rel.getRelationshipType());
part_tgt = dest.createPart(part.getPartName(), part.getContentType());
- OutputStream out = part_tgt.getOutputStream();
- IOUtils.copy(part.getInputStream(), out);
- out.close();
+ try (OutputStream out = part_tgt.getOutputStream()) {
+ IOUtils.copy(part.getInputStream(), out);
+ }
if (part.hasRelationships()) {
copy(pkg, part, dest, part_tgt);
@@ -113,9 +113,12 @@ public final class PackageHelper {
PackagePart dest;
if(!tgt.containPart(p.getPartName())){
dest = tgt.createPart(p.getPartName(), p.getContentType());
- OutputStream out = dest.getOutputStream();
- IOUtils.copy(p.getInputStream(), out);
- out.close();
+ try (
+ InputStream in = p.getInputStream();
+ OutputStream out = dest.getOutputStream()
+ ) {
+ IOUtils.copy(in, out);
+ }
copy(pkg, p, tgt, dest);
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java Sat Nov 20 12:48:03 2021
@@ -1562,9 +1562,9 @@ public abstract class OPCPackage impleme
* "application/vnd.ms-excel.sheet.macroEnabled.main+xml",
* "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml");
*
- * FileOutputStream out = new FileOutputStream("workbook.xlsx");
- * pkg.save(out);
- * out.close();
+ * try (FileOutputStream out = new FileOutputStream("workbook.xlsx")) {
+ * pkg.save(out);
+ * }
*
* }</pre>
*
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java Sat Nov 20 12:48:03 2021
@@ -197,9 +197,9 @@ public class XMLSlideShow extends POIXML
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- _presentation.save(out, DEFAULT_XML_OPTIONS);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ _presentation.save(out, DEFAULT_XML_OPTIONS);
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java Sat Nov 20 12:48:03 2021
@@ -412,9 +412,9 @@ implements XSLFShapeContainer, Sheet<XSL
}
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- getXmlObject().save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ getXmlObject().save(out, xmlOptions);
+ }
}
/**
@@ -671,9 +671,9 @@ implements XSLFShapeContainer, Sheet<XSL
/**
* Import a package part into this sheet.
*/
- void importPart(PackageRelationship srcRel, PackagePart srcPafrt) {
+ void importPart(PackageRelationship srcRel, PackagePart srcPart) {
PackagePart destPP = getPackagePart();
- PackagePartName srcPPName = srcPafrt.getPartName();
+ PackagePartName srcPPName = srcPart.getPartName();
OPCPackage pkg = destPP.getPackage();
if(pkg.containPart(srcPPName)){
@@ -683,13 +683,12 @@ implements XSLFShapeContainer, Sheet<XSL
destPP.addRelationship(srcPPName, TargetMode.INTERNAL, srcRel.getRelationshipType());
- PackagePart part = pkg.createPart(srcPPName, srcPafrt.getContentType());
- try {
- OutputStream out = part.getOutputStream();
- InputStream is = srcPafrt.getInputStream();
+ PackagePart part = pkg.createPart(srcPPName, srcPart.getContentType());
+ try(
+ OutputStream out = part.getOutputStream();
+ InputStream is = srcPart.getInputStream();
+ ) {
IOUtils.copy(is, out);
- is.close();
- out.close();
} catch (IOException e){
throw new POIXMLException(e);
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java Sat Nov 20 12:48:03 2021
@@ -140,9 +140,9 @@ public class XSLFTheme extends POIXMLDoc
new QName(XSLFRelation.NS_DRAWINGML, "theme"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- getXmlObject().save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ getXmlObject().save(out, xmlOptions);
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java Sat Nov 20 12:48:03 2021
@@ -66,9 +66,9 @@ public class CalculationChain extends PO
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- writeTo(out);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ writeTo(out);
+ }
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java Sat Nov 20 12:48:03 2021
@@ -95,9 +95,9 @@ public class CommentsTable extends POIXM
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- writeTo(out);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ writeTo(out);
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java Sat Nov 20 12:48:03 2021
@@ -30,6 +30,8 @@ import org.apache.poi.openxml4j.opc.Pack
import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
import org.apache.poi.openxml4j.opc.TargetMode;
import org.apache.poi.ss.usermodel.Name;
+import org.apache.poi.util.Internal;
+import org.apache.poi.util.Removal;
import org.apache.xmlbeans.XmlException;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTExternalDefinedName;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTExternalLink;
@@ -74,15 +76,19 @@ public class ExternalLinksTable extends
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- writeTo(out);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ writeTo(out);
+ }
}
/**
* Returns the underlying xmlbeans object for the external
- * link table
+ * link table. Internal use only. Not currently used internally.
+ * @deprecated will be removed because we don't want to expose this (future implementations may not be
+ * XMLBeans based)
*/
+ @Internal
+ @Removal(version = "6.0.0")
public CTExternalLink getCTExternalLink(){
return link;
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java Sat Nov 20 12:48:03 2021
@@ -151,9 +151,9 @@ public class MapInfo extends POIXMLDocum
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- writeTo(out);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ writeTo(out);
+ }
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java Sat Nov 20 12:48:03 2021
@@ -81,9 +81,9 @@ public class SingleXmlCells extends POIX
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- writeTo(out);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ writeTo(out);
+ }
}
public CTSingleXmlCells getCTSingleXMLCells(){
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java Sat Nov 20 12:48:03 2021
@@ -726,9 +726,9 @@ public class StylesTable extends POIXMLD
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- writeTo(out);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ writeTo(out);
+ }
}
private void initialize() {
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java Sat Nov 20 12:48:03 2021
@@ -183,8 +183,8 @@ public class ThemesTable extends POIXMLD
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- writeTo(out);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ writeTo(out);
+ }
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java Sat Nov 20 12:48:03 2021
@@ -152,9 +152,9 @@ public final class XSSFDrawing extends P
.setSaveSyntheticDocumentElement(new QName(CTDrawing.type.getName().getNamespaceURI(), "wsDr", "xdr"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- drawing.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ drawing.save(out, xmlOptions);
+ }
}
@Override
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java Sat Nov 20 12:48:03 2021
@@ -100,13 +100,13 @@ public class XSSFPivotCacheDefinition ex
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
- //Sets the pivotCacheDefinition tag
- xmlOptions.setSaveSyntheticDocumentElement(new QName(CTPivotCacheDefinition.type.getName().
- getNamespaceURI(), "pivotCacheDefinition"));
- ctPivotCacheDefinition.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
+ //Sets the pivotCacheDefinition tag
+ xmlOptions.setSaveSyntheticDocumentElement(new QName(CTPivotCacheDefinition.type.getName().
+ getNamespaceURI(), "pivotCacheDefinition"));
+ ctPivotCacheDefinition.save(out, xmlOptions);
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java Sat Nov 20 12:48:03 2021
@@ -77,12 +77,12 @@ public class XSSFPivotCacheRecords exten
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
- //Sets the pivotCacheDefinition tag
- xmlOptions.setSaveSyntheticDocumentElement(new QName(CTPivotCacheRecords.type.getName().
- getNamespaceURI(), "pivotCacheRecords"));
- ctPivotCacheRecords.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
+ //Sets the pivotCacheDefinition tag
+ xmlOptions.setSaveSyntheticDocumentElement(new QName(CTPivotCacheRecords.type.getName().
+ getNamespaceURI(), "pivotCacheRecords"));
+ ctPivotCacheRecords.save(out, xmlOptions);
+ }
}
}
\ No newline at end of file
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java Sat Nov 20 12:48:03 2021
@@ -180,9 +180,9 @@ public class XSSFPivotTable extends POIX
xmlOptions.setSaveSyntheticDocumentElement(new QName(CTPivotTableDefinition.type.getName().
getNamespaceURI(), "pivotTableDefinition"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- pivotTableDefinition.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ pivotTableDefinition.save(out, xmlOptions);
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Sat Nov 20 12:48:03 2021
@@ -3594,9 +3594,9 @@ public class XSSFSheet extends POIXMLDoc
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- write(out);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ write(out);
+ }
}
protected void write(OutputStream out) throws IOException {
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java Sat Nov 20 12:48:03 2021
@@ -121,9 +121,9 @@ public class XSSFTable extends POIXMLDoc
@Override
protected void commit() throws IOException {
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- writeTo(out);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ writeTo(out);
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java Sat Nov 20 12:48:03 2021
@@ -164,9 +164,9 @@ public class XWPFComments extends POIXML
xmlOptions.setSaveSyntheticDocumentElement(new QName(
CTComments.type.getName().getNamespaceURI(), "comments"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- ctComments.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ ctComments.save(out, xmlOptions);
+ }
}
public List<XWPFPictureData> getAllPictures() {
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=1895196&r1=1895195&r2=1895196&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 Nov 20 12:48:03 2021
@@ -816,9 +816,9 @@ public class XWPFDocument extends POIXML
xmlOptions.setSaveSyntheticDocumentElement(new QName(CTDocument1.type.getName().getNamespaceURI(), "document"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- ctDocument.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ ctDocument.save(out, xmlOptions);
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java Sat Nov 20 12:48:03 2021
@@ -126,9 +126,9 @@ public class XWPFEndnotes extends XWPFAb
XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
xmlOptions.setSaveSyntheticDocumentElement(new QName(CTEndnotes.type.getName().getNamespaceURI(), "endnotes"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- ctEndnotes.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ ctEndnotes.save(out, xmlOptions);
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java Sat Nov 20 12:48:03 2021
@@ -81,9 +81,9 @@ public class XWPFFooter extends XWPFHead
XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
xmlOptions.setSaveSyntheticDocumentElement(new QName(CTNumbering.type.getName().getNamespaceURI(), "ftr"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- super._getHdrFtr().save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ super._getHdrFtr().save(out, xmlOptions);
+ }
}
@Override
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java Sat Nov 20 12:48:03 2021
@@ -127,9 +127,9 @@ public class XWPFFootnotes extends XWPFA
XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
xmlOptions.setSaveSyntheticDocumentElement(new QName(CTFootnotes.type.getName().getNamespaceURI(), "footnotes"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- ctFootnotes.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ ctFootnotes.save(out, xmlOptions);
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java Sat Nov 20 12:48:03 2021
@@ -79,9 +79,9 @@ public class XWPFHeader extends XWPFHead
XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
xmlOptions.setSaveSyntheticDocumentElement(new QName(CTNumbering.type.getName().getNamespaceURI(), "hdr"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- super._getHdrFtr().save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ super._getHdrFtr().save(out, xmlOptions);
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java Sat Nov 20 12:48:03 2021
@@ -97,9 +97,9 @@ public class XWPFNumbering extends POIXM
XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
xmlOptions.setSaveSyntheticDocumentElement(new QName(CTNumbering.type.getName().getNamespaceURI(), "numbering"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- ctNumbering.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ ctNumbering.save(out, xmlOptions);
+ }
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java Sat Nov 20 12:48:03 2021
@@ -396,9 +396,9 @@ public class XWPFSettings extends POIXML
xmlOptions.setSaveSyntheticDocumentElement(new QName(CTSettings.type.getName().getNamespaceURI(), "settings"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- ctSettings.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ ctSettings.save(out, xmlOptions);
+ }
}
private CTDocProtect safeGetDocumentProtection() {
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java?rev=1895196&r1=1895195&r2=1895196&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java Sat Nov 20 12:48:03 2021
@@ -97,9 +97,9 @@ public class XWPFStyles extends POIXMLDo
XmlOptions xmlOptions = new XmlOptions(DEFAULT_XML_OPTIONS);
xmlOptions.setSaveSyntheticDocumentElement(new QName(CTStyles.type.getName().getNamespaceURI(), "styles"));
PackagePart part = getPackagePart();
- OutputStream out = part.getOutputStream();
- ctStyles.save(out, xmlOptions);
- out.close();
+ try (OutputStream out = part.getOutputStream()) {
+ ctStyles.save(out, xmlOptions);
+ }
}
protected void ensureDocDefaults() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org