You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2007/02/11 06:46:28 UTC
svn commit: r505845 - in /incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples: ExampleApplication.java PrintAnnotations.java casMultiplier/CasMultiplierExampleApplication.java

Author: schor
Date: Sat Feb 10 21:46:27 2007
New Revision: 505845

URL: http://svn.apache.org/viewvc?view=rev&rev=505845
Log:
UIMA-210 fixed by removing code that read a file -> string,
replaced with call to FileUtils.file2string.  One issue:
this method is in ...uima.internal.util package.

Modified:
    incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java
    incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java
    incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java

Modified: incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java?view=diff&rev=505845&r1=505844&r2=505845
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java Sat Feb 10 21:46:27 2007
@@ -28,6 +28,7 @@
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.cas.CAS;
+import org.apache.uima.internal.util.FileUtils;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.util.XMLInputSource;
 
@@ -120,11 +121,7 @@
     BufferedInputStream fis = null;
 
     try {
-      // read file
-      fis = new BufferedInputStream(new FileInputStream(aFile));
-      byte[] contents = new byte[(int) aFile.length()];
-      fis.read(contents);
-      String document = new String(contents, "UTF-8");
+      String document = FileUtils.file2String(aFile);
       document = document.trim();
 
       // put document text in CAS

Modified: incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java?view=diff&rev=505845&r1=505844&r2=505845
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java Sat Feb 10 21:46:27 2007
@@ -38,6 +38,7 @@
 import org.apache.uima.cas.StringArrayFS;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.internal.util.FileUtils;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.util.XMLInputSource;
 
@@ -261,11 +262,7 @@
       }
 
       // read contents of file
-      BufferedInputStream fis = new BufferedInputStream(new FileInputStream(inputFile));
-      byte[] contents = new byte[(int) inputFile.length()];
-      fis.read(contents);
-      fis.close();
-      String document = new String(contents);
+      String document = FileUtils.file2String(inputFile);
 
       // send doc through the AE
       cas.setDocumentText(document);

Modified: incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java?view=diff&rev=505845&r1=505844&r2=505845
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java Sat Feb 10 21:46:27 2007
@@ -29,6 +29,7 @@
 import org.apache.uima.analysis_engine.CasIterator;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.examples.PrintAnnotations;
+import org.apache.uima.internal.util.FileUtils;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.util.XMLInputSource;
 
@@ -67,10 +68,7 @@
 
       // read input text file
       File textFile = new File(args[1]);
-      BufferedInputStream fis = new BufferedInputStream(new FileInputStream(textFile));
-      byte[] contents = new byte[(int) textFile.length()];
-      fis.read(contents);
-      String document = new String(contents, "UTF-8");
+      String document = FileUtils.file2String(textFile, "UTF-8");
 
       // create a new CAS and set the document text
       CAS initialCas = ae.newCAS();