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 19:27:47 UTC
svn commit: r539897 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl:
CASImpl.java FSIndexRepositoryImpl.java FeatureStructureImpl.java
XCASDeserializer.java XCASSerializer.java
Author: twgoetz
Date: Sun May 20 10:27:46 2007
New Revision: 539897
URL: http://svn.apache.org/viewvc?view=rev&rev=539897
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/FSIndexRepositoryImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.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/XCASSerializer.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=539897&r1=539896&r2=539897
==============================================================================
--- 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 10:27:46 2007
@@ -2696,10 +2696,6 @@
}
}
- final boolean isFSRefType(int typeCode) {
- return ll_isRefType(typeCode);
- }
-
public final boolean ll_isRefType(int typeCode) {
if (typeCode == this.intTypeCode || typeCode == this.floatTypeCode
|| typeCode == this.stringTypeCode || typeCode == this.byteTypeCode
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java?view=diff&rev=539897&r1=539896&r2=539897
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java Sun May 20 10:27:46 2007
@@ -1316,7 +1316,7 @@
}
public LowLevelIndex ll_getIndex(String indexName, int typeCode) {
- if (!this.typeSystem.isType(typeCode) || !this.cas.isFSRefType(typeCode)) {
+ if (!this.typeSystem.isType(typeCode) || !this.cas.ll_isRefType(typeCode)) {
LowLevelException e = new LowLevelException(LowLevelException.INVALID_INDEX_TYPE);
e.addArgument(Integer.toString(typeCode));
throw e;
@@ -1327,7 +1327,7 @@
public final void ll_addFS(int fsRef, boolean doChecks) {
if (doChecks) {
this.cas.checkFsRef(fsRef);
- this.cas.isFSRefType(this.cas.ll_getFSRefType(fsRef));
+ this.cas.ll_isRefType(this.cas.ll_getFSRefType(fsRef));
}
ll_addFS(fsRef);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java?view=diff&rev=539897&r1=539896&r2=539897
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java Sun May 20 10:27:46 2007
@@ -224,7 +224,7 @@
}
// Check that feature value is not primitive.
final int rangeTypeCode = ts.ll_getRangeType(featCode);
- if (!this.getCASImpl().isFSRefType(rangeTypeCode)) {
+ if (!this.getCASImpl().ll_isRefType(rangeTypeCode)) {
CASRuntimeException e = new CASRuntimeException(CASRuntimeException.PRIMITIVE_VAL_FEAT,
new String[] { feat.getName() });
throw e;
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=539897&r1=539896&r2=539897
==============================================================================
--- 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 10:27:46 2007
@@ -603,7 +603,7 @@
throw createException(XCASParsingException.UNKNOWN_FEATURE, featName);
}
} else {
- if (cas.isFSRefType(ts.range(feat.getCode()))) {
+ if (cas.ll_isRefType(ts.range(feat.getCode()))) {
cas.setFeatureValue(addr, feat.getCode(), Integer.parseInt(featVal));
} else {
cas.setFeatureValueFromString(addr, feat.getCode(), featVal);
@@ -808,7 +808,7 @@
FSInfo fsValInfo;
for (int i = 0; i < feats.length; i++) {
feat = feats[i];
- if (cas.isFSRefType(ts.range(feats[i]))) {
+ if (cas.ll_isRefType(ts.range(feats[i]))) {
int featVal = cas.getFeatureValue(addr, feat);
fsValInfo = (FSInfo) fsTree.get(featVal);
if (fsValInfo == null) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java?view=diff&rev=539897&r1=539896&r2=539897
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java Sun May 20 10:27:46 2007
@@ -629,7 +629,7 @@
featAddr = addr + cas.getFeatureOffset(feats[i]);
featVal = cas.getHeapValue(featAddr);
featName = featureNames[feats[i]];
- if (!cas.isFSRefType(ts.range(feats[i]))) {
+ if (!cas.ll_isRefType(ts.range(feats[i]))) {
attrValue = cas.getFeatureValueAsString(addr, feats[i]);
if (nameMapping && featName.equals(CAS.FEATURE_BASE_NAME_SOFAID) && uimaContext != null) {
// map absolute SofaID to that expected by Component
@@ -656,7 +656,7 @@
for (int i = 0; i < feats.length; i++) {
featAddr = addr + cas.getFeatureOffset(feats[i]);
featVal = cas.getHeapValue(featAddr);
- if (cas.isFSRefType(ts.range(feats[i]))) {
+ if (cas.ll_isRefType(ts.range(feats[i]))) {
if (featVal == CASImpl.NULL) {
// break;
} else {