Index: applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionMetadataReader.java
===================================================================
--- applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionMetadataReader.java	(revision 30737)
+++ applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionMetadataReader.java	(revision 30738)
@@ -22,5 +22,4 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -32,5 +31,5 @@
 /**
  * Converts the text meta-data file into a <tt>FunctionMetadataRegistry</tt>
- * 
+ *
  * @author Josh Micich
  */
@@ -38,5 +37,5 @@
 
 	private static final String METADATA_FILE_NAME = "functionMetadata.txt";
-	
+
 	/** plain ASCII text metadata file uses three dots for ellipsis */
 	private static final String ELLIPSIS = "...";
@@ -59,13 +58,7 @@
 		}
 
-		BufferedReader br;
-		try {
-			br = new BufferedReader(new InputStreamReader(is,"UTF-8"));
-		} catch(UnsupportedEncodingException e) {
-			throw new RuntimeException(e);
-		}
 		FunctionDataBuilder fdb = new FunctionDataBuilder(400);
 
-		try {
+		try (BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"))) {
 			while (true) {
 				String line = br.readLine();
@@ -82,5 +75,4 @@
 				processLine(fdb, line);
 			}
-			br.close();
 		} catch (IOException e) {
 			throw new RuntimeException(e);
@@ -107,8 +99,8 @@
 		validateFunctionName(functionName);
 		// TODO - make POI use isVolatile
-		fdb.add(functionIndex, functionName, minParams, maxParams, 
+		fdb.add(functionIndex, functionName, minParams, maxParams,
 				returnClassCode, parameterClassCodes, hasNote);
 	}
-	
+
 
 	private static byte parseReturnTypeCode(String code) {
@@ -164,5 +156,5 @@
 
 	/**
-	 * Makes sure that footnote digits from the original OOO document have not been accidentally 
+	 * Makes sure that footnote digits from the original OOO document have not been accidentally
 	 * left behind
 	 */
@@ -182,5 +174,5 @@
 			return;
 		}
-		throw new RuntimeException("Invalid function name '" + functionName 
+		throw new RuntimeException("Invalid function name '" + functionName
 				+ "' (is footnote number incorrectly appended)");
 	}