Changeset 9280 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-01-03T16:30:55+01:00 (8 years ago)

Author:

Don-vip

Message:

improve performance and simplify file copy operations (major performance gain when downloading geotools plugin)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/MapPaintDialog.java (modified) (2 diffs)
• io/DownloadFileTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -16 +16 @@
 import java.awt.event.MouseEvent;
 import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -510 +509 @@
                 try {
                     InputStream in = s.getSourceInputStream();
-                    try (
-                        InputStream bis = new BufferedInputStream(in);
-                        OutputStream bos = new BufferedOutputStream(new FileOutputStream(file))
-                    ) {
-                        byte[] buffer = new byte[4096];
-                        int length;
-                        while ((length = bis.read(buffer)) > -1 && !canceled) {
-                            bos.write(buffer, 0, length);
-                        }
+                    try (InputStream bis = new BufferedInputStream(in)) {
+                        Files.copy(bis, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
                     } finally {
                         s.closeSourceInputStream(in);
                     }
                 } catch (IOException e) {
+                    Main.warn(e);
                     error = true;
                 }

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

@@ -5 +5 @@
 
 import java.awt.Component;
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -14 +13 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
@@ -182 +183 @@
                 if (ze.isDirectory()) {
                     newFile.mkdirs();
-                } else try (
-                    InputStream is = zf.getInputStream(ze);
-                    OutputStream os = new BufferedOutputStream(new FileOutputStream(newFile))
-                ) {
-                    byte[] buffer = new byte[8192];
-                    int read;
-                    while ((read = is.read(buffer)) != -1) {
-                        os.write(buffer, 0, read);
-                    }
+                } else try (InputStream is = zf.getInputStream(ze)) {
+                    Files.copy(is, newFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
                 }
             }