summaryrefslogtreecommitdiff
path: root/qadevOOo/runner/helper/FileTools.java
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:20:53 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:20:53 +0200
commitb29a838b1cd9014c0951312f53ca6c0ebb9e1219 (patch)
treef951731fcd4f0c17dd7a55b154be238cb2b71bae /qadevOOo/runner/helper/FileTools.java
parentb9bff9906e94ef3b1c8d6da779269122d39d8354 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 868b90218854a32bdd0bbcc85aad838f198e40bb (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:21 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 7525320ca65ca0cf2ed5ec481d9f26638aed1b5c Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:38 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: testing_libreoffice-3.3.0.4
Diffstat (limited to 'qadevOOo/runner/helper/FileTools.java')
-rw-r--r--qadevOOo/runner/helper/FileTools.java42
1 files changed, 21 insertions, 21 deletions
diff --git a/qadevOOo/runner/helper/FileTools.java b/qadevOOo/runner/helper/FileTools.java
index 0a6b4dd96577..f76231c06d49 100644
--- a/qadevOOo/runner/helper/FileTools.java
+++ b/qadevOOo/runner/helper/FileTools.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -37,16 +37,16 @@ import java.io.OutputStream;
* This class deliver some functionality to copy files.
*/
public class FileTools {
-
+
/**
* Copies all files under srcDir to dstDir.
* If dstDir does not exist, it will be created.
* @param srcDir the source directory
* @param dstDir the destination direcotry
* @throws java.io.IOException throws java.io.IOException if something failes
- */
+ */
public static void copyDirectory(File srcDir, File dstDir)
- throws java.io.IOException {
+ throws java.io.IOException {
copyDirectory(srcDir, dstDir, new String[]{});
}
/**
@@ -57,7 +57,7 @@ public class FileTools {
* @param dstDir the destination direcotry
* @param ignore a list of files which should not be copied
* @throws java.io.IOException throws java.io.IOException if something failes
- */
+ */
public static void copyDirectory(File srcDir, File dstDir, String[] ignore)
throws java.io.IOException {
@@ -66,12 +66,12 @@ public class FileTools {
return;
}
}
-
+
if (srcDir.isDirectory()) {
if (!dstDir.exists()) {
dstDir.mkdir();
}
-
+
String[] files = srcDir.list();
for (int i=0; i< files.length; i++) {
copyDirectory(new File(srcDir, files[i]), new File(dstDir, files[i]), ignore);
@@ -81,17 +81,17 @@ public class FileTools {
copyFile(srcDir, dstDir);
}
}
-
+
/**
* Copies src file to dst file. If the dst file does not exist, it is created
* @param src the source file
* @param dst the destination file
* @throws java.io.IOException throws java.io.IOException if something failes
- */
+ */
public static void copyFile(File src, File dst) throws java.io.IOException {
InputStream in = new FileInputStream(src);
OutputStream out = new FileOutputStream(dst);
-
+
// Transfer bytes from in to out
byte[] buf = new byte[1024];
int len;
@@ -100,37 +100,37 @@ public class FileTools {
}
in.close();
out.close();
- }
+ }
/**
* Deletes all files and subdirectories under dir and the directory itself.
* Returns true if all deletions were successful.
- * If the deletion fails, the method the method continues to delete rest
+ * If the deletion fails, the method the method continues to delete rest
* of the files and returns false.
* @return Returns true if all deletions were successful, else false.
* @param dir the directory to delete
- */
+ */
public static boolean deleteDir(File dir) {
-
+
// if (! cleanDir(dir)) return false;
-
+
// The directory is now empty so delete it
// return dir.delete();
return cleanDir(dir);
}
-
+
/**
* Deletes all files and subdirectories under dir.
* Returns true if all deletions were successful.
* If a deletion fails, the method continues to delete rest of the files.
* @return Returns true if all deletions were successful, else false.
* @param dir the directory to clean from content
- */
+ */
// public static boolean cleanDir(File dir){
- //
+ //
// boolean success = true;
// if (dir.isDirectory()){
// File [] theFiles = dir.listFiles();
- //
+ //
// if (theFiles.length != 0 )
// for (int i = 0; i < theFiles.length; i++){
// success &= theFiles[i].delete();
@@ -147,13 +147,13 @@ public class FileTools {
for (int i=0; i<children.length; i++)
{
boolean success = cleanDir(new File(dir, children[i]));
- if (!success)
+ if (!success)
{
return false;
}
}
}
-
+
// The directory is now empty so delete it
return dir.delete();
}