Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.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/gui/io/DownloadFileTask.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

@@ -83 +83 @@
      */
     public void download() throws DownloadException {
-        OutputStream out = null;
-        InputStream in = null;
         try {
             if (mkdir) {
@@ -105 +103 @@
             progressMonitor.subTask(tr("Downloading File {0}: {1} bytes...", file.getName(),size));
 
-            in = downloadConnection.getInputStream();
-            out = new FileOutputStream(file);
-            byte[] buffer = new byte[32768];
-            int count=0;
-            int p1=0, p2=0;
-            for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
-                out.write(buffer, 0, read);
-                count+=read;
-                if (canceled) break;
-                p2 = 100 * count / size;
-                if (p2!=p1) {
-                    progressMonitor.setTicks(p2);
-                    p1=p2;
+            try (
+                InputStream in = downloadConnection.getInputStream();
+                OutputStream out = new FileOutputStream(file)
+            ) {
+                byte[] buffer = new byte[32768];
+                int count=0;
+                int p1=0, p2=0;
+                for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
+                    out.write(buffer, 0, read);
+                    count+=read;
+                    if (canceled) break;
+                    p2 = 100 * count / size;
+                    if (p2!=p1) {
+                        progressMonitor.setTicks(p2);
+                        p1=p2;
+                    }
                 }
             }
-            Utils.close(out);
             if (!canceled) {
                 Main.info(tr("Download finished"));
@@ -139 +139 @@
         } finally {
             closeConnectionIfNeeded();
-            Utils.close(out);
         }
     }
@@ -170 +169 @@
      */
     public static void unzipFileRecursively(File file, String dir) throws IOException {
-        OutputStream os = null;
-        InputStream is = null;
-        ZipFile zf = null;
-        try {
-            zf = new ZipFile(file);
-            Enumeration<?> es = zf.entries();
-            ZipEntry ze;
+        try (ZipFile zf = new ZipFile(file)) {
+            Enumeration<? extends ZipEntry> es = zf.entries();
             while (es.hasMoreElements()) {
-                ze = (ZipEntry) es.nextElement();
+                ZipEntry ze = es.nextElement();
                 File newFile = new File(dir, ze.getName());
                 if (ze.isDirectory()) {
                     newFile.mkdirs();
-                } else {
-                    is = zf.getInputStream(ze);
-                    os = new BufferedOutputStream(new FileOutputStream(newFile));
+                } else try (
+                    InputStream is = zf.getInputStream(ze);
+                    OutputStream os = new BufferedOutputStream(new FileOutputStream(newFile))
+                ) {
                     byte[] buffer = new byte[8192];
                     int read;
@@ -190 +185 @@
                         os.write(buffer, 0, read);
                     }
-                    Utils.close(os);
-                    Utils.close(is);
                 }
             }
-        } finally {
-            Utils.close(zf);
         }
     }
 }
-