Author: schor
Date: Fri Aug 26 15:43:54 2016
New Revision: 1757885
URL: http://svn.apache.org/viewvc?rev=1757885&view=rev
Log:
[UIMA-4685] catchup merge from trunk
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
(contents, props changed)
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java?rev=1757885&r1=1757884&r2=1757885&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
Fri Aug 26 15:43:54 2016
@@ -60,7 +60,7 @@ public class CASMgrSerializer implements
// encoded explicitly. I.e., the fact that tokens are in any index that
// annotations are in is implicit.
- public int[] typeOrder;
+ public int[] typeOrder = null;
/**
* The index identifiers. Note that more than one identifier can refer to
the same index.
@@ -108,7 +108,8 @@ public class CASMgrSerializer implements
// Type system encoding.
/**
- * A list of type names (symbol table). Note: numbering of types starts at
<code>1</code>, and
+ * A list of type names (symbol table). fs-typed arrays have names XXXX[].
+ * Note: numbering of types starts at <code>1</code>, and
* we index the names according to their internal code. That means that
* <code>typeNames[0] == null</code>.
*/
@@ -524,4 +525,7 @@ public class CASMgrSerializer implements
return ir;
}
+ public boolean hasIndexRepository() {
+ return this.typeOrder != null;
+ }
}
Propchange:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 26 15:43:54 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java:1690273-1757884
