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/02/09 23:16:57 UTC
svn commit: r1729487 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl:
XCASDeserializer.java XCASSerializer.java XmiCasDeserializer.java
Author: schor
Date: Tue Feb 9 22:16:56 2016
New Revision: 1729487
URL: http://svn.apache.org/viewvc?rev=1729487&view=rev
Log:
[UIMA-4674] use viewcount instead of sofa count if that's what's meant; use common approach for signalling internal error, comment cleanup.
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java?rev=1729487&r1=1729486&r2=1729487&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java Tue Feb 9 22:16:56 2016
@@ -38,6 +38,7 @@ import org.apache.uima.jcas.cas.CommonPr
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.Sofa;
import org.apache.uima.jcas.cas.TOP;
+import org.apache.uima.util.Misc;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
@@ -831,7 +832,7 @@ public class XCASDeserializer {
try {
ac.close();
} catch (Exception e) {
- assert(false);
+ Misc.internalError();
}
}
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java?rev=1729487&r1=1729486&r2=1729487&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java Tue Feb 9 22:16:56 2016
@@ -344,7 +344,7 @@ public class XCASSerializer {
// Get indexes for each SofaFS in the CAS
- for (int sofaNum = 1, numViews = cas.getBaseSofaCount(); sofaNum <= numViews; sofaNum++) {
+ for (int sofaNum = 1, numViews = cas.getViewCount(); sofaNum <= numViews; sofaNum++) {
FSIndexRepositoryImpl viewIR = (FSIndexRepositoryImpl) cas.getBaseCAS().getSofaIndexRepository(sofaNum);
if (viewIR != null) {
enqueueList(viewIR.getIndexedFSs(), sofaNum);
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=1729487&r1=1729486&r2=1729487&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 Tue Feb 9 22:16:56 2016
@@ -301,7 +301,7 @@ public class XmiCasDeserializer {
//new Sofas start at 2
this.nextSofaNum = 2;
} else {
- this.nextSofaNum = this.casBeingFilled.getBaseSofaCount() + 1;
+ this.nextSofaNum = this.casBeingFilled.getViewCount() + 1;
}
this.buffer = new StringBuilder();
this.indexRepositories = new ArrayList<FSIndexRepository>();
@@ -966,7 +966,7 @@ public class XmiCasDeserializer {
}
/**
- * called from endElement after collecting non-byte array element instances into a string list for a particular array feature
+ * called from endElement after collecting non-byte array element instances into a string list for a particular array or list feature
* (excluding oots and deferred FSs)
* @param type -
* @param fs -
@@ -1118,6 +1118,9 @@ public class XmiCasDeserializer {
*
* used for arrays and lists
*
+ * NOTE: we deserialized arrays and lists encoded this way, even if the type system
+ * indicates the feature is multi-ref-allowed. (in this case, although allowed, it is not multi-refed)
+ *
* @param addr
* address of FS containing the feature
* @param fi the feature being set
@@ -1740,7 +1743,7 @@ public class XmiCasDeserializer {
try {
ac.close();
} catch (Exception e1) {
- assert(false);
+ Misc.internalError();
}
}
}