XMLTools: use try-with-resources statement

Author: sbesson

src/main/java/loci/common/IniParser.java

@@ -122,24 +122,10 @@ public IniList parseINI(String path, Class<?> c)
   public IniList parseINI(File file)
     throws IOException
   {
-    FileInputStream fis = null;
-    InputStreamReader isr = null;
-    BufferedReader br = null;
-    try {
-      fis = new FileInputStream(file);
-      isr = new InputStreamReader(fis, Constants.ENCODING);
-      br = new BufferedReader(isr);
+    try (FileInputStream fis = new FileInputStream(file);
+         InputStreamReader isr = new InputStreamReader(fis, Constants.ENCODING);
+         BufferedReader br = new BufferedReader(isr)) {
       return parseINI(br);
-    } finally {
-      if (br != null) {
-        br.close();
-      }
-      if (isr != null) {
-        isr.close();
-      }
-      if (fis != null) {
-        fis.close();
-      }
     }
   }
 

src/main/java/loci/common/xml/XMLTools.java

@@ -189,12 +189,9 @@ public static Document createDocument() {
   public static Document parseDOM(File file)
     throws ParserConfigurationException, SAXException, IOException
   {
-    InputStream is = new FileInputStream(file);
-    try {
+    try (InputStream is = new FileInputStream(file)) {
       Document doc = parseDOM(is);
       return doc;
-    } finally {
-      is.close();
     }
   }
 
@@ -211,12 +208,9 @@ public static Document parseDOM(String xml)
     throws ParserConfigurationException, SAXException, IOException
   {
     byte[] bytes = xml.getBytes(Constants.ENCODING);
-    InputStream is = new ByteArrayInputStream(bytes);
-    try {
+    try (InputStream is = new ByteArrayInputStream(bytes)) {
       Document doc = parseDOM(is);
       return doc;
-    } finally {
-      is.close();
     }
   }