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/22 16:19:51 UTC
svn commit: r540596 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima:
cas/impl/ jcas/cas/ uimacpp/
Author: twgoetz
Date: Tue May 22 07:19:50 2007
New Revision: 540596
URL: http://svn.apache.org/viewvc?view=rev&rev=540596
Log: (empty)
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/CASMgrSerializer.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/FeatureImpl.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/TypeSystemImpl.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/cas/impl/XmiCasSerializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.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=540596&r1=540595&r2=540596
==============================================================================
--- 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 Tue May 22 07:19:50 2007
@@ -1696,7 +1696,7 @@
return Double.toString(this.getDoubleValue(addr, feat));
} else {
CASRuntimeException e = new CASRuntimeException(CASRuntimeException.INAPPROP_RANGE,
- new String[] { ts.getFeatureName(feat), ts.getTypeName(typeCode) });
+ new String[] { ts.ll_getFeatureForCode(feat).getName(), ts.getTypeName(typeCode) });
throw e;
}
@@ -1723,7 +1723,7 @@
this.setFeatureValue(fsref, feat, Double.parseDouble(value));
} else {
CASRuntimeException e = new CASRuntimeException(CASRuntimeException.INAPPROP_TYPE,
- new String[] { ts.getFeatureName(feat), ts.getTypeName(typeCode) });
+ new String[] { ts.ll_getFeatureForCode(feat).getName(), ts.getTypeName(typeCode) });
throw e;
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java?view=diff&rev=540596&r1=540595&r2=540596
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java Tue May 22 07:19:50 2007
@@ -365,7 +365,7 @@
TypeImpl parent;
// The smallest type is top, which doesn't inherit.
for (int i = ts.getSmallestType() + 1; i < max; i++) {
- parent = (TypeImpl) ts.getParent(ts.getType(i));
+ parent = (TypeImpl) ts.getParent(ts.ll_getTypeForCode(i));
this.typeInheritance[i] = parent.getCode();
}
}
@@ -472,7 +472,7 @@
comp = ir.createComparator();
// assert(pos == comparatorIndex[i]);
pos = this.comparatorIndex[this.nameToIndexMap[i]];
- type = cas.getTypeSystemImpl().getType(this.comparators[pos]);
+ type = cas.getTypeSystemImpl().ll_getTypeForCode(this.comparators[pos]);
comp.setType(type);
++pos;
next = this.nameToIndexMap[i] + 1;
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=540596&r1=540595&r2=540596
==============================================================================
--- 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 Tue May 22 07:19:50 2007
@@ -1347,7 +1347,7 @@
}
if (size == 0) {
// lazily create a default bag index for this type
- Type type = this.typeSystem.getType(typeCode);
+ Type type = this.typeSystem.ll_getTypeForCode(typeCode);
String defIndexName = getAutoIndexNameForType(type);
FSIndexComparator comparator = createComparator();
comparator.setType(type);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java?view=diff&rev=540596&r1=540595&r2=540596
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java Tue May 22 07:19:50 2007
@@ -59,7 +59,7 @@
* @return The domain type. This can not be <code>null</code>.
*/
public Type getDomain() {
- return this.ts.getType(this.ts.intro(this.code));
+ return this.ts.ll_getTypeForCode(this.ts.intro(this.code));
}
/**
@@ -68,7 +68,7 @@
* @return The range type. This can not be <code>null</code>.
*/
public Type getRange() {
- return this.ts.getType(this.ts.range(this.code));
+ return this.ts.ll_getTypeForCode(this.ts.range(this.code));
}
/**
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=540596&r1=540595&r2=540596
==============================================================================
--- 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 Tue May 22 07:19:50 2007
@@ -44,7 +44,7 @@
protected abstract CASImpl getCASImpl();
public Type getType() {
- return this.getCASImpl().getTypeSystemImpl().getType(
+ return this.getCASImpl().getTypeSystemImpl().ll_getTypeForCode(
this.getCASImpl().getHeapValue(this.getAddress()));
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java?view=diff&rev=540596&r1=540595&r2=540596
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java Tue May 22 07:19:50 2007
@@ -501,18 +501,14 @@
* The code of the type.
* @return A type object, or <code>null</code> if no such type exists.
*/
- public Type getType(int typeCode) {
- return (Type) this.types.get(typeCode);
- }
+// public Type getType(int typeCode) {
+// return (Type) this.types.get(typeCode);
+// }
public String getTypeName(int typeCode) {
return this.typeNameST.getSymbol(typeCode);
}
- public String getFeatureName(int featCode) {
- return this.featureNameST.getSymbol(featCode);
- }
-
/**
* Get a type object for a given name.
*
@@ -881,8 +877,8 @@
// if (t == null) {
// System.out.println("Type is null");
// }
- List typesLocal = getProperlySubsumedTypes(getType(domain));
- typesLocal.add(getType(domain));
+ List typesLocal = getProperlySubsumedTypes(ll_getTypeForCode(domain));
+ typesLocal.add(ll_getTypeForCode(domain));
// For each type, check that the feature doesn't already exist.
int max = typesLocal.size();
for (int i = 0; i < max; i++) {
@@ -1066,7 +1062,7 @@
final int numTypes = this.typeNameST.size();
Type t;
for (int i = 2; i <= numTypes; i++) {
- t = this.getType(i);
+ t = this.ll_getTypeForCode(i);
buf.append(getTypeString(t) + " < " + getTypeString(this.getParent(t)) + ";\n");
} // Print feature declarations.
final int numFeats = this.featureNameST.size();
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=540596&r1=540595&r2=540596
==============================================================================
--- 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 Tue May 22 07:19:50 2007
@@ -574,7 +574,7 @@
// handle v1.x sofanum values, remapping so that _InitialView always == 1
if (featName.equals(CAS.FEATURE_BASE_NAME_SOFAID)
&& this.sofaTypeCode == cas.getHeapValue(addr)) {
- Type sofaType = ts.getType(this.sofaTypeCode);
+ Type sofaType = ts.ll_getTypeForCode(this.sofaTypeCode);
final FeatureImpl sofaNumFeat = (FeatureImpl) sofaType
.getFeatureByBaseName(CAS.FEATURE_BASE_NAME_SOFANUM);
int sofaNum = cas.getFeatureValue(addr, sofaNumFeat.getCode());
@@ -822,7 +822,7 @@
ootsAttrs = new ArrayList();
outOfTypeSystemData.extraFeatureValues.put(addrInteger, ootsAttrs);
}
- String featFullName = ts.getFeatureName(feat);
+ String featFullName = ts.ll_getFeatureForCode(feat).getName();
int separatorOffset = featFullName.indexOf(TypeSystem.FEATURE_SEPARATOR);
String featName = "_ref_" + featFullName.substring(separatorOffset + 1);
ootsAttrs.add(new String[] { featName, Integer.toString(featVal) });
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=540596&r1=540595&r2=540596
==============================================================================
--- 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 Tue May 22 07:19:50 2007
@@ -506,7 +506,7 @@
int id = -1;
String attrName, attrValue;
final int typeCode = casBeingFilled.getHeapValue(addr);
- final Type type = casBeingFilled.getTypeSystemImpl().getType(typeCode);
+ final Type type = casBeingFilled.getTypeSystemImpl().ll_getTypeForCode(typeCode);
int thisSofaNum = 0;
if (sofaTypeCode == typeCode) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java?view=diff&rev=540596&r1=540595&r2=540596
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java Tue May 22 07:19:50 2007
@@ -435,7 +435,7 @@
for (int i = 0; i < feats.length; i++) {
if (isFiltering) {
// skip features that aren't in the target type system
- String fullFeatName = cas.getTypeSystemImpl().getFeatureName(feats[i]);
+ String fullFeatName = cas.getTypeSystemImpl().ll_getFeatureForCode(feats[i]).getName();
if (filterTypeSystem.getFeatureByFullName(fullFeatName) == null) {
continue;
}
@@ -700,7 +700,7 @@
for (int i = 0; i < feats.length; i++) {
if (isFiltering) {
// skip features that aren't in the target type system
- String fullFeatName = cas.getTypeSystemImpl().getFeatureName(feats[i]);
+ String fullFeatName = cas.getTypeSystemImpl().ll_getFeatureForCode(feats[i]).getName();
if (filterTypeSystem.getFeatureByFullName(fullFeatName) == null) {
continue;
}
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=540596&r1=540595&r2=540596
==============================================================================
--- 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 Tue May 22 07:19:50 2007
@@ -181,7 +181,7 @@
protected void invalidTypeArg(int inst) {
CASRuntimeException e = new CASRuntimeException(CASRuntimeException.INAPPROP_TYPE,
new String[] { casType.getName(),
- this.casImpl.getTypeSystemImpl().getType(casImpl.getHeapValue(inst)).getName() });
+ this.casImpl.getTypeSystemImpl().ll_getTypeForCode(casImpl.getHeapValue(inst)).getName() });
throw e;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java?view=diff&rev=540596&r1=540595&r2=540596
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java Tue May 22 07:19:50 2007
@@ -195,7 +195,7 @@
for (int i = 0; i < resultSpecTypes.length; ++i) {
// allAnnotatorFeatures is not considere here! (TODO)
rs
- .addResultType(casImpl.getTypeSystemImpl().getType(resultSpecTypes[i]).getName(),
+ .addResultType(casImpl.getTypeSystemImpl().ll_getTypeForCode(resultSpecTypes[i]).getName(),
false);
}
for (int i = 0; i < resultSpecFeatures.length; ++i) {