[Thaw-dev] r12738 - trunk/apps/Thaw/src/thaw/fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-04-14 23:07:18 +0000 (Sat, 14 Apr 2007)
New Revision: 12738

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java
Log:
Thaw: improve FCPTestDDA.readFile a bit

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java        2007-04-14 23:05:49 UTC 
(rev 12737)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java        2007-04-14 23:07:18 UTC 
(rev 12738)
@@ -3,6 +3,7 @@
 import java.util.Observable;
 import java.util.Observer;

+import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileInputStream;
@@ -81,20 +82,14 @@


        protected String readFile(String filename) {
-               byte[] raw = new byte[128];
-
-               StringBuffer data = null;
-
+               String data = null;
                try {
-                       int read;
                        FileInputStream stream = new FileInputStream(filename);
-
-                       data = new StringBuffer("");
-
-                       while((read  = stream.read(raw)) >= 0) {
-                               data.append(new String(raw, 0, read));
-                       }
-
+                       DataInputStream dis = new DataInputStream(stream);
+                       
+                       data = dis.readUTF();
+                       
+                       dis.close();
                        stream.close();

                } catch(java.io.FileNotFoundException e) {
@@ -105,7 +100,7 @@
                        return null;
                }

-               return data.toString();
+               return data;
        }