Changeset 5874 in josm for trunk/src/org/openstreetmap/josm/plugins/Plugin.java

Timestamp:

2013-04-16T19:57:43+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8570, #7406 - I/O refactorization:

• Move different file copy functions to Utils.copyFile (to be replaced later by Files.copy when switching to Java 7)
• Replace all Utils.close(XXX) by Utils.close(Closeable) -> impacted plugins: commandline, mirrored_download, opendata, piclayer
• Add new Utils.close(ZipFile)
• Use of Utils.close almost everywhere
• Javadoc fixes

File:

• trunk/src/org/openstreetmap/josm/plugins/Plugin.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.download.DownloadSelection;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -110 +111 @@
             pluginDir.mkdirs();
         }
-        FileOutputStream out = new FileOutputStream(new File(pluginDirName, to));
-        InputStream in = getClass().getResourceAsStream(from);
-        byte[] buffer = new byte[8192];
-        for(int len = in.read(buffer); len > 0; len = in.read(buffer)) {
-            out.write(buffer, 0, len);
+        FileOutputStream out = null;
+        InputStream in = null;
+        try {
+            out = new FileOutputStream(new File(pluginDirName, to));
+            in = getClass().getResourceAsStream(from);
+            byte[] buffer = new byte[8192];
+            for(int len = in.read(buffer); len > 0; len = in.read(buffer)) {
+                out.write(buffer, 0, len);
+            }
+        } finally {
+            Utils.close(in);
+            Utils.close(out);
         }
-        in.close();
-        out.close();
     }