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

[sc...@apache.org]

Author: schor
Date: Tue Aug  2 18:58:13 2016
New Revision: 1754990

URL: http://svn.apache.org/viewvc?rev=1754990&view=rev
Log:
no Jira - rename fs.id() to fs._id() to avoid colliding with user methods, also _getTypeImpl()

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=1754990&r1=1754989&r2=1754990&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 Tue Aug  2 18:58:13 2016
@@ -588,7 +588,7 @@ public class CasCopier {
   //      while (iter.isValid()) {
   //        final int fs = iter.ll_get();
   //        iter.moveToNext();
-        if (!indexedFsAlreadyCopied.contains(fs.id())) {
+        if (!indexedFsAlreadyCopied.contains(fs._id())) {
           final TOP copyOfFs = copyFs2(fs);
           // If the lenient option is used, it's possible that no FS was
           // created (e.g., FS is not defined in the target CAS. So ignore
@@ -614,7 +614,7 @@ public class CasCopier {
           if (!isDocumentAnnotation(fs)) {
             tgtCasViewImpl.getIndexRepository().addFS(copyOfFs);
           }
-          indexedFsAlreadyCopied.add(fs.id());
+          indexedFsAlreadyCopied.add(fs._id());
         }
       }
     } finally {
@@ -844,7 +844,7 @@ public class CasCopier {
    */
   private <T extends FeatureStructure> void copyFeatures(T srcFSi, T tgtFSi) {
     TOP srcFS = (TOP) srcFSi;
-    TypeImpl ti = srcFS.getTypeImpl();
+    TypeImpl ti = srcFS._getTypeImpl();
     
     TOP tgtFS = (TOP) tgtFSi;