You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by tw...@apache.org on 2007/05/20 20:37:13 UTC
svn commit: r539908 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima:
cas/impl/CASImpl.java cas/impl/ListUtils.java
cas/impl/XCASDeserializer.java cas/impl/XmiCasDeserializer.java
jcas/cas/TOP_Type.java
Author: twgoetz
Date: Sun May 20 11:37:12 2007
New Revision: 539908
URL: http://svn.apache.org/viewvc?view=rev&rev=539908
Log:
Jira UIMA-408: CASImpl API clean-up.
https://issues.apache.org/jira/browse/UIMA-408
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?view=diff&rev=539908&r1=539907&r2=539908
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Sun May 20 11:37:12 2007
@@ -659,7 +659,7 @@
new String[] { type.getName(), "CAS.createFS()" });
throw e;
}
- final int addr = createTempFS(typeCode);
+ final int addr = ll_createFS(typeCode);
final boolean isAnnot = this.ts.subsumes(this.annotBaseTypeCode, typeCode);
if (isAnnot && this == this.getBaseCAS()) {
CASRuntimeException e = new CASRuntimeException(CASRuntimeException.DISALLOW_CREATE_ANNOTATION_IN_BASE_CAS,
@@ -767,14 +767,14 @@
}
protected SofaFS createSofa(String sofaName, String mimeType) {
- final int addr = createTempFS(this.sofaTypeCode);
+ final int addr = ll_createFS(this.sofaTypeCode);
final FeatureStructure sofa = this.fsClassReg.createFS(addr, this);
addSofa(sofa, sofaName, mimeType);
return (SofaFS) sofa;
}
protected SofaFS createInitialSofa(String mimeType) {
- final int addr = createTempFS(this.sofaTypeCode);
+ final int addr = ll_createFS(this.sofaTypeCode);
final FeatureStructure sofa = this.fsClassReg.createFS(addr, this);
final int llsofa = getLowLevelCAS().ll_getFSRef(sofa);
getLowLevelCAS().ll_setIntValue(llsofa, this.sofaNumFeatCode, 1);
@@ -2763,18 +2763,6 @@
}
return TYPE_CLASS_FS;
- }
-
- /**
- * Create a temporary (i.e., per document) FS on the heap.
- *
- * @param type
- * The type code of the structure to be created.
- * @exception ArrayIndexOutOfBoundsException
- * If <code>type</code> is not a type.
- */
- public int createTempFS(int type) {
- return ll_createFS(type);
}
public final int ll_createFS(int typeCode) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java?view=diff&rev=539908&r1=539907&r2=539908
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java Sun May 20 11:37:12 2007
@@ -318,11 +318,11 @@
}
public int createIntList(List stringValues) {
- int first = cas.createTempFS(eIntListType);
+ int first = cas.ll_createFS(eIntListType);
ListIterator iter = stringValues.listIterator(stringValues.size());
while (iter.hasPrevious()) {
int value = Integer.parseInt((String) iter.previous());
- int node = cas.createTempFS(neIntListType);
+ int node = cas.ll_createFS(neIntListType);
cas.setFeatureValue(node, intHeadFeat, value);
cas.setFeatureValue(node, intTailFeat, first);
first = node;
@@ -331,11 +331,11 @@
}
public int createFloatList(List stringValues) {
- int first = cas.createTempFS(eFloatListType);
+ int first = cas.ll_createFS(eFloatListType);
ListIterator iter = stringValues.listIterator(stringValues.size());
while (iter.hasPrevious()) {
float value = Float.parseFloat((String) iter.previous());
- int node = cas.createTempFS(neFloatListType);
+ int node = cas.ll_createFS(neFloatListType);
cas.setFeatureValue(node, floatHeadFeat, CASImpl.float2int(value));
cas.setFeatureValue(node, floatTailFeat, first);
first = node;
@@ -344,11 +344,11 @@
}
public int createStringList(List stringValues) {
- int first = cas.createTempFS(eStringListType);
+ int first = cas.ll_createFS(eStringListType);
ListIterator iter = stringValues.listIterator(stringValues.size());
while (iter.hasPrevious()) {
String value = (String) iter.previous();
- int node = cas.createTempFS(neStringListType);
+ int node = cas.ll_createFS(neStringListType);
cas.setFeatureValue(node, stringHeadFeat, cas.addString(value));
cas.setFeatureValue(node, stringTailFeat, first);
first = node;
@@ -357,11 +357,11 @@
}
public int createFsList(List stringValues, IntVector fsAddresses) {
- int first = cas.createTempFS(eFsListType);
+ int first = cas.ll_createFS(eFsListType);
ListIterator iter = stringValues.listIterator(stringValues.size());
while (iter.hasPrevious()) {
int value = Integer.parseInt((String) iter.previous());
- int node = cas.createTempFS(neFsListType);
+ int node = cas.ll_createFS(neFsListType);
fsAddresses.add(node);
cas.setFeatureValue(node, fsHeadFeat, value);
cas.setFeatureValue(node, fsTailFeat, first);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java?view=diff&rev=539908&r1=539907&r2=539908
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java Sun May 20 11:37:12 2007
@@ -298,7 +298,7 @@
readArray(type, attrs);
return;
}
- final int addr = cas.createTempFS(type.getCode());
+ final int addr = cas.ll_createFS(type.getCode());
readFS(addr, attrs, true);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?view=diff&rev=539908&r1=539907&r2=539908
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Sun May 20 11:37:12 2007
@@ -440,7 +440,7 @@
}
}
} else {
- final int addr = cas.createTempFS(currentType.getCode());
+ final int addr = cas.ll_createFS(currentType.getCode());
readFS(addr, attrs);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java?view=diff&rev=539908&r1=539907&r2=539908
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java Sun May 20 11:37:12 2007
@@ -196,6 +196,6 @@
}
public int noObjCreate() {
- return casImpl.createTempFS(casTypeCode);
+ return casImpl.ll_createFS(casTypeCode);
}
}