You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/12/23 21:36:23 UTC
svn commit: r1775903 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl:
AllFSs.java BinaryCasSerDes.java BinaryCasSerDes4.java BinaryCasSerDes6.java
Author: schor
Date: Fri Dec 23 21:36:23 2016
New Revision: 1775903
URL: http://svn.apache.org/viewvc?rev=1775903&view=rev
Log:
[UIMA-5233] replace CommonArray with v2 named equiv class, CommonArrayFS
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java?rev=1775903&r1=1775902&r2=1775903&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java Fri Dec 23 21:36:23 2016
@@ -25,9 +25,9 @@ import java.util.function.Predicate;
import java.util.stream.Stream;
import org.apache.uima.UimaSerializableFSs;
+import org.apache.uima.cas.CommonArrayFS;
import org.apache.uima.internal.util.PositiveIntSet;
import org.apache.uima.internal.util.PositiveIntSet_impl;
-import org.apache.uima.jcas.cas.CommonArray;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.TOP;
@@ -139,7 +139,7 @@ class AllFSs {
}
// not an FS Array
- if (fs instanceof CommonArray) {
+ if (fs instanceof CommonArrayFS) {
return; // no refs
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java?rev=1775903&r1=1775902&r2=1775903&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes.java Fri Dec 23 21:36:23 2016
@@ -35,6 +35,7 @@ import java.util.function.IntFunction;
import org.apache.uima.UimaSerializable;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CASRuntimeException;
+import org.apache.uima.cas.CommonArrayFS;
import org.apache.uima.cas.SerialFormat;
import org.apache.uima.cas.impl.CommonSerDes.Header;
import org.apache.uima.cas.impl.CommonSerDes.Reading;
@@ -48,7 +49,6 @@ import org.apache.uima.internal.util.fun
import org.apache.uima.internal.util.function.DeserBinaryIndexes;
import org.apache.uima.jcas.cas.BooleanArray;
import org.apache.uima.jcas.cas.ByteArray;
-import org.apache.uima.jcas.cas.CommonArray;
import org.apache.uima.jcas.cas.DoubleArray;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.FloatArray;
@@ -1440,7 +1440,7 @@ public class BinaryCasSerDes {
if (type.isArray()) {
// next slot is the length
- final int length = ((CommonArray)fs).size();
+ final int length = ((CommonArrayFS)fs).size();
heap.heap[pos + arrayLengthFeatOffset] = length;
// next slot are the values
int i = pos + arrayContentOffset;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java?rev=1775903&r1=1775902&r2=1775903&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes4.java Fri Dec 23 21:36:23 2016
@@ -47,6 +47,7 @@ import java.util.zip.InflaterInputStream
import org.apache.uima.UimaSerializable;
import org.apache.uima.cas.AbstractCas;
import org.apache.uima.cas.CASRuntimeException;
+import org.apache.uima.cas.CommonArrayFS;
import org.apache.uima.cas.Marker;
import org.apache.uima.cas.impl.CASImpl.FsChange;
import org.apache.uima.cas.impl.FSsTobeAddedback.FSsTobeAddedbackSingle;
@@ -59,7 +60,6 @@ import org.apache.uima.internal.util.Obj
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.BooleanArray;
import org.apache.uima.jcas.cas.ByteArray;
-import org.apache.uima.jcas.cas.CommonArray;
import org.apache.uima.jcas.cas.DoubleArray;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.FloatArray;
@@ -900,16 +900,16 @@ public class BinaryCasSerDes4 implements
}
private int getPrevArray0HeapRef() {
- if (isNoPrevArrayValue((CommonArray)prevFs)) return 0;
+ if (isNoPrevArrayValue((CommonArrayFS)prevFs)) return 0;
return fs2seq(((FSArray)prevFs).get(0));
}
private int getPrevArray0Int() {
- if (isNoPrevArrayValue((CommonArray)prevFs)) return 0;
+ if (isNoPrevArrayValue((CommonArrayFS)prevFs)) return 0;
return ((IntegerArray)prevFs).get(0);
}
- private boolean isNoPrevArrayValue(CommonArray prevCommonArray) {
+ private boolean isNoPrevArrayValue(CommonArrayFS prevCommonArray) {
return prevCommonArray == null || prevCommonArray.size() == 0;
}
@@ -963,7 +963,7 @@ public class BinaryCasSerDes4 implements
}
private int serializeArrayLength(TOP fs) throws IOException {
- int length = ((CommonArray)fs).size();
+ int length = ((CommonArrayFS)fs).size();
writeVnumber(arrayLength_i, length);
return length;
}
@@ -1795,7 +1795,7 @@ public class BinaryCasSerDes4 implements
if (type.isArray()) {
currentFs = readArray(iHeap, type);
- arraySize = ((CommonArray)currentFs).size();
+ arraySize = ((CommonArrayFS)currentFs).size();
} else {
if (!ts.annotBaseType.subsumes(type) && // defer subtypes of AnnotationBase
!(ts.sofaType == type)) { // defer sofa types
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java?rev=1775903&r1=1775902&r2=1775903&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java Fri Dec 23 21:36:23 2016
@@ -56,6 +56,7 @@ import java.util.zip.InflaterInputStream
import org.apache.uima.UimaSerializable;
import org.apache.uima.cas.AbstractCas;
import org.apache.uima.cas.CASRuntimeException;
+import org.apache.uima.cas.CommonArrayFS;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.impl.CASImpl.FsChange;
@@ -71,7 +72,6 @@ import org.apache.uima.internal.util.Pos
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.BooleanArray;
import org.apache.uima.jcas.cas.ByteArray;
-import org.apache.uima.jcas.cas.CommonArray;
import org.apache.uima.jcas.cas.DoubleArray;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.FloatArray;
@@ -820,7 +820,7 @@ public class BinaryCasSerDes6 implements
writeVnumber(typeCode_dos, tgtType.getCode());
- if (fs instanceof CommonArray) {
+ if (fs instanceof CommonArrayFS) {
serializeArray(fs);
} else {
if (isTypeMapping) {
@@ -861,7 +861,7 @@ public class BinaryCasSerDes6 implements
private void serializeArray(TOP fs) throws IOException {
final TypeImpl_array arrayType = (TypeImpl_array) fs._getTypeImpl();
- CommonArray a = (CommonArray) fs;
+ CommonArrayFS a = (CommonArrayFS) fs;
final SlotKind arrayElementKind = arrayType.getComponentSlotKind();
final int length = serializeArrayLength(a);
@@ -1003,7 +1003,7 @@ public class BinaryCasSerDes6 implements
} // end of switch
}
- private int serializeArrayLength(CommonArray array) throws IOException {
+ private int serializeArrayLength(CommonArrayFS array) throws IOException {
final int length = array.size();
writeVnumber(arrayLength_i, length);
return length;
@@ -2964,7 +2964,7 @@ public class BinaryCasSerDes6 implements
}
// not an FS Array
- if (fs instanceof CommonArray) {
+ if (fs instanceof CommonArrayFS) {
return;
}
@@ -3242,8 +3242,8 @@ public class BinaryCasSerDes6 implements
}
private boolean compareFssArray() {
- CommonArray a1 = (CommonArray) fs1;
- CommonArray a2 = (CommonArray) fs2;
+ CommonArrayFS a1 = (CommonArrayFS) fs1;
+ CommonArrayFS a2 = (CommonArrayFS) fs2;
int len1 = a1.size();
int len2 = a2.size();
if (len1 != len2) {
@@ -3539,8 +3539,8 @@ public class BinaryCasSerDes6 implements
} // end of sort compare
private int sortArray(TOP afs1, TOP afs2) {
- int sz1 = ((CommonArray)afs1).size();
- int sz2 = ((CommonArray)afs2).size();
+ int sz1 = ((CommonArrayFS)afs1).size();
+ int sz2 = ((CommonArrayFS)afs2).size();
int c = Integer.compare(sz1, sz2);
if (c != 0) return c;