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:50:55 UTC
svn commit: r539911 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima:
cas/impl/ jcas/cas/ jcas/impl/
Author: twgoetz
Date: Sun May 20 11:50:53 2007
New Revision: 539911
URL: http://svn.apache.org/viewvc?view=rev&rev=539911
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/ArrayFSImpl.java
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/CommonArrayFSImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxArrayFSImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.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
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/BooleanArray.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray_Type.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSImpl.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ArrayFSImpl.java Sun May 20 11:50:53 2007
@@ -41,7 +41,7 @@
* @see org.apache.uima.cas.ArrayFS#size()
*/
public int size() {
- return this.getCASImpl().getArraySize(this.getAddress());
+ return this.getCASImpl().ll_getArraySize(this.getAddress());
}
/**
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=539911&r1=539910&r2=539911
==============================================================================
--- 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:50:53 2007
@@ -881,7 +881,7 @@
FeatureStructureImpl fs = (FeatureStructureImpl) aSofa.getLocalFSData();
int arrayStart = 0;
- int arraySize = this.getArraySize(fs.getAddress());
+ int arraySize = this.ll_getArraySize(fs.getAddress());
ByteBuffer buf = null;
Type type = fs.getType();
if (type.getName().equals(CAS.TYPE_NAME_INTEGER_ARRAY)) {
@@ -1609,48 +1609,6 @@
return this.fsClassReg.createFS(addr, this);
}
- /**
- * Create a temporary (i.e., per document) String array FS on the heap.
- *
- * @param type
- * The type code of the array to be created.
- * @param len
- * The length of the array to be created.
- * @exception ArrayIndexOutOfBoundsException
- * If <code>type</code> is not a type.
- */
- public int createTempStringArray(int type, int len) {
- // String arrays are different, since for compatibility with C++, we
- // need
- // to allocate space for the size of the strings.
- final int addr = this.heap.addToTempHeap(arrayContentOffset + len, type);
- this.heap.heap[(addr + arrayLengthFeatOffset)] = len;
- return addr;
- }
-
- // /**
- // * Create a permanent FS on the heap.
- // *
- // * @param type
- // * The type of the FS.
- // * @return The address of the new FS. This is an int <code>>=0</code>.
- // * If it is <code>0</code>, something went wrong; <code>0</code>
- // * is not a valid address.
- // */
- // public int createPermFS(int type) {
- // return this.heap.addToHeap(this.fsSpaceReq[type], type);
- // }
-
- /**
- * Get the size of an array.
- *
- * @param addr
- * The address of the array.
- * @return The length of the array.
- */
- public int getArraySize(int addr) {
- return this.ll_getArraySize(addr);
- }
public int ll_getArraySize(int arrayFsRef) {
return this.heap.heap[arrayFsRef + arrayLengthFeatOffset];
@@ -3106,7 +3064,7 @@
}
public final void checkArrayBounds(int fsRef, int pos) {
- final int arrayLength = getArraySize(fsRef);
+ final int arrayLength = ll_getArraySize(fsRef);
if (pos < 0 || pos >= arrayLength) {
throw new ArrayIndexOutOfBoundsException(pos);
// LowLevelException e = new LowLevelException(
@@ -3117,7 +3075,7 @@
}
public final void checkArrayBounds(int fsRef, int pos, int length) {
- final int arrayLength = getArraySize(fsRef);
+ final int arrayLength = ll_getArraySize(fsRef);
if (pos < 0 || length < 0 || (pos + length) > arrayLength) {
LowLevelException e = new LowLevelException(LowLevelException.ARRAY_INDEX_LENGTH_OUT_OF_RANGE);
e.addArgument(Integer.toString(pos));
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java Sun May 20 11:50:53 2007
@@ -33,7 +33,7 @@
}
public int size() {
- return casImpl.getArraySize(addr);
+ return casImpl.ll_getArraySize(addr);
}
public abstract void copyToArray(int srcOffset, String[] dest, int destOffset, int length);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxArrayFSImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxArrayFSImpl.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxArrayFSImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonAuxArrayFSImpl.java Sun May 20 11:50:53 2007
@@ -38,7 +38,7 @@
* @see org.apache.uima.cas.ArrayFS#size()
*/
public int size() {
- return casImpl.getArraySize(addr);
+ return casImpl.ll_getArraySize(addr);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java Sun May 20 11:50:53 2007
@@ -259,7 +259,7 @@
int arrayFS = (this.isBracketsOnly ? currentFS : cas.ll_getRefValue(currentFS,
this.featureCode));
- int arraySize = ((CASImpl) cas).getArraySize(arrayFS);
+ int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
if (this.arrayIndex >= arraySize) {
@@ -333,7 +333,7 @@
int arrayFS = (this.isBracketsOnly ? currentFS : cas.ll_getRefValue(currentFS,
this.featureCode));
- int arraySize = ((CASImpl) cas).getArraySize(arrayFS);
+ int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
@@ -417,7 +417,7 @@
int arrayFS = (this.isBracketsOnly ? currentFS : cas.ll_getRefValue(currentFS,
this.featureCode));
- int arraySize = ((CASImpl) cas).getArraySize(arrayFS);
+ int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
if (this.arrayIndex >= arraySize) {
@@ -493,7 +493,7 @@
int arrayFS = (this.isBracketsOnly ? currentFS : cas.ll_getRefValue(currentFS,
this.featureCode));
- int arraySize = ((CASImpl) cas).getArraySize(arrayFS);
+ int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
@@ -587,7 +587,7 @@
int arrayFS = (this.isBracketsOnly ? currentFS : cas.ll_getRefValue(currentFS,
this.featureCode));
- int arraySize = ((CASImpl) cas).getArraySize(arrayFS);
+ int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
if (this.arrayIndex >= arraySize) {
@@ -670,7 +670,7 @@
int arrayFS = (this.isBracketsOnly ? currentFS : cas.ll_getRefValue(currentFS,
this.featureCode));
- int arraySize = ((CASImpl) cas).getArraySize(arrayFS);
+ int arraySize = ((CASImpl) cas).ll_getArraySize(arrayFS);
// if the user specified name[1000], but the array has only 5
// entries for name...
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java Sun May 20 11:50:53 2007
@@ -59,7 +59,7 @@
* @see org.apache.uima.cas.ArrayFS#size()
*/
public int size() {
- return casImpl.getArraySize(addr);
+ return casImpl.ll_getArraySize(addr);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java Sun May 20 11:50:53 2007
@@ -60,7 +60,7 @@
* @see org.apache.uima.cas.ArrayFS#size()
*/
public int size() {
- return this.casImpl.getArraySize(this.addr);
+ return this.casImpl.ll_getArraySize(this.addr);
}
/**
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=539911&r1=539910&r2=539911
==============================================================================
--- 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:50:53 2007
@@ -726,7 +726,7 @@
}
private void addArrayElement(String content) throws SAXParseException {
- if (arrayPos >= cas.getArraySize(currentAddr)) {
+ if (arrayPos >= cas.ll_getArraySize(currentAddr)) {
throw createException(XCASParsingException.EXCESS_ARRAY_ELE);
}
try {
@@ -839,7 +839,7 @@
// Nothing to do.
return;
}
- final int size = cas.getArraySize(addr);
+ final int size = cas.ll_getArraySize(addr);
FSInfo fsValInfo;
for (int i = 0; i < size; i++) {
int arrayVal = cas.getArrayValue(addr, i);
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=539911&r1=539910&r2=539911
==============================================================================
--- 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 11:50:53 2007
@@ -551,7 +551,7 @@
private void encodeFSArray(int addr, AttributesImpl attrs) throws SAXException {
final String typeName = getTypeName(addr);
- final int size = cas.getArraySize(addr);
+ final int size = cas.ll_getArraySize(addr);
int pos = cas.getArrayStartAddress(addr);
// xmlStack.addAttribute(ARRAY_SIZE_ATTR, Integer.toString(size));
// xmlStack.commitNode();
@@ -597,7 +597,7 @@
}
private void enqueueFSArray(int addr) {
- final int size = cas.getArraySize(addr);
+ final int size = cas.ll_getArraySize(addr);
int pos = cas.getArrayStartAddress(addr);
int val;
for (int i = 0; i < size; i++) {
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=539911&r1=539910&r2=539911
==============================================================================
--- 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:50:53 2007
@@ -1123,7 +1123,7 @@
// Nothing to do.
return;
}
- final int size = cas.getArraySize(addr);
+ final int size = cas.ll_getArraySize(addr);
for (int i = 0; i < size; i++) {
int arrayVal = cas.getArrayValue(addr, i);
if (arrayVal != CASImpl.NULL) {
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=539911&r1=539910&r2=539911
==============================================================================
--- 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 Sun May 20 11:50:53 2007
@@ -498,7 +498,7 @@
* Address of an FSArray
*/
private void enqueueFSArrayElements(int addr) throws SAXException {
- final int size = cas.getArraySize(addr);
+ final int size = cas.ll_getArraySize(addr);
int pos = cas.getArrayStartAddress(addr);
int val;
for (int i = 0; i < size; i++) {
@@ -858,7 +858,7 @@
// it is not safe to use a space-separated attribute, which would
// break for strings containing spaces. So use child elements instead.
- final int size = cas.getArraySize(addr);
+ final int size = cas.ll_getArraySize(addr);
if (size > 0 && !arrayAndListFSs.put(addr, addr)) {
reportWarning("Warning: multiple references to a String array. Reference identity will not be preserved.");
}
@@ -877,7 +877,7 @@
}
StringBuffer buf = new StringBuffer();
- final int size = cas.getArraySize(addr);
+ final int size = cas.ll_getArraySize(addr);
if (size > 0 && !arrayAndListFSs.put(addr, addr)) {
reportWarning("Warning: multiple references to an array. Reference identity will not be preserved in XMI.");
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java Sun May 20 11:50:53 2007
@@ -105,7 +105,7 @@
/** return the size of the array */
public int size() {
- return jcasType.casImpl.getArraySize(addr);
+ return jcasType.casImpl.ll_getArraySize(addr);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java Sun May 20 11:50:53 2007
@@ -105,7 +105,7 @@
/** return the size of the array */
public int size() {
- return jcasType.casImpl.getArraySize(addr);
+ return jcasType.casImpl.ll_getArraySize(addr);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray_Type.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray_Type.java Sun May 20 11:50:53 2007
@@ -44,7 +44,7 @@
*/
/** return the size of the array */
public int size(int addr) {
- return casImpl.getArraySize(addr);
+ return casImpl.ll_getArraySize(addr);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java Sun May 20 11:50:53 2007
@@ -105,7 +105,7 @@
/** return the size of the array */
public int size() {
- return jcasType.casImpl.getArraySize(addr);
+ return jcasType.casImpl.ll_getArraySize(addr);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArray.java Sun May 20 11:50:53 2007
@@ -92,7 +92,7 @@
/** return the size of the array. */
public int size() {
- return jcasType.casImpl.getArraySize(addr);
+ return jcasType.casImpl.ll_getArraySize(addr);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java Sun May 20 11:50:53 2007
@@ -139,7 +139,7 @@
*/
public int size() {
- return jcasType.casImpl.getArraySize(addr);
+ return jcasType.casImpl.ll_getArraySize(addr);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java Sun May 20 11:50:53 2007
@@ -122,7 +122,7 @@
/** return the size of the array */
public int size() {
- return jcasType.casImpl.getArraySize(addr);
+ return jcasType.casImpl.ll_getArraySize(addr);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java Sun May 20 11:50:53 2007
@@ -105,7 +105,7 @@
/** return the size of the array */
public int size() {
- return jcasType.casImpl.getArraySize(addr);
+ return jcasType.casImpl.ll_getArraySize(addr);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java Sun May 20 11:50:53 2007
@@ -105,7 +105,7 @@
/** return the size of the array */
public int size() {
- return jcasType.casImpl.getArraySize(addr);
+ return jcasType.casImpl.ll_getArraySize(addr);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java Sun May 20 11:50:53 2007
@@ -108,6 +108,6 @@
/** return the size of the array */
public int size() {
- return jcasType.casImpl.getArraySize(addr);
+ return jcasType.casImpl.ll_getArraySize(addr);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java?view=diff&rev=539911&r1=539910&r2=539911
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java Sun May 20 11:50:53 2007
@@ -753,7 +753,7 @@
e.addArgument(Integer.toString(pos));
throw e;
}
- final int arrayLength = casImpl.getArraySize(fsRef);
+ final int arrayLength = casImpl.ll_getArraySize(fsRef);
if (pos < 0 || pos >= arrayLength) {
LowLevelException e = new LowLevelException(LowLevelException.ARRAY_INDEX_OUT_OF_RANGE);
e.addArgument(Integer.toString(pos));