Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/gui/layer

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/gui/layer

Files:

• TMSLayer.java (modified) (1 diff)
• geoimage/CorrelateGpxWithImages.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -326 +326 @@
             protected byte[] updateData() throws IOException {
                 URL u = getAttributionUrl();
-                UTFInputStreamReader in = UTFInputStreamReader.create(Utils.openURL(u));
-                String r = new Scanner(in).useDelimiter("\\A").next();
-                Utils.close(in);
-                Main.info("Successfully loaded Bing attribution data.");
-                return r.getBytes("utf-8");
+                try (Scanner scanner = new Scanner(UTFInputStreamReader.create(Utils.openURL(u)))) {
+                    String r = scanner.useDelimiter("\\A").next();
+                    Main.info("Successfully loaded Bing attribution data.");
+                    return r.getBytes("UTF-8");
+                }
             }
         }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -21 +21 @@
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -171 +172 @@
                 }
                 GpxData data = null;
-                try {
-                    InputStream iStream;
-                    if (sel.getName().toLowerCase().endsWith(".gpx.gz")) {
-                        iStream = new GZIPInputStream(new FileInputStream(sel));
-                    } else {
-                        iStream = new FileInputStream(sel);
-                    }
+                try (InputStream iStream = createInputStream(sel)) {
                     GpxReader reader = new GpxReader(iStream);
                     reader.parse(false);
@@ -211 +206 @@
             } finally {
                 outerPanel.setCursor(Cursor.getDefaultCursor());
+            }
+        }
+
+        private InputStream createInputStream(File sel) throws IOException, FileNotFoundException {
+            if (sel.getName().toLowerCase().endsWith(".gpx.gz")) {
+                return new GZIPInputStream(new FileInputStream(sel));
+            } else {
+                return new FileInputStream(sel);
             }
         }