small compatibility fix

[mir.git] / source / mir / util / FileFunctions.java

diff --git a/source/mir/util/FileFunctions.java b/source/mir/util/FileFunctions.java
index 77cdc1b..bbbaa68 100755 (executable)
--- a/source/mir/util/FileFunctions.java
+++ b/source/mir/util/FileFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,26 +18,29 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mir.util;
 
+import gnu.regexp.RE;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.FilenameFilter;
-
-import gnu.regexp.RE;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Vector;
 
 public class FileFunctions {
   protected static final int FILE_COPY_BUFFER_SIZE = 65536;
@@ -46,18 +49,20 @@ public class FileFunctions {
   }
 
   public static void copyFile(File aSourceFile, File aDestinationFile) throws IOException {
-    FileInputStream inputStream;
-    FileOutputStream outputStream;
+    BufferedInputStream inputStream;
+    BufferedOutputStream outputStream;
     int nrBytesRead;
     byte[] buffer = new byte[FILE_COPY_BUFFER_SIZE];
 
-    inputStream = new FileInputStream(aSourceFile);
+    inputStream = new BufferedInputStream(
+      new FileInputStream(aSourceFile));
     try {
       File directory = new File(aDestinationFile.getParent());
         if (directory!=null && !directory.exists()){
           directory.mkdirs();
       }
-      outputStream = new FileOutputStream(aDestinationFile);
+      outputStream = new BufferedOutputStream(
+        new FileOutputStream(aDestinationFile),8192);
       try {
         do {
           nrBytesRead = inputStream.read(buffer);
@@ -137,4 +142,13 @@ public class FileFunctions {
 
   }
 
+  public static List getDirectoryContentsAsList(File aDirectory, FilenameFilter aFilter) {
+    Object[] contents = aDirectory.list(aFilter);
+    if (contents==null)
+      return new Vector();
+    else
+      return Arrays.asList(contents);
+  }
+
+
 }
\ No newline at end of file