Changeset 5874 in josm for trunk/src/org/openstreetmap/josm/io/MirroredInputStream.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/io/MirroredInputStream.java (modified) (3 diffs)

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

@@ -124 +124 @@
                 res = zipFile.getInputStream(resentry);
             } else {
-                zipFile.close();
+                Utils.close(zipFile);
             }
         } catch (Exception e) {
@@ -224 +224 @@
                 bos.write(buffer, 0, length);
             }
-            bos.close();
+            Utils.close(bos);
             bos = null;
             /* close fos as well to be sure! */
-            fos.close();
+            Utils.close(fos);
             fos = null;
             localFile = new File(destDir, localPath);
@@ -304 +304 @@
     @Override
     public void close() throws IOException
-    { fs.close(); }
+    { Utils.close(fs); }
     @Override
     public int read() throws IOException