fixing html whitelist bug

[mir.git] / source / mir / misc / FileUtil.java

diff --git a/source/mir/misc/FileUtil.java b/source/mir/misc/FileUtil.java
index c979198..9226914 100755 (executable)
--- a/source/mir/misc/FileUtil.java
+++ b/source/mir/misc/FileUtil.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,19 +18,20 @@
  * 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.misc;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -38,32 +39,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
-
-import mir.config.MirPropertiesConfiguration;
-import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
-
 /**
  * Hilfsklasse zum Mergen von Template und Daten
  */
 public final class FileUtil {
-
-  private static String producerStorageRoot;
-
-  //
-  // Initialisierung
-
-  static {
-    try {
-      producerStorageRoot =
-          MirPropertiesConfiguration.instance().getString("Producer.StorageRoot");
-    }
-    catch (PropertiesConfigExc e) {
-      e.printStackTrace();
-    }
-  }
-
   /**
-   * Privater Konstruktor, um versehentliche Instantiierung zu verhindern
+   * Privater Construktor to avoid accidental instantiation
    */
   private FileUtil() {
   }
@@ -90,8 +71,9 @@ public final class FileUtil {
 
     if (in != null) {
       try {
-        FileOutputStream out = new FileOutputStream(f);
+        BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(f),8192);
 
+        // TODO get size with in.available()
         int read;
         byte[] buf = new byte[8 * 1024];
         while ( (read = in.read(buf)) != -1) {
@@ -133,7 +115,7 @@ public final class FileUtil {
       try {
         File f = getFile(filename);
         FileOutputStream fOut = new FileOutputStream(f);
-        OutputStreamWriter out = new OutputStreamWriter(fOut, encoding);
+        BufferedWriter out = new BufferedWriter(new OutputStreamWriter(fOut, encoding),8192);
         int read;
         char[] cbuf = new char[8 * 1024];
         while ( (read = in.read(cbuf)) != -1) {
@@ -160,8 +142,8 @@ public final class FileUtil {
       try {
         if (out.length != f.length())
           return false;
-        FileInputStream inStream;
-        inStream = new FileInputStream(f);
+        BufferedInputStream inStream;
+        inStream = new BufferedInputStream(new FileInputStream(f),8192);
         inStream.read(out);
         inStream.close();
       }
@@ -178,14 +160,7 @@ public final class FileUtil {
   public static long getSize(String filename) {
     File f = null;
     f = new File(filename);
-    long l = 0;
-
-    if (f.exists()) {
-      return f.length();
-    }
-    else {
-      return -1;
-    }
+    return f.exists() ? f.length():-1;
   }
 
 }