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:58:53 UTC
svn commit: r1775918 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src:
main/java/org/apache/uima/util/CasCopier.java
test/java/org/apache/uima/cas_data/impl/CasComparer.java
Author: schor
Date: Fri Dec 23 21:58:53 2016
New Revision: 1775918
URL: http://svn.apache.org/viewvc?rev=1775918&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/util/CasCopier.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java?rev=1775918&r1=1775917&r2=1775918&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java Fri Dec 23 21:58:53 2016
@@ -28,6 +28,7 @@ import org.apache.uima.UIMARuntimeExcept
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.FSIterator;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.SofaFS;
@@ -41,7 +42,6 @@ import org.apache.uima.internal.util.Mis
import org.apache.uima.internal.util.PositiveIntSet;
import org.apache.uima.internal.util.PositiveIntSet_impl;
import org.apache.uima.jcas.cas.AnnotationBase;
-import org.apache.uima.jcas.cas.CommonArray;
import org.apache.uima.jcas.cas.CommonPrimitiveArray;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.Sofa;
@@ -773,7 +773,7 @@ public class CasCopier {
}
// Arrays - need to be created a populated differently than "normal" FS
- if (srcFs instanceof CommonArray) {
+ if (srcFs instanceof CommonArrayFS) {
copy = copyArray(srcFs);
if (copy != null) { // can be null if trying to copy MyFs[] and type doesn't exist in target type system
mFsMap.put(srcFs, copy);
@@ -995,7 +995,7 @@ public class CasCopier {
* @return a copy of the array
*/
private TOP copyArray(TOP srcFS) {
- final CommonArray srcCA = (CommonArray) srcFS;
+ final CommonArrayFS srcCA = (CommonArrayFS) srcFS;
final int size = srcCA.size();
final TypeImpl tgtTi = getTargetType(((TOP)srcFS)._getTypeImpl()); // could be null for src = e.g. Annotation[]
@@ -1004,7 +1004,7 @@ public class CasCopier {
}
if (srcFS instanceof CommonPrimitiveArray) {
- CommonArray copy = (CommonArray) tgtCasViewImpl.createArray(tgtTi, size);
+ CommonArrayFS copy = (CommonArrayFS) tgtCasViewImpl.createArray(tgtTi, size);
copy.copyValuesFrom(srcCA);
return (TOP) copy;
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java?rev=1775918&r1=1775917&r2=1775918&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java Fri Dec 23 21:58:53 2016
@@ -32,6 +32,7 @@ import org.apache.uima.cas.ArrayFS;
import org.apache.uima.cas.BooleanArrayFS;
import org.apache.uima.cas.ByteArrayFS;
import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.CommonArrayFS;
import org.apache.uima.cas.DoubleArrayFS;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.Feature;
@@ -51,7 +52,6 @@ import org.apache.uima.internal.util.Int
import org.apache.uima.internal.util.Misc;
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.EmptyList;
import org.apache.uima.jcas.cas.FSArray;
@@ -214,8 +214,8 @@ public class CasComparer {
}
if (t1.isArray()) {
- final int len1 = ((CommonArray)fs1).size();
- if (0 != (r = Integer.compare(len1, ((CommonArray)fs2).size()))) {
+ final int len1 = ((CommonArrayFS)fs1).size();
+ if (0 != (r = Integer.compare(len1, ((CommonArrayFS)fs2).size()))) {
return r;
}
@@ -384,8 +384,8 @@ public class CasComparer {
// returns true if the items were arrays
private int compareArrayFSs(TOP arrayFS1fs, Feature feat1, TOP arrayFS2fs, Feature feat2, Set<TOP> visited) {
- CommonArray arrayFS1 = (CommonArray)arrayFS1fs.getFeatureValue(feat1);
- CommonArray arrayFS2 = (CommonArray)arrayFS2fs.getFeatureValue(feat2);
+ CommonArrayFS arrayFS1 = (CommonArrayFS)arrayFS1fs.getFeatureValue(feat1);
+ CommonArrayFS arrayFS2 = (CommonArrayFS)arrayFS2fs.getFeatureValue(feat2);
if (null == arrayFS1 && null == arrayFS2)return 0; // are equal
if (null == arrayFS1) return chkEqual(-1, "Array FS1 is null, but Array FS2 is not");
@@ -451,7 +451,7 @@ public class CasComparer {
return 0; // all were equal
}
- private ARRAY_TYPE getArrayType(CommonArray c) {
+ private ARRAY_TYPE getArrayType(CommonArrayFS c) {
if (c instanceof ArrayFS) return ARRAY_TYPE.FS;
if (c instanceof StringArrayFS) return ARRAY_TYPE.STRING;
if (c instanceof BooleanArrayFS) return ARRAY_TYPE.BOOLEAN;
@@ -464,7 +464,7 @@ public class CasComparer {
return null;
}
- private int validateSameType(CommonArray a1, CommonArray a2) {
+ private int validateSameType(CommonArrayFS a1, CommonArrayFS a2) {
if (a1.getClass() == a2.getClass()) {
return 0;
}