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:52:41 UTC
svn commit: r1775916 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl:
TypeImpl.java XmiCasDeserializer.java XmiCasSerializer.java
Author: schor
Date: Fri Dec 23 21:52:40 2016
New Revision: 1775916
URL: http://svn.apache.org/viewvc?rev=1775916&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/TypeImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java?rev=1775916&r1=1775915&r2=1775916&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java Fri Dec 23 21:52:40 2016
@@ -31,13 +31,13 @@ import java.util.stream.Stream;
import org.apache.uima.cas.BuiltinTypeKinds;
import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.CommonArrayFS;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
import org.apache.uima.cas.admin.CASAdminException;
import org.apache.uima.cas.impl.SlotKinds.SlotKind;
import org.apache.uima.internal.util.Misc;
-import org.apache.uima.jcas.cas.CommonArray;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.util.impl.Constants;
@@ -893,7 +893,7 @@ public class TypeImpl implements Type, C
public int getFsSpaceReq(TOP fs) {
return getFsSpaceReq(isHeapStoredArray()
- ? ((CommonArray)fs).size()
+ ? ((CommonArrayFS)fs).size()
: 0);
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?rev=1775916&r1=1775915&r2=1775916&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Fri Dec 23 21:52:40 2016
@@ -40,6 +40,7 @@ import org.apache.uima.UimaContext;
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.FSIndexRepository;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.SofaFS;
@@ -56,7 +57,6 @@ import org.apache.uima.internal.util.Xml
import org.apache.uima.internal.util.function.Runnable_withSaxException;
import org.apache.uima.jcas.cas.AnnotationBase;
import org.apache.uima.jcas.cas.ByteArray;
-import org.apache.uima.jcas.cas.CommonArray;
import org.apache.uima.jcas.cas.CommonList;
import org.apache.uima.jcas.cas.CommonPrimitiveArray;
import org.apache.uima.jcas.cas.EmptyList;
@@ -1185,8 +1185,8 @@ public class XmiCasDeserializer {
case LowLevelCAS.TYPE_CLASS_LONGARRAY:
case LowLevelCAS.TYPE_CLASS_DOUBLEARRAY:
case LowLevelCAS.TYPE_CLASS_FSARRAY: {
- CommonArray existingArray = (CommonArray) fs.getFeatureValue(fi);
- CommonArray casArray = createOrUpdateArray(fi.getRangeImpl(), featVals, -1, existingArray);
+ CommonArrayFS existingArray = (CommonArrayFS) fs.getFeatureValue(fi);
+ CommonArrayFS casArray = createOrUpdateArray(fi.getRangeImpl(), featVals, -1, existingArray);
if (existingArray != casArray) {
fs.setFeatureValue(fi, casArray);
}
@@ -1258,18 +1258,18 @@ public class XmiCasDeserializer {
* @return the new or updated-existing FS for the array
* @throws XCASParsingException
*/
- private CommonArray createOrUpdateArray(TypeImpl arrayType, List<String> values, int xmiId, CommonArray existingArray) throws XCASParsingException {
+ private CommonArrayFS createOrUpdateArray(TypeImpl arrayType, List<String> values, int xmiId, CommonArrayFS existingArray) throws XCASParsingException {
if (values == null) {
return null;
}
final int arrayLen = values.size();
- final CommonArray resultArray;
+ final CommonArrayFS resultArray;
if (existingArray != null) { // values are local to feature (nonshared), preexisting
if (arrayLen == 0) {
resultArray = (existingArray.size() == 0) ? existingArray
- : (CommonArray) casBeingFilled.createArray(arrayType, 0);
+ : (CommonArrayFS) casBeingFilled.createArray(arrayType, 0);
} else {
if (existingArray.size() == arrayLen) {
updateExistingArray(values, existingArray);
@@ -1284,7 +1284,7 @@ public class XmiCasDeserializer {
resultArray = createNewArray(arrayType, values);
} else { // values are with FS, below the line
- existingArray = (CommonArray) getFsForXmiId(xmiId);
+ existingArray = (CommonArrayFS) getFsForXmiId(xmiId);
if (existingArray.size() == arrayLen) {
updateExistingArray(values, existingArray);
resultArray = existingArray;
@@ -1307,9 +1307,9 @@ public class XmiCasDeserializer {
* List of strings, each containing the value of an element of the array.
* @return a reference to the array FS
*/
- private CommonArray createNewArray(TypeImpl type, List<String> values) {
+ private CommonArrayFS createNewArray(TypeImpl type, List<String> values) {
final int sz = values.size();
- CommonArray fs = (CommonArray) casBeingFilled.createArray(type, sz);
+ CommonArrayFS fs = (CommonArrayFS) casBeingFilled.createArray(type, sz);
if (fs instanceof FSArray) {
final FSArray fsArray = (FSArray) fs;
for (int i = 0; i < sz; i++) {
@@ -1330,7 +1330,7 @@ public class XmiCasDeserializer {
* @param values
* @param existingArray
*/
- private void updateExistingArray(List<String> values, CommonArray existingArray) {
+ private void updateExistingArray(List<String> values, CommonArrayFS existingArray) {
final int sz = values.size();
if (existingArray instanceof FSArray) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java?rev=1775916&r1=1775915&r2=1775916&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java Fri Dec 23 21:52:40 2016
@@ -30,6 +30,7 @@ import org.apache.uima.UIMAFramework;
import org.apache.uima.UIMARuntimeException;
import org.apache.uima.UimaContext;
import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.CommonArrayFS;
import org.apache.uima.cas.Marker;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
@@ -42,7 +43,6 @@ import org.apache.uima.internal.util.Xml
import org.apache.uima.internal.util.XmlElementName;
import org.apache.uima.internal.util.XmlElementNameAndContents;
import org.apache.uima.jcas.cas.ByteArray;
-import org.apache.uima.jcas.cas.CommonArray;
import org.apache.uima.jcas.cas.CommonList;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.Sofa;
@@ -1018,7 +1018,7 @@ public class XmiCasSerializer {
}
StringBuilder buf = new StringBuilder();
- CommonArray fs = (CommonArray) fsIn;
+ CommonArrayFS fs = (CommonArrayFS) fsIn;
String elemStr = null;
// FS arrays: handle shared data items