Changeset 7835 in josm for trunk/src/org/openstreetmap/josm/tools/Utils.java

Timestamp:

2014-12-19T16:15:43+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10026 - migrate preferences and plugins from old ~/.josm directory to new directories on OSX, then delete old directory

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -324 +324 @@
 
     /**
-     * Simple file copy function that will overwrite the target file.<br>
+     * Simple file copy function that will overwrite the target file.
      * @param in The source file
      * @param out The destination file
@@ -332 +332 @@
      * @since 7003
      */
-    public static Path copyFile(File in, File out) throws IOException, IllegalArgumentException  {
+    public static Path copyFile(File in, File out) throws IOException {
         CheckParameterUtil.ensureParameterNotNull(in, "in");
         CheckParameterUtil.ensureParameterNotNull(out, "out");
         return Files.copy(in.toPath(), out.toPath(), StandardCopyOption.REPLACE_EXISTING);
+    }
+
+    /**
+     * Recursive directory copy function
+     * @param in The source directory
+     * @param out The destination directory
+     * @throws IOException If any I/O error ooccurs
+     * @throws IllegalArgumentException If {@code in} or {@code out} is {@code null}
+     * @since 7835
+     */
+    public static void copyDirectory(File in, File out) throws IOException {
+        CheckParameterUtil.ensureParameterNotNull(in, "in");
+        CheckParameterUtil.ensureParameterNotNull(out, "out");
+        if (!out.exists() && !out.mkdirs()) {
+            Main.warn("Unable to create directory "+out.getPath());
+        }
+        for (File f : in.listFiles()) {
+            File target = new File(out, f.getName());
+            if (f.isDirectory()) {
+                copyDirectory(f, target);
+            } else {
+                copyFile(f, target);
+            }
+        }
     }
 
@@ -349 +373 @@
     }
 
+    /**
+     * Deletes a directory recursively.
+     * @param path The directory to delete
+     * @return  <code>true</code> if and only if the file or directory is
+     *          successfully deleted; <code>false</code> otherwise
+     */
     public static boolean deleteDirectory(File path) {
         if( path.exists() ) {
@@ -355 +385 @@
                 if (file.isDirectory()) {
                     deleteDirectory(file);
-                } else {
-                    file.delete();
+                } else if (!file.delete()) {
+                    Main.warn("Unable to delete file: "+file.getPath());
                 }
             }
         }
-        return( path.delete() );
+        return path.delete();
     }