svn commit: r1357482 - /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java

[jo...@apache.org]

Author: joern
Date: Thu Jul  5 07:32:22 2012
New Revision: 1357482

URL: http://svn.apache.org/viewvc?rev=1357482&view=rev
Log:
 UIMA-2409 Reverted back to revision 1037752.

Modified:
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java?rev=1357482&r1=1357481&r2=1357482&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java Thu Jul  5 07:32:22 2012
@@ -111,21 +111,19 @@ public class CasCopier {
 
   /**
    * Does a deep copy of the contents of one CAS View into another CAS.
-   * If a view with the same name as <code>aDestCasView</code> exists in the destination CAS,
+   * If a view with the same name as <code>aSrcCasView</code> exists in the destination CAS,
    * then it will be the target of the copy.  Otherwise, a new view will be created with
    * that name and will become the target of the copy.  All FeatureStructures that are indexed 
    * in the source CAS view will become indexed in the target view.
    * 
    * @param aSrcCasView
    *          the CAS to copy from
-   * @param aDestCasView
-   *          the destination CAS view
    * @param aCopySofa
    *          if true, the sofa data and mimeType will be copied. If false they will not.
    */
-  public void copyCasView(CAS aSrcCasView, String aDestCasView, boolean aCopySofa) {
+  public void copyCasView(CAS aSrcCasView, boolean aCopySofa) {
     //get or create the target view
-    CAS targetView = getOrCreateView(mDestCas, aDestCasView);
+    CAS targetView = getOrCreateView(mDestCas, aSrcCasView.getViewName());
     
     if (aCopySofa) {
       // can't copy the SofaFS - just copy the sofa data and mime type
@@ -170,22 +168,6 @@ public class CasCopier {
   }
 
   /**
-   * Does a deep copy of the contents of one CAS View into another CAS.
-   * If a view with the same name as <code>aSrcCasView</code> exists in the destination CAS,
-   * then it will be the target of the copy.  Otherwise, a new view will be created with
-   * that name and will become the target of the copy.  All FeatureStructures that are indexed 
-   * in the source CAS view will become indexed in the target view.
-   * 
-   * @param aSrcCasView
-   *          the CAS to copy from
-   * @param aCopySofa
-   *          if true, the sofa data and mimeType will be copied. If false they will not.
-   */
-  public void copyCasView(CAS aSrcCasView, boolean aCopySofa) {
-    copyCasView(aSrcCasView, aSrcCasView.getViewName(), aCopySofa);
-  }
-  
-  /**
    * For long lists, and other structures, the straight-forward impl with recursion can
    * nest too deep, causing a Java failure - out of stack space.
    *