Changeset 30738 in osm for applications/editors/josm/plugins/opendata/includes/org/apache

Timestamp:

2014-10-19T01:27:04+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

File:

• applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionMetadataReader.java (modified) (8 diffs)

applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/function/FunctionMetadataReader.java

@@ -22 +22 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -32 +31 @@
 /**
  * Converts the text meta-data file into a <tt>FunctionMetadataRegistry</tt>
- * 
+ *
  * @author Josh Micich
  */
@@ -38 +37 @@
 
         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 +58 @@
                 }
 
-                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 +75 @@
                                 processLine(fdb, line);
                         }
-                        br.close();
                 } catch (IOException e) {
                         throw new RuntimeException(e);
@@ -107 +99 @@
                 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 +156 @@
 
         /**
-         * 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 +174 @@
                         return;
                 }
-                throw new RuntimeException("Invalid function name '" + functionName 
+                throw new RuntimeException("Invalid function name '" + functionName
                                 + "' (is footnote number incorrectly appended)");
         }