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/01/20 01:53:14 UTC
svn commit: r498024 - in
/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools:
components/FileSystemCollectionReader.java docanalyzer/DocumentAnalyzer.java
docanalyzer/XCasAnnotationViewerDialog.java viewer/CasTreeViewer.java
Author: schor
Date: Fri Jan 19 16:53:13 2007
New Revision: 498024
URL: http://svn.apache.org/viewvc?view=rev&rev=498024
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-tools/src/main/java/org/apache/uima/tools/components/FileSystemCollectionReader.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/XCasAnnotationViewerDialog.java
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/FileSystemCollectionReader.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/FileSystemCollectionReader.java?view=diff&rev=498024&r1=498023&r2=498024
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/FileSystemCollectionReader.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/FileSystemCollectionReader.java Fri Jan 19 16:53:13 2007
@@ -19,6 +19,7 @@
package org.apache.uima.tools.components;
+import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -138,7 +139,7 @@
// open input stream to file
File file = (File) mFiles.get(mCurrentIndex++);
- FileInputStream fis = new FileInputStream(file);
+ BufferedInputStream fis = new BufferedInputStream(new FileInputStream(file));
if (!mXCAS) {
try {
// if there's a CAS Initializer, call it
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java?view=diff&rev=498024&r1=498023&r2=498024
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/DocumentAnalyzer.java Fri Jan 19 16:53:13 2007
@@ -81,6 +81,7 @@
import org.apache.uima.collection.CollectionReaderDescription;
import org.apache.uima.collection.EntityProcessStatus;
import org.apache.uima.collection.StatusCallbackListener;
+import org.apache.uima.internal.util.FileUtils;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.resource.metadata.Capability;
@@ -811,18 +812,7 @@
if (smapFile.exists()) {
try {
- FileReader reader = new FileReader(smapFile);
- StringBuffer buf = new StringBuffer();
- char[] chars = new char[2048];
- int charsRead = reader.read(chars);
-
- while (charsRead > 0) {
- buf.append(chars, 0, charsRead);
- charsRead = reader.read(chars);
- }
-
- styleMapXml = buf.toString();
- reader.close();
+ return FileUtils.file2String(smapFile);
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/XCasAnnotationViewerDialog.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/XCasAnnotationViewerDialog.java?view=diff&rev=498024&r1=498023&r2=498024
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/XCasAnnotationViewerDialog.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/XCasAnnotationViewerDialog.java Fri Jan 19 16:53:13 2007
@@ -72,6 +72,7 @@
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.TypeSystem;
import org.apache.uima.internal.util.BrowserUtil;
+import org.apache.uima.internal.util.FileUtils;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.tools.images.Images;
import org.apache.uima.tools.stylemap.ColorParser;
@@ -146,18 +147,7 @@
AnalysisEngineDescription selectedAE = null;
try {
if (styleMapFile.exists()) {
- FileReader reader = new FileReader(styleMapFile);
- StringBuffer buf = new StringBuffer();
- char[] chars = new char[2048];
- int charsRead = reader.read(chars);
-
- while (charsRead > 0) {
- buf.append(chars, 0, charsRead);
- charsRead = reader.read(chars);
- }
-
- styleMapXml = buf.toString();
- reader.close();
+ styleMapXml = FileUtils.file2String(styleMapFile);
}
// have user select AE if they haven't done so already
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java?view=diff&rev=498024&r1=498023&r2=498024
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasTreeViewer.java Fri Jan 19 16:53:13 2007
@@ -58,6 +58,7 @@
import org.apache.uima.cas.IntArrayFS;
import org.apache.uima.cas.StringArrayFS;
import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.internal.util.FileUtils;
import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.tools.images.Images;
import org.apache.uima.util.XMLInputSource;
@@ -315,17 +316,9 @@
CAS CAS = ae.newCAS();
// read document from file
- byte[] contents = new byte[(int) inputFile.length()];
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(inputFile);
- fis.read(contents);
- } finally {
- if (fis != null) {
- fis.close();
- }
- }
- String document = new String(contents);
+
+ String document = FileUtils.file2String(inputFile);
+
CAS.setDocumentText(getText(document).trim());
// analyze