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/24 19:32:35 UTC

svn commit: r499516 - in /incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools: components/InlineXmlCasConsumer.java components/XCasWriterCasConsumer.java components/XmiWriterCasConsumer.java viewer/CasAnnotationViewer.java

Author: schor
Date: Wed Jan 24 10:32:34 2007
New Revision: 499516

URL: http://svn.apache.org/viewvc?view=rev&rev=499516
Log:
No Jira - clean up tools use of 
(AnnotationIndex) jcas.getJFSIndexRepository().getAnnotationIndex(...)
to                jcas.getAnnotationIndex(...)

Modified:
    incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java
    incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java
    incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java
    incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java

Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java?view=diff&rev=499516&r1=499515&r2=499516
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/InlineXmlCasConsumer.java Wed Jan 24 10:32:34 2007
@@ -127,8 +127,7 @@
       try {
         jcas = aCAS.getView(CAS.NAME_DEFAULT_SOFA).getJCas();
         hasDefaultView = true;
-        FSIterator it = jcas.getJFSIndexRepository().getAnnotationIndex(
-                SourceDocumentInformation.type).iterator();
+        FSIterator it = jcas.getAnnotationIndex(SourceDocumentInformation.type).iterator();
         if (it.hasNext()) {
           // get the output file name from the annotation in the CAS ...
           // ... note this is a little flakey if processing an XCAS file,

Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java?view=diff&rev=499516&r1=499515&r2=499516
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XCasWriterCasConsumer.java Wed Jan 24 10:32:34 2007
@@ -98,8 +98,7 @@
     }
 
     // retreive the filename of the input file from the CAS
-    FSIterator it = jcas.getJFSIndexRepository().getAnnotationIndex(SourceDocumentInformation.type)
-            .iterator();
+    FSIterator it = jcas.getAnnotationIndex(SourceDocumentInformation.type).iterator();
     File outFile = null;
     if (it.hasNext()) {
       SourceDocumentInformation fileLoc = (SourceDocumentInformation) it.next();

Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java?view=diff&rev=499516&r1=499515&r2=499516
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/components/XmiWriterCasConsumer.java Wed Jan 24 10:32:34 2007
@@ -92,8 +92,7 @@
     }
 
     // retreive the filename of the input file from the CAS
-    FSIterator it = jcas.getJFSIndexRepository().getAnnotationIndex(SourceDocumentInformation.type)
-            .iterator();
+    FSIterator it = jcas.getAnnotationIndex(SourceDocumentInformation.type).iterator();
     File outFile = null;
     if (it.hasNext()) {
       SourceDocumentInformation fileLoc = (SourceDocumentInformation) it.next();

Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java?view=diff&rev=499516&r1=499515&r2=499516
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/viewer/CasAnnotationViewer.java Wed Jan 24 10:32:34 2007
@@ -983,7 +983,7 @@
     } catch (CASException e) {
       throw new RuntimeException(e);
     }
-    FSIterator iter = jcas.getJFSIndexRepository().getAnnotationIndex().iterator();
+    FSIterator iter = jcas.getAnnotationIndex().iterator();
     while (iter.isValid()) {
       Annotation annot = (Annotation) iter.get();
       iter.moveToNext();