use try-with-resources

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1902873 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/poi-examples/src/main/java/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt b/poi-examples/src/main/java/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt
index 835fe63d6da6cd7031cd7236be0dfb16ac404b4c..910d2642362217ae796a293b8db8b94be0cc97d1 100644 (file)
--- a/poi-examples/src/main/java/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt
@@ -165,16 +165,14 @@ public class AddVideoToPptx {
         // see http://msdn.microsoft.com/en-us/library/dd950140(v=office.12).aspx\r
         ext.setUri("{DAA4B4D4-6D71-4841-9C94-3DE7FCFB9230}");\r
         String p14Ns = "http://schemas.microsoft.com/office/powerpoint/2010/main";\r
-        XmlCursor cur = ext.newCursor();\r
-        try {\r
+\r
+        try (XmlCursor cur = ext.newCursor()) {\r
             cur.toEndToken();\r
             cur.beginElement(new QName(p14Ns, "media", "p14"));\r
             cur.insertNamespace("p14", p14Ns);\r
             cur.insertAttributeWithValue(new QName(STRelationshipId.type.getName().getNamespaceURI(), "embed"), prsEmbed1.getId());\r
             cur.beginElement(new QName(p14Ns, "trim", "p14"));\r
             cur.insertAttributeWithValue("st", df_time.format(seconds*1000.0));\r
-        } finally {\r
-            cur.dispose();\r
         }\r
     }\r
 \r

diff --git a/poi-examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java
index 265fa730d48c8c9dec0c559b8c70d0a680961a19..e86cd791e50c01f0e1e305ac17cc80ae4841d177 100644 (file)
--- a/poi-examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java
@@ -84,14 +84,11 @@ public final class LinkVideoToPptx {
             ext.setUri("{DAA4B4D4-6D71-4841-9C94-3DE7FCFB9230}");
 
             String p14Ns = "http://schemas.microsoft.com/office/powerpoint/2010/main";
-            XmlCursor cur = ext.newCursor();
-            try {
+            try (XmlCursor cur = ext.newCursor()) {
                 cur.toEndToken();
                 cur.beginElement(new QName(p14Ns, "media", "p14"));
                 cur.insertNamespace("p14", p14Ns);
                 cur.insertAttributeWithValue(new QName(CORE_PROPERTIES_ECMA376_NS, "link"), prsEmbed1.getId());
-            } finally {
-                cur.dispose();
             }
 
             CTSlide xslide = slide1.getXmlObject();

diff --git a/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
index 3e82f28f0e60c8df9ecdf088871bb96b92166eab..71a49d6e0f1957140ac575de78c7b85a06bd9425 100644 (file)
--- a/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
@@ -55,7 +55,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeType;
  */
 class TestXSLFExamples {
     @Test
-    void LinkVideoToPptx() throws IOException, URISyntaxException {
+    void linkVideoToPptx() throws IOException, URISyntaxException {
         String videoFileName = "file_example_MP4_640_3MG.mp4";
         File previewJpg = POIDataSamples.getDocumentInstance().getFile("abstract1.jpg");