Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2014-05-01T02:34:43+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - global use of try-with-resources, according to

• ​http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
• ​https://blogs.oracle.com/darcy/entry/project_coin_null_try_with

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• OsmValidator.java (modified) (4 diffs)
• tests/MapCSSTagChecker.java (modified) (1 diff)
• tests/OpeningHourTest.java (modified) (2 diffs)
• tests/TagChecker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -171 +171 @@
             File file = new File(getValidatorDir() + "ignorederrors");
             if (file.exists()) {
-                BufferedReader in = null;
-                try {
-                    in = new BufferedReader(new InputStreamReader(new FileInputStream(file), Utils.UTF_8));
+                try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file), Utils.UTF_8))) {
                     for (String line = in.readLine(); line != null; line = in.readLine()) {
                         ignoredErrors.add(line);
@@ -181 +179 @@
                 } catch (final IOException e) {
                     Main.error(e);
-                } finally {
-                    Utils.close(in);
                 }
             }
@@ -197 +193 @@
 
     public static void saveIgnoredErrors() {
-        PrintWriter out = null;
-        try {
-            out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(getValidatorDir() + "ignorederrors"), Utils.UTF_8), false);
+        try (PrintWriter out = new PrintWriter(new OutputStreamWriter(
+                new FileOutputStream(getValidatorDir() + "ignorederrors"), Utils.UTF_8), false)) {
             for (String e : ignoredErrors) {
                 out.println(e);
@@ -205 +200 @@
         } catch (IOException e) {
             Main.error(e);
-        } finally {
-            Utils.close(out);
         }
     }

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -453 +453 @@
                     Main.info(tr("Adding {0} to tag checker", i));
                 }
-                MirroredInputStream s = new MirroredInputStream(i);
-                try {
+                try (MirroredInputStream s = new MirroredInputStream(i)) {
                     addMapCSS(new BufferedReader(UTFInputStreamReader.create(s)));
-                } finally {
-                    Utils.close(s);
                 }
             } catch (IOException ex) {

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -5 +5 @@
 
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -51 +52 @@
         super.initialize();
         if (ENGINE != null) {
-            ENGINE.eval(new InputStreamReader(new MirroredInputStream("resource://data/validator/opening_hours.js"), Utils.UTF_8));
-            // fake country/state to not get errors on holidays
-            ENGINE.eval("var nominatimJSON = {address: {state: 'Bayern', country_code: 'de'}};");
-            ENGINE.eval(
-                    "var oh = function (value, mode) {" +
-                    " try {" +
-                    "    var r= new opening_hours(value, nominatimJSON, mode);" +
-                    "    r.getErrors = function() {return [];};" +
-                    "    return r;" +
-                    "  } catch(err) {" +
-                    "    return {" +
-                    "      getWarnings: function() {return [];}," +
-                    "      getErrors: function() {return [err.toString()]}" +
-                    "    };" +
-                    "  }" +
-                    "};");
+            try (Reader reader = new InputStreamReader(
+                    new MirroredInputStream("resource://data/validator/opening_hours.js"), Utils.UTF_8)) {
+                ENGINE.eval(reader);
+                // fake country/state to not get errors on holidays
+                ENGINE.eval("var nominatimJSON = {address: {state: 'Bayern', country_code: 'de'}};");
+                ENGINE.eval(
+                        "var oh = function (value, mode) {" +
+                        " try {" +
+                        "    var r= new opening_hours(value, nominatimJSON, mode);" +
+                        "    r.getErrors = function() {return [];};" +
+                        "    return r;" +
+                        "  } catch(err) {" +
+                        "    return {" +
+                        "      getWarnings: function() {return [];}," +
+                        "      getErrors: function() {return [err.toString()]}" +
+                        "    };" +
+                        "  }" +
+                        "};");
+            }
         } else {
             Main.warn("Unable to initialize OpeningHourTest because no JavaScript engine has been found");

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -54 +54 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.MultiMap;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -165 +164 @@
         String errorSources = "";
         for (String source : Main.pref.getCollection(PREF_SOURCES, DEFAULT_SOURCES)) {
-            BufferedReader reader = null;
-            try {
+            try (
                 MirroredInputStream s = new MirroredInputStream(source);
-                reader = new BufferedReader(UTFInputStreamReader.create(s));
-
+                BufferedReader reader = new BufferedReader(UTFInputStreamReader.create(s));
+            ) {
                 String okValue = null;
                 boolean tagcheckerfile = false;
@@ -242 +240 @@
             } catch (IOException e) {
                 errorSources += source + "\n";
-            } finally {
-                Utils.close(reader);
             }
         }