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

Timestamp:

2016-01-03T16:30:55+01:00 (9 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/plugins

Files:

• Plugin.java (modified) (2 diffs)
• PluginDownloadTask.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -119 +120 @@
             pluginDir.mkdirs();
         }
-        try (
-            FileOutputStream out = new FileOutputStream(new File(pluginDirName, to));
-            InputStream in = getClass().getResourceAsStream(from)
-        ) {
+        try (InputStream in = getClass().getResourceAsStream(from)) {
             if (in == null) {
                 throw new IOException("Resource not found: "+from);
             }
-            byte[] buffer = new byte[8192];
-            for (int len = in.read(buffer); len > 0; len = in.read(buffer)) {
-                out.write(buffer, 0, len);
-            }
+            Files.copy(in, new File(pluginDirName, to).toPath(), StandardCopyOption.REPLACE_EXISTING);
         }
     }

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

@@ -6 +6 @@
 import java.awt.Component;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -127 +127 @@
                         .connect();
             }
-            try (
-                InputStream in = downloadConnection.getContent();
-                OutputStream out = new FileOutputStream(file)
-            ) {
-                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 = downloadConnection.getContent()) {
+                Files.copy(in, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
             }
         } catch (MalformedURLException e) {