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/05/13 20:10:00 UTC

svn commit: r1743745 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java

Author: schor
Date: Fri May 13 20:10:00 2016
New Revision: 1743745

URL: http://svn.apache.org/viewvc?rev=1743745&view=rev
Log:
[UIMA-4674] _typeImpl not final (to support ll_setInt backward compatibility), change refs to it to _getTypeImpl() for protection, plus minor updates to tests

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.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=1743745&r1=1743744&r2=1743745&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 May 13 20:10:00 2016
@@ -579,7 +579,7 @@ public class CasCopier {
   
       while (it.hasNext()) {
         final TOP fs = it.nextNvc();
-  //      System.out.format("debug  id: %,d  type: %s%n", fs.id(), fs._typeImpl.getShortName());
+  //      System.out.format("debug  id: %,d  type: %s%n", fs.id(), fs._getTypeImpl().getShortName());
   //    Iterator<LowLevelIndex> indexes = srcCasViewImpl.getIndexRepository().ll_getIndexes();
   //    while (indexes.hasNext()) {
   //      LowLevelIndex index = indexes.next();
@@ -771,7 +771,7 @@ public class CasCopier {
       return copy;
     }
 
-    TypeImpl tgtTi = getTargetType(((TOP)srcFs)._typeImpl);
+    TypeImpl tgtTi = getTargetType(((TOP)srcFs)._getTypeImpl());
     if (null == tgtTi) {
       return null; // not in target, no FS to create
     }
@@ -965,7 +965,7 @@ public class CasCopier {
   private TOP copyArray(TOP srcFS) {
     final CommonArray srcCA = (CommonArray) srcFS;
     final int size = srcCA.size();
-    final TypeImpl tgtTi = getTargetType(((TOP)srcFS)._typeImpl);  // could be null for src = e.g. Annotation[]
+    final TypeImpl tgtTi = getTargetType(((TOP)srcFS)._getTypeImpl());  // could be null for src = e.g. Annotation[]
     
     if (tgtTi == null) {
       return null; // can't copy