You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2007/01/12 16:23:11 UTC
svn commit: r495602 - in
/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator:
editors/ editors/ui/ editors/ui/dialogs/ model/
Author: eae
Date: Fri Jan 12 07:23:10 2007
New Revision: 495602
URL: http://svn.apache.org/viewvc?view=rev&rev=495602
Log:
UIMA-115 Step 2: eliminate TCAS classes and methods
Modified:
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilitySection.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportResBindSection.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexImportSection.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexKeyDialog.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AllTypes.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/BuiltInTypes.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DefinedTypesWithSupers.java
incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorTCAS.java
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/MultiPageEditor.java Fri Jan 12 07:23:10 2007
@@ -48,8 +48,8 @@
import org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_impl;
import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
import org.apache.uima.analysis_engine.metadata.FlowControllerDeclaration;
+import org.apache.uima.cas.CAS;
import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.text.TCAS;
import org.apache.uima.collection.CasConsumerDescription;
import org.apache.uima.collection.CasInitializerDescription;
import org.apache.uima.collection.CollectionReaderDescription;
@@ -252,7 +252,7 @@
// values computed when first needed
// all use common markStale()
- public DescriptorTCAS descriptorTCAS;
+ public DescriptorTCAS descriptorCAS;
public AllTypes allTypes;
@@ -466,7 +466,7 @@
// Model initialization
fileDirty = false;
dirtyTypeNameHash = new HashSet();
- descriptorTCAS = new DescriptorTCAS(this);
+ descriptorCAS = new DescriptorTCAS(this);
allTypes = new AllTypes(this);
definedTypesWithSupers = new DefinedTypesWithSupers(this);
@@ -974,7 +974,7 @@
}
/**
- * Called when switching off of the indexes page Goal is to validate indexes by making a TCAS - as
+ * Called when switching off of the indexes page Goal is to validate indexes by making a CAS - as
* a side effect it does index validation.
*
* We do this without changing the typeSystemDescription
@@ -982,15 +982,15 @@
* @return
*/
private boolean validateIndexes() {
- TCAS localTCAS = descriptorTCAS.get();
+ CAS localCAS = descriptorCAS.get();
TypePriorities savedMergedTypePriorities = getMergedTypePriorities();
FsIndexCollection savedFsIndexCollection = getMergedFsIndexCollection();
try {
setMergedFsIndexCollection();
setMergedTypePriorities();
- descriptorTCAS.validate();
+ descriptorCAS.validate();
} catch (Exception ex) {
- descriptorTCAS.set(localTCAS);
+ descriptorCAS.set(localCAS);
if (!revertToLastValid(Messages.getString("MultiPageEditor.indexDefProblemTitle"), //$NON-NLS-1$
Messages.getString("MultiPageEditor.indexDefProblem") + //$NON-NLS-1$
getMessagesToRootCause(ex))) {
@@ -1094,7 +1094,7 @@
private void checkForNewlyDirtyTypes(TypeSystemDescription oldTsd) {
- // an array of TypeDescription objects (not TCAS), including imported ones
+ // an array of TypeDescription objects (not CAS), including imported ones
TypeDescription[] oldTypes = (null == oldTsd || null == oldTsd.getTypes()) ? new TypeDescription[0]
: oldTsd.getTypes();
HashMap oldTypeHash = new HashMap(oldTypes.length);
@@ -1278,7 +1278,7 @@
aeDescription.getAnalysisEngineMetaData().setTypeSystem(this.typeSystemDescription);
if (doValidation)
- descriptorTCAS.validate();
+ descriptorCAS.validate();
}
// **************************************************************
@@ -1426,7 +1426,7 @@
aeDescription.getAnalysisEngineMetaData().setTypePriorities(typePriorities);
setMergedTypePriorities();
setImportedTypePriorities();
- descriptorTCAS.validate();
+ descriptorCAS.validate();
}
private static class MultilevelCancel extends RuntimeException {
@@ -1503,7 +1503,7 @@
aeDescription.getAnalysisEngineMetaData().setFsIndexCollection(indexCollection);
setMergedFsIndexCollection();
setImportedFsIndexCollection();
- descriptorTCAS.validate();
+ descriptorCAS.validate();
}
private void showContextLoadFailureMessage(Exception e, String contextFile) {
@@ -1531,7 +1531,7 @@
} catch (InvalidXMLException e) {
throw new ResourceInitializationException(e);
}
- descriptorTCAS.validate();
+ descriptorCAS.validate();
}
public String getAbsolutePathFromImport(Import importItem) {
@@ -1617,13 +1617,13 @@
}
public void markTCasDirty() {
- descriptorTCAS.markDirty();
+ descriptorCAS.markDirty();
allTypes.markDirty();
definedTypesWithSupers.markDirty();
}
- public TCAS getTCAS() {
- return descriptorTCAS.get();
+ public CAS getCurrentView() {
+ return descriptorCAS.get();
}
public IProject getProject() {
@@ -1816,7 +1816,7 @@
private void markTypeModelDirty() {
allTypes.markDirty();
- descriptorTCAS.markDirty();
+ descriptorCAS.markDirty();
definedTypesWithSupers.markDirty();
}
@@ -1839,7 +1839,7 @@
public void run(IProgressMonitor progressMonitor) {
try {
jg.mainForCde(new MergerImpl(), new JCasGenProgressMonitor(progressMonitor),
- jCasGenThrower, inputFile, outputDirectory, types, (CASImpl) getTCAS());
+ jCasGenThrower, inputFile, outputDirectory, types, (CASImpl) getCurrentView());
} catch (IOException e) {
Utility.popMessage(Messages.getString("MultiPageEditor.25"), //$NON-NLS-1$
Messages.getString("MultiPageEditor.26") //$NON-NLS-1$
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilitySection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilitySection.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilitySection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/CapabilitySection.java Fri Jan 12 07:23:10 2007
@@ -587,8 +587,8 @@
TableTreeItem typeItem = editItem.getParentItem();
String typeName = getFullyQualifiedName(typeItem);
- // using the TCAS to get all the inherited features
- Type type = editor.getTCAS().getTypeSystem().getType(typeName);
+ // using the CAS to get all the inherited features
+ Type type = editor.getCurrentView().getTypeSystem().getType(typeName);
AddCapabilityFeatureDialog dialog = new AddCapabilityFeatureDialog(this, type, c);
if (dialog.open() == Window.CANCEL)
@@ -860,8 +860,8 @@
Capability c = getCapabilityFromTableTreeItem(selItem.getParentItem());
String typeName = getFullyQualifiedName(selItem);
- // using the TCAS to get all the inherited features
- Type type = editor.getTCAS().getTypeSystem().getType(typeName);
+ // using the CAS to get all the inherited features
+ Type type = editor.getCurrentView().getTypeSystem().getType(typeName);
AddCapabilityFeatureDialog dialog = new AddCapabilityFeatureDialog(this, type, c);
if (dialog.open() == Window.CANCEL)
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportResBindSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportResBindSection.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportResBindSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/ImportResBindSection.java Fri Jan 12 07:23:10 2007
@@ -62,7 +62,7 @@
getResourceManagerConfiguration().setExternalResources(externalResourceDescription0);
}
- // indexes are checked and merged when the TCAS is built
+ // indexes are checked and merged when the CAS is built
protected boolean isValidImport(String title, String message) {
ResourceManagerConfiguration savedRmc = editor.getResolvedExternalResourcesAndBindings();
if (null != savedRmc)
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexImportSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexImportSection.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexImportSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/IndexImportSection.java Fri Jan 12 07:23:10 2007
@@ -22,7 +22,7 @@
import java.io.IOException;
import org.apache.uima.UIMAFramework;
-import org.apache.uima.cas.text.TCAS;
+import org.apache.uima.cas.CAS;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.FsIndexCollection;
import org.apache.uima.resource.metadata.Import;
@@ -72,20 +72,20 @@
getAnalysisEngineMetaData().setFsIndexes(fsIndexDescription0);
}
- // indexes are checked and merged when the TCAS is built
+ // indexes are checked and merged when the CAS is built
protected boolean isValidImport(String title, String message) {
FsIndexCollection savedIC = editor.getMergedFsIndexCollection();
if (null != savedIC)
savedIC = (FsIndexCollection) savedIC.clone();
- TCAS savedTCAS = editor.getTCAS();
+ CAS savedCAS = editor.getCurrentView();
try {
editor.setMergedFsIndexCollection();
- editor.descriptorTCAS.validate();
+ editor.descriptorCAS.validate();
} catch (ResourceInitializationException e) {
revertMsg(title, message, editor.getMessagesToRootCause(e));
editor.setMergedFsIndexCollection(savedIC);
- editor.descriptorTCAS.set(savedTCAS);
+ editor.descriptorCAS.set(savedCAS);
return false;
}
return true;
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeImportSection.java Fri Jan 12 07:23:10 2007
@@ -22,7 +22,7 @@
import java.io.IOException;
import org.apache.uima.UIMAFramework;
-import org.apache.uima.cas.text.TCAS;
+import org.apache.uima.cas.CAS;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.Import;
import org.apache.uima.resource.metadata.TypeSystemDescription;
@@ -37,7 +37,7 @@
*/
public class TypeImportSection extends ImportSection {
- private TCAS savedTCAS;
+ private CAS savedCAS;
private boolean importWasRemoved;
@@ -72,7 +72,7 @@
}
protected void setModelImportArray(Import[] imports) {
- savedTCAS = editor.getTCAS();
+ savedCAS = editor.getCurrentView();
Import[] oldImports = getTypeSystemDescription().getImports();
importWasRemoved = (null != oldImports) && (oldImports.length > imports.length);
getTypeSystemDescription().setImports(imports);
@@ -88,12 +88,12 @@
try {
editor.setMergedTypeSystemDescription();
- editor.descriptorTCAS.validate();
+ editor.descriptorCAS.validate();
} catch (ResourceInitializationException e1) {
revertMsg(title, msg, editor.getMessagesToRootCause(e1));
editor.setMergedTypeSystemDescription(savedTSD);
editor.setImportedTypeSystemDescription(savedITSD);
- editor.descriptorTCAS.set(savedTCAS);
+ editor.descriptorCAS.set(savedCAS);
return false;
}
if (importWasRemoved)
@@ -105,7 +105,7 @@
revertMsg(title, msg, "Cancelled by user.");
editor.setMergedTypeSystemDescription(savedTSD);
editor.setImportedTypeSystemDescription(savedITSD);
- editor.descriptorTCAS.set(savedTCAS);
+ editor.descriptorCAS.set(savedCAS);
return false;
}
@@ -114,7 +114,7 @@
/**
* At this point, the basic type system description is updated. and validated. Validation has
- * updated the merged type system description, and updated the TCAS.
+ * updated the merged type system description, and updated the CAS.
*/
protected void finishImportChangeAction() {
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypePriorityImportSection.java Fri Jan 12 07:23:10 2007
@@ -22,7 +22,7 @@
import java.io.IOException;
import org.apache.uima.UIMAFramework;
-import org.apache.uima.cas.text.TCAS;
+import org.apache.uima.cas.CAS;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.Import;
import org.apache.uima.resource.metadata.TypePriorities;
@@ -68,19 +68,19 @@
getTypePriorities().setPriorityLists(typePriorityList0);
}
- // indexes are checked and merged when the TCAS is built
+ // indexes are checked and merged when the CAS is built
protected boolean isValidImport(String title, String message) {
- TCAS savedTCAS = editor.getTCAS();
+ CAS savedCAS = editor.getCurrentView();
TypePriorities savedTP = editor.getMergedTypePriorities();
if (null != savedTP)
savedTP = (TypePriorities) savedTP.clone();
try {
editor.setMergedTypePriorities();
- editor.descriptorTCAS.validate();
+ editor.descriptorCAS.validate();
} catch (ResourceInitializationException e1) {
revertMsg(title, message, editor.getMessagesToRootCause(e1));
editor.setMergedTypePriorities(savedTP);
- editor.descriptorTCAS.set(savedTCAS);
+ editor.descriptorCAS.set(savedCAS);
return false;
}
return true;
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/TypeSection.java Fri Jan 12 07:23:10 2007
@@ -48,7 +48,6 @@
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
-import org.apache.uima.cas.text.TCAS;
import org.apache.uima.impl.UIMAFramework_impl;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.AllowedValue;
@@ -917,7 +916,7 @@
// have list of features really disappearing (not kept present by imports or built-ins)
// return all types/features of these for types which are subtypes of the passed-in type
- TCAS tcas = editor.getTCAS();
+ CAS tcas = editor.getCurrentView();
TypeSystem typeSystem = tcas.getTypeSystem();
Type thisType = typeSystem.getType(localTd.getName());
List subsumedTypesList = typeSystem.getProperlySubsumedTypes(thisType);
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexKeyDialog.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexKeyDialog.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexKeyDialog.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/editors/ui/dialogs/AddIndexKeyDialog.java Fri Jan 12 07:23:10 2007
@@ -89,7 +89,7 @@
* @return an array of features whose range is primitive
*/
private String[] getSortableFeatureNames(String selectedTypeName) {
- Type selectedType = section.editor.getTCAS().getTypeSystem().getType(selectedTypeName);
+ Type selectedType = section.editor.getCurrentView().getTypeSystem().getType(selectedTypeName);
List feats = selectedType.getFeatures();
Collection sortableFeatureNames = new ArrayList();
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AllTypes.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AllTypes.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AllTypes.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/AllTypes.java Fri Jan 12 07:23:10 2007
@@ -23,9 +23,9 @@
import java.util.Iterator;
import java.util.Map;
+import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
-import org.apache.uima.cas.text.TCAS;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.taeconfigurator.editors.MultiPageEditor;
@@ -59,7 +59,7 @@
private void update() {
cachedResult.clear();
- TCAS tcas = modelRoot.getTCAS();
+ CAS tcas = modelRoot.getCurrentView();
if (null == tcas)
return;
TypeSystem typeSystem = tcas.getTypeSystem();
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/BuiltInTypes.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/BuiltInTypes.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/BuiltInTypes.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/BuiltInTypes.java Fri Jan 12 07:23:10 2007
@@ -25,11 +25,11 @@
import java.util.Map;
import java.util.TreeMap;
+import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.text.TCAS;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.FeatureDescription;
import org.apache.uima.resource.metadata.FsIndexDescription;
@@ -50,7 +50,7 @@
public static final Map typeDescriptions = new TreeMap();
static {
- TCAS tcas = null;
+ CAS tcas = null;
try {
tcas = CasCreationUtils.createTCas((TypeSystemDescription) null, null,
new FsIndexDescription[0], casCreateProperties);
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DefinedTypesWithSupers.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DefinedTypesWithSupers.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DefinedTypesWithSupers.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DefinedTypesWithSupers.java Fri Jan 12 07:23:10 2007
@@ -65,7 +65,7 @@
return; // cleared table
TypeDescription[] types = typeSystemDescription.getTypes();
- TypeSystem typeSystem = modelRoot.descriptorTCAS.get().getTypeSystem();
+ TypeSystem typeSystem = modelRoot.descriptorCAS.get().getTypeSystem();
String typeName;
Map allTypes = modelRoot.allTypes.get();
Modified: incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorTCAS.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorTCAS.java?view=diff&rev=495602&r1=495601&r2=495602
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorTCAS.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-configurator/src/main/java/org/apache/uima/taeconfigurator/model/DescriptorTCAS.java Fri Jan 12 07:23:10 2007
@@ -24,7 +24,7 @@
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.cas.admin.CASAdminException;
-import org.apache.uima.cas.text.TCAS;
+import org.apache.uima.cas.CAS;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.taeconfigurator.InternalErrorCDE;
@@ -32,12 +32,12 @@
import org.apache.uima.util.CasCreationUtils;
/**
- * Model part: TCAS corresponding to the descriptor being edited
+ * Model part: CAS corresponding to the descriptor being edited
*/
public class DescriptorTCAS extends AbstractModelPart {
- private TCAS cachedResult;
+ private CAS cachedResult;
public DescriptorTCAS(MultiPageEditor modelRoot) {
super(modelRoot);
@@ -75,16 +75,16 @@
}
/**
- * @return a TCAS for the model descriptor
+ * @return a CAS for the model descriptor
*/
- public TCAS get() {
+ public CAS get() {
if (dirty) {
update();
}
return cachedResult;
}
- public void set(TCAS tcas) {
+ public void set(CAS tcas) {
cachedResult = tcas;
dirty = false;
}