svn commit: r1772777 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java

[sc...@apache.org]

Author: schor
Date: Mon Dec  5 20:09:18 2016
New Revision: 1772777

URL: http://svn.apache.org/viewvc?rev=1772777&view=rev
Log:
no jira - slight refactoring to allow reuse for pear method

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java?rev=1772777&r1=1772776&r2=1772777&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java Mon Dec  5 20:09:18 2016
@@ -565,9 +565,18 @@ public class FeatureStructureImplC imple
   protected <N extends TOP> N _maybeGetBaseForPearFs(N v) {
     return (v == null) 
              ? null
-             : v._isPearTrampoline() 
-                 ? v._casView.getBaseFsFromTrampoline(v)
-                 : v;
+             : v._maybeGetBaseForPearFs();
+  }
+  
+  /**
+   * Called to convert to the base FS from a Pear version
+   * @param <N> the type of the FS
+   * @return the FS or if it was a trampoline, the base FS
+   */
+  public <N extends TOP> N _maybeGetBaseForPearFs() {
+    return this._isPearTrampoline() 
+             ? _casView.getBaseFsFromTrampoline((N) this)
+             : (N) this;
   }
   
   /**
@@ -581,6 +590,17 @@ public class FeatureStructureImplC imple
       ? CASImpl.pearConvert(v)
       : v;
   }
+ 
+  /**
+   * @param <N> the type of the FS
+   * @return the FS or if we're in a Pear context and  
+   *    the PEAR defines a different version, the PEAR version.
+   */
+  public <N extends TOP> N _maybeGetPearFs() {
+    return (_casView.inPearContext()) 
+        ? CASImpl.pearConvert((N) this)
+        : (N) this;
+  }
   
   /**
    * Nc - no check, Wj = with journaling if needed