You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2007/01/12 20:51:51 UTC
svn commit: r495709 - in
/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools:
XCasAnnotationViewerMain.java components/FileSystemCollectionReader.java
docanalyzer/DocumentAnalyzer.java
Author: alally
Date: Fri Jan 12 11:51:50 2007
New Revision: 495709
URL: http://svn.apache.org/viewvc?view=rev&rev=495709
Log:
Cleaning up after TCAS removal.
UIMA-115: http://issues.apache.org/jira/browse/UIMA-115
Modified:
incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/XCasAnnotationViewerMain.java
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
Modified: incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/XCasAnnotationViewerMain.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/XCasAnnotationViewerMain.java?view=diff&rev=495709&r1=495708&r2=495709
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/XCasAnnotationViewerMain.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/XCasAnnotationViewerMain.java Fri Jan 12 11:51:50 2007
@@ -263,16 +263,16 @@
// parse descriptor. Could be either AE or TypeSystem descriptor
Object descriptor = UIMAFramework.getXMLParser().parse(new XMLInputSource(descriptorFile));
// instantiate CAS to get type system. Also build style map file if there is none.
- CAS tcas;
+ CAS cas;
File styleMapFile;
if (descriptor instanceof AnalysisEngineDescription) {
- tcas = CasCreationUtils.createTCas((AnalysisEngineDescription) descriptor);
+ cas = CasCreationUtils.createCas((AnalysisEngineDescription) descriptor);
styleMapFile = getStyleMapFile((AnalysisEngineDescription) descriptor, descriptorFile
.getPath());
} else if (descriptor instanceof TypeSystemDescription) {
TypeSystemDescription tsDesc = (TypeSystemDescription) descriptor;
tsDesc.resolveImports();
- tcas = CasCreationUtils.createTCas(tsDesc, null, new FsIndexDescription[0]);
+ cas = CasCreationUtils.createCas(tsDesc, null, new FsIndexDescription[0]);
styleMapFile = getStyleMapFile((TypeSystemDescription) descriptor, descriptorFile.getPath());
} else {
displayError("Invalid Descriptor File \"" + descriptorFile.getPath() + "\""
@@ -287,8 +287,8 @@
// output dir is the directory containing XCAS files.
prefsMed.setOutputDir(inputDir.toString());
XCasAnnotationViewerDialog viewerDialog = new XCasAnnotationViewerDialog(this,
- "Analyzed Documents", prefsMed, styleMapFile, null, tcas.getTypeSystem(), null, false,
- tcas);
+ "Analyzed Documents", prefsMed, styleMapFile, null, cas.getTypeSystem(), null, false,
+ cas);
viewerDialog.pack();
viewerDialog.setModal(true);
viewerDialog.setVisible(true);
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=495709&r1=495708&r2=495709
==============================================================================
--- 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 12 11:51:50 2007
@@ -154,7 +154,7 @@
} else {
text = new String(contents);
}
- // put document in CAS (assume CAS)
+ // put document text in JCas
jcas.setDocumentText(text);
}
} finally {
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=495709&r1=495708&r2=495709
==============================================================================
--- 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 12 11:51:50 2007
@@ -208,7 +208,7 @@
private File aeSpecifierFile;
- protected CAS tcas; // JMP
+ protected CAS cas; // JMP
private Timer progressTimer;
@@ -754,11 +754,11 @@
public void showAnalysisResults(AnalysisEnginePerformanceReports aReports, File aOutputDir) {
statsString = ("PERFORMANCE STATS\n-------------\n\n" + aReports);
try {
- tcas = createTCasFromDescriptor(prefsMed.getTAEfile());
+ cas = createCasFromDescriptor(prefsMed.getTAEfile());
} catch (Exception e) {
displayError(e);
}
- currentTypeSystem = tcas.getTypeSystem();
+ currentTypeSystem = cas.getTypeSystem();
show_analysis(aOutputDir);
}
@@ -766,15 +766,15 @@
public void showAnalysisResults(File aOutputDir) {
try {
- tcas = createTCasFromDescriptor(prefsMed.getTAEfile());
- currentTypeSystem = tcas.getTypeSystem();
+ cas = createCasFromDescriptor(prefsMed.getTAEfile());
+ currentTypeSystem = cas.getTypeSystem();
} catch (Exception e) {
displayError(e);
}
statsString = null;
// what is this code doing??? - APL
- StyleMapEditor sedit = new StyleMapEditor(this, tcas);
+ StyleMapEditor sedit = new StyleMapEditor(this, cas);
String sXml = readStylemapFile(prefsMed.getStylemapFile());
ArrayList sme = sedit.parseStyleList(sXml);
currentTaeOutputTypes = new String[sme.size()];
@@ -793,15 +793,15 @@
* @throws InvalidXMLException
* @throws IOException
*/
- protected CAS createTCasFromDescriptor(String aDescriptorFile) // JMP
+ protected CAS createCasFromDescriptor(String aDescriptorFile) // JMP
throws ResourceInitializationException, InvalidXMLException, IOException {
ResourceSpecifier spec = UIMAFramework.getXMLParser().parseResourceSpecifier(
new XMLInputSource(aDescriptorFile));
if (spec instanceof AnalysisEngineDescription) {
- return CasCreationUtils.createTCas((AnalysisEngineDescription) spec);
+ return CasCreationUtils.createCas((AnalysisEngineDescription) spec);
} else {
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(spec);
- return CasCreationUtils.createTCas(ae.getAnalysisEngineMetaData());
+ return CasCreationUtils.createCas(ae.getAnalysisEngineMetaData());
}
}
@@ -846,13 +846,13 @@
// calls setVisible(true) to make the dialog visible
new XCasAnnotationViewerDialog(this, "Analysis Results", prefsMed, styleMapFile, statsString,
currentTypeSystem, currentTaeOutputTypes, interactiveTempFN + ".xmi",
- javaViewerRBisSelected, javaViewerUCRBisSelected, xmlRB.isSelected(), tcas);
+ javaViewerRBisSelected, javaViewerUCRBisSelected, xmlRB.isSelected(), cas);
} else {
// this version of the XCasAnnotationViewerDialog constructor does
// not automatically launch the viewer.
XCasAnnotationViewerDialog viewerDialog = new XCasAnnotationViewerDialog(this,
"Analysis Results", prefsMed, styleMapFile, statsString, currentTypeSystem,
- currentTaeOutputTypes, useGeneratedStyleMap, tcas);
+ currentTaeOutputTypes, useGeneratedStyleMap, cas);
if (usingXmlDetagger) {
viewerDialog.setDefaultCasViewName("plainTextDocument");
}