svn commit: r498021 - /incubator/uima/uimaj/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciTAEClient.java

[sc...@apache.org]

Author: schor
Date: Fri Jan 19 16:53:04 2007
New Revision: 498021

URL: http://svn.apache.org/viewvc?view=rev&rev=498021
Log:
UIMA-210  Changed xxx.read(buffer) in many places to insure
all bytes/chars are read.  Sometimes the read was wrapped in
a while loop.  Othertimes, I substituted BufferedXXX for the
non buffered readers/input-streams.  The .read(buf) for the
buffered versions has the "while loop" built in, according to
the javadocs.  For BufferedReader, I used the form
.read(buf, 0, length) as that was the only form that the 
javadoc said it did this for.

Modified:
    incubator/uima/uimaj/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciTAEClient.java

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciTAEClient.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciTAEClient.java?view=diff&rev=498021&r1=498020&r2=498021
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciTAEClient.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-vinci/src/main/java/org/apache/uima/adapter/vinci/util/VinciTAEClient.java Fri Jan 19 16:53:04 2007
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 
+import org.apache.uima.internal.util.FileUtils;
 import org.apache.vinci.transport.VinciClient;
 import org.apache.vinci.transport.VinciFrame;
 
@@ -41,21 +42,12 @@
 
         System.out.println("Analyzing Document...");
         File aFile = new File(args[1]);
-        byte[] contents = new byte[(int) aFile.length()];
-        FileInputStream fis = null;
-        try {
-          fis = new FileInputStream(aFile);
-          fis.read(contents);
-        } finally {
-          if (fis != null) {
-            fis.close();
-          }
-        }
+        String fileData = FileUtils.file2String(aFile);
 
         VinciFrame data = new VinciFrame();
         VinciFrame key = new VinciFrame();
 
-        key.fadd(Constants.VINCI_DETAG, new String(contents));
+        key.fadd(Constants.VINCI_DETAG, fileData);
         data.fadd("KEYS", key);
 
         query.fadd(Constants.VINCI_COMMAND, Constants.ANNOTATE);