Changeset 7033 in josm for trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.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/plugins/ReadRemotePluginInformationTask.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -203 +203 @@
 
     private void handleIOException(final ProgressMonitor monitor, IOException e, final String title, final String firstMessage, boolean displayMsg) {
-        InputStream errStream = connection.getErrorStream();
         StringBuilder sb = new StringBuilder();
-        if (errStream != null) {
-            BufferedReader err = null;
-            try {
-                String line;
-                err = new BufferedReader(new InputStreamReader(errStream, Utils.UTF_8));
-                while ((line = err.readLine()) != null) {
-                    sb.append(line).append("\n");
-                }
-            } catch (Exception ex) {
-                Main.error(e);
-                Main.error(ex);
-            } finally {
-                Utils.close(err);
-            }
+        try (InputStream errStream = connection.getErrorStream()) {
+            if (errStream != null) {
+                BufferedReader err = null;
+                try {
+                    String line;
+                    err = new BufferedReader(new InputStreamReader(errStream, Utils.UTF_8));
+                    while ((line = err.readLine()) != null) {
+                        sb.append(line).append("\n");
+                    }
+                } catch (Exception ex) {
+                    Main.error(e);
+                    Main.error(ex);
+                } finally {
+                    Utils.close(err);
+                }
+            }
+        } catch (IOException ex) {
+            Main.warn(ex);
         }
         final String msg = e.getMessage();
@@ -265 +268 @@
      */
     protected void downloadPluginIcons(String site, File destFile, ProgressMonitor monitor) {
-        InputStream in = null;
-        OutputStream out = null;
         try {
             site = site.replaceAll("%<(.*)>", "");
@@ -278 +279 @@
                 connection.setRequestProperty("Cache-Control", "no-cache");
             }
-            in = connection.getInputStream();
-            out = new FileOutputStream(destFile);
-            byte[] buffer = new byte[8192];
-            for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
-                out.write(buffer, 0, read);
+            try (
+                InputStream in = connection.getInputStream();
+                OutputStream out = new FileOutputStream(destFile)
+            ) {
+                byte[] buffer = new byte[8192];
+                for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
+                    out.write(buffer, 0, read);
+                }
             }
         } catch (MalformedURLException e) {
@@ -293 +297 @@
             return;
         } finally {
-            Utils.close(out);
             synchronized(this) {
                 if (connection != null) {
@@ -300 +303 @@
                 connection = null;
             }
-            Utils.close(in);
             monitor.finishTask();
         }
@@ -321 +323 @@
      */
     protected void cachePluginList(String site, String list) {
-        PrintWriter writer = null;
-        try {
-            File pluginDir = Main.pref.getPluginsDirectory();
-            if (!pluginDir.exists() && !pluginDir.mkdirs()) {
-                Main.warn(tr("Failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", pluginDir.toString(), site));
-            }
-            File cacheFile = createSiteCacheFile(pluginDir, site, CacheType.PLUGIN_LIST);
-            getProgressMonitor().subTask(tr("Writing plugin list to local cache ''{0}''", cacheFile.toString()));
-            writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(cacheFile), Utils.UTF_8));
+        File pluginDir = Main.pref.getPluginsDirectory();
+        if (!pluginDir.exists() && !pluginDir.mkdirs()) {
+            Main.warn(tr("Failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", pluginDir.toString(), site));
+        }
+        File cacheFile = createSiteCacheFile(pluginDir, site, CacheType.PLUGIN_LIST);
+        getProgressMonitor().subTask(tr("Writing plugin list to local cache ''{0}''", cacheFile.toString()));
+        try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(cacheFile), Utils.UTF_8))) {
             writer.write(list);
+            writer.flush();
         } catch(IOException e) {
             // just failed to write the cache file. No big deal, but log the exception anyway
             Main.error(e);
-        } finally {
-            if (writer != null) {
-                writer.flush();
-                Utils.close(writer);
-            }
         }
     }