Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/io/GeoJSONExporter.java

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

File:

• trunk/src/org/openstreetmap/josm/io/GeoJSONExporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/GeoJSONExporter.java

@@ -21 +21 @@
             "json,geojson", "json", tr("GeoJSON Files") + " (*.json *.geojson)");
 
+    /**
+     * Constructs a new {@code GeoJSONExporter}.
+     */
     public GeoJSONExporter() {
         super(FILE_FILTER);
@@ -29 +32 @@
         if (layer instanceof OsmDataLayer) {
             String json = new GeoJSONWriter((OsmDataLayer) layer).write();
-            Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), Utils.UTF_8));
-            try {
+            try (Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), Utils.UTF_8))) {
                 out.write(json);
-            } finally {
-                Utils.close(out);
             }
         } else {