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 2018/04/19 20:12:06 UTC

svn commit: r1829612 - in /uima/uv3/addons-v3/trunk/ConceptMapper: ./ src/main/java/org/apache/uima/conceptMapper/ src/main/java/org/apache/uima/conceptMapper/support/tokenizer/ src/main/java/uima/tt/

Author: schor
Date: Thu Apr 19 20:12:05 2018
New Revision: 1829612

URL: http://svn.apache.org/viewvc?rev=1829612&view=rev
Log:
[UIMA-5766] updated pom for java 8, depend on uv3, update release notes, migrate from sources - updated 3 jcas classes, update Jira issues version

Removed:
    uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/DictTerm_Type.java
    uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation_Type.java
    uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/uima/tt/TokenAnnotation_Type.java
Modified:
    uima/uv3/addons-v3/trunk/ConceptMapper/RELEASE_NOTES.html
    uima/uv3/addons-v3/trunk/ConceptMapper/pom.xml
    uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/DictTerm.java
    uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation.java
    uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/uima/tt/TokenAnnotation.java

Modified: uima/uv3/addons-v3/trunk/ConceptMapper/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/uima/uv3/addons-v3/trunk/ConceptMapper/RELEASE_NOTES.html?rev=1829612&r1=1829611&r2=1829612&view=diff
==============================================================================
--- uima/uv3/addons-v3/trunk/ConceptMapper/RELEASE_NOTES.html (original)
+++ uima/uv3/addons-v3/trunk/ConceptMapper/RELEASE_NOTES.html Thu Apr 19 20:12:05 2018
@@ -23,7 +23,7 @@
   <title>Apache UIMA Addon: Concept Mapper: Release Notes</title>
 </head>
 <body>
-<h1>Apache UIMA (Unstructured Information Management Architecture) Addon Concept Mapper v2.10.2 Release Notes</h1>
+<h1>Apache UIMA (Unstructured Information Management Architecture) Addon Concept Mapper v3.0.0 Release Notes</h1>
 
 <h2>Contents</h2>
 <p>
@@ -92,16 +92,8 @@
      <a target="_blank" href="https://uima.apache.org/d/uima-addons-current/ConceptMapper/ConceptMapperAnnotatorUserGuide.html">here</a>.  
 
 <h2><a id="major.changes">Major Changes in this Release</a></h2>
-<p>This release updates the Concept Mapper to use the current UIMA annotator APIs. 
-It also adds the improvements:
-<ul>
-  <li>configures buffered I/O for compiled dictionaries</li>
-  <li>adds the ability to specify the tokenizer descriptor by using a reference to a descriptor in the classpath</li>
-  <li>supports creating the compiled dictionary as a side effect of loading a non-compiled dictionary</li>
-</ul>
-Finally, an API Change report is included, documenting the changes in the APIs between this version and
-version 2.3.1.  Most users will be unaffected by this, because they do not use the APIs, but rather
-configure and run the ConceptMapper as a UIMA Annotator.
+<p>This is the same as ConceptMapper v 2.10.2, except it is the UIMA V3 version;
+it depends on UIMA V3.0.0.
 </p>
 <p>Changes were also made to build specification to allow this project to be separately released.
 The binary build was changed to use the normal Maven conventions for naming the JAR artifact.</p>

Modified: uima/uv3/addons-v3/trunk/ConceptMapper/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/addons-v3/trunk/ConceptMapper/pom.xml?rev=1829612&r1=1829611&r2=1829612&view=diff
==============================================================================
--- uima/uv3/addons-v3/trunk/ConceptMapper/pom.xml (original)
+++ uima/uv3/addons-v3/trunk/ConceptMapper/pom.xml Thu Apr 19 20:12:05 2018
@@ -28,7 +28,7 @@
   </parent>
   
   <artifactId>ConceptMapper</artifactId>
-  <version>2.10.3-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <name>Apache UIMA Annotator: ${project.artifactId}</name>
   <description>Extracts concepts from a CAS</description>
   <url>${uimaWebsiteUrl}</url>
@@ -127,9 +127,9 @@
   </pluginRepositories>
   
   <properties>
-    <jiraVersion>ConceptMapper-2.10.2</jiraVersion>
+    <jiraVersion>ConceptMapper-3.0.0</jiraVersion>
     <uimaScmProject>${project.artifactId}</uimaScmProject>
-    <uimaDependencyVersion>2.10.2</uimaDependencyVersion>
+    <uimaDependencyVersion>3.0.0</uimaDependencyVersion>
     <pearMainDescriptor>desc/analysis_engine/primitive/ConceptMapperOffsetTokenizer.xml</pearMainDescriptor>
     <bookNameRoot>ConceptMapperAnnotatorUserGuide</bookNameRoot>
  
@@ -139,8 +139,8 @@
      properties already, they should be injected manually into the plugins. 
     -->    
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.target>1.7</maven.compiler.target>
-    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
     <maven.surefire.heap>512m</maven.surefire.heap>
     <maven.surefire.argLine />
     <maven.surefire.java9 />

Modified: uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/DictTerm.java
URL: http://svn.apache.org/viewvc/uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/DictTerm.java?rev=1829612&r1=1829611&r2=1829612&view=diff
==============================================================================
--- uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/DictTerm.java (original)
+++ uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/DictTerm.java Thu Apr 19 20:12:05 2018
@@ -1,54 +1,91 @@
-
-
 /* First created by JCasGen Sat Dec 22 14:05:15 EST 2007 */
 package org.apache.uima.conceptMapper;
 
-import org.apache.uima.jcas.JCas; 
+/* Migrated by uimaj-v3-migration-jcas, Thu Apr 19 15:42:35 EDT 2018
+ Container: 
+    container [id=0, parent.id=null, root or pathToJarOrPear=C:/au/svnCheckouts/uv3/trunk/ConceptMapper,
+ Path in container: C:/au/svnCheckouts/uv3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/DictTerm.java
+*/
+import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
 import org.apache.uima.jcas.tcas.Annotation;
 import org.apache.uima.jcas.cas.TOP;
 import org.apache.uima.jcas.cas.FSArray;
-
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /** Annotation for dictionary lookup matches
  * Updated by JCasGen Tue Mar 25 15:43:47 EDT 2008
  * XML source: /OtherStuff/IBM/eclipse-apacheuima/conceptMapper/src/org/apache/uima/conceptMapper/DictTerm.xml
  * @generated */
 public class DictTerm extends Annotation {
+
   /** @generated
    * @ordered 
    */
-  public final static int typeIndexID = JCasRegistry.register(DictTerm.class);
+  public static final int typeIndexID = JCasRegistry.register(DictTerm.class);
+
   /** @generated
    * @ordered 
    */
-  public final static int type = typeIndexID;
+  public static final int type = typeIndexID;
+
   /** @generated  */
-  public              int getTypeIndexID() {return typeIndexID;}
- 
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
+
+  public static final String _TypeName = "org.apache.uima.conceptMapper.DictTerm";
+
+  private static final CallSite _FC_DictCanon = TypeSystemImpl.createCallSite(DictTerm.class, "DictCanon");
+
+  private static final MethodHandle _FH_DictCanon = _FC_DictCanon.dynamicInvoker();
+
+  public static final String _FeatName_DictCanon = "DictCanon";
+
+  private static final CallSite _FC_enclosingSpan = TypeSystemImpl.createCallSite(DictTerm.class, "enclosingSpan");
+
+  private static final MethodHandle _FH_enclosingSpan = _FC_enclosingSpan.dynamicInvoker();
+
+  public static final String _FeatName_enclosingSpan = "enclosingSpan";
+
+  private static final CallSite _FC_matchedText = TypeSystemImpl.createCallSite(DictTerm.class, "matchedText");
+
+  private static final MethodHandle _FH_matchedText = _FC_matchedText.dynamicInvoker();
+
+  public static final String _FeatName_matchedText = "matchedText";
+
+  private static final CallSite _FC_matchedTokens = TypeSystemImpl.createCallSite(DictTerm.class, "matchedTokens");
+
+  private static final MethodHandle _FH_matchedTokens = _FC_matchedTokens.dynamicInvoker();
+
+  public static final String _FeatName_matchedTokens = "matchedTokens";
+
   /** Never called.  Disable default constructor
    * @generated */
-  protected DictTerm() {}
-    
+  protected DictTerm() {
+  }
+
   /** Internal - constructor used by generator 
    * @generated 
-   * @param addr -
+   * @param casImpl -
    * @param type -
    */
-  public DictTerm(int addr, TOP_Type type) {
-    super(addr, type);
+  public DictTerm(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
     readObject();
   }
-  
+
   /** @generated 
    * @param jcas -
    */
   public DictTerm(JCas jcas) {
     super(jcas);
-    readObject();   
-  } 
+    readObject();
+  }
 
   /** @generated 
    * @param jcas -
@@ -60,116 +97,94 @@ public class DictTerm extends Annotation
     setBegin(begin);
     setEnd(end);
     readObject();
-  }   
+  }
 
   /** <!-- begin-user-doc -->
     * Write your own initialization here
     * <!-- end-user-doc -->
   @generated modifiable */
-  private void readObject() {}
-     
- 
-    
+  private void readObject() {
+  }
+
   //*--------------*
   //* Feature: DictCanon
-
   /** getter for DictCanon - gets canonical form
    * @generated
    * @return - 
    * */
   public String getDictCanon() {
-    if (DictTerm_Type.featOkTst && ((DictTerm_Type)jcasType).casFeat_DictCanon == null)
-      jcasType.jcas.throwFeatMissing("DictCanon", "org.apache.uima.conceptMapper.DictTerm");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((DictTerm_Type)jcasType).casFeatCode_DictCanon);}
-    
+    return _getStringValueNc(wrapGetIntCatchException(_FH_DictCanon));
+  }
+
   /** setter for DictCanon - sets canonical form 
    * @param v -
    * @generated */
   public void setDictCanon(String v) {
-    if (DictTerm_Type.featOkTst && ((DictTerm_Type)jcasType).casFeat_DictCanon == null)
-      jcasType.jcas.throwFeatMissing("DictCanon", "org.apache.uima.conceptMapper.DictTerm");
-    jcasType.ll_cas.ll_setStringValue(addr, ((DictTerm_Type)jcasType).casFeatCode_DictCanon, v);}    
-   
-    
+    _setStringValueNfc(wrapGetIntCatchException(_FH_DictCanon), v);
+  }
+
   //*--------------*
   //* Feature: enclosingSpan
-
   /** getter for enclosingSpan - gets span that this NoTerm is contained within (i.e. its sentence)
    * @return -
    * @generated */
   public Annotation getEnclosingSpan() {
-    if (DictTerm_Type.featOkTst && ((DictTerm_Type)jcasType).casFeat_enclosingSpan == null)
-      jcasType.jcas.throwFeatMissing("enclosingSpan", "org.apache.uima.conceptMapper.DictTerm");
-    return (Annotation)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr, ((DictTerm_Type)jcasType).casFeatCode_enclosingSpan)));}
-    
+    return (Annotation) (_getFeatureValueNc(wrapGetIntCatchException(_FH_enclosingSpan)));
+  }
+
   /** setter for enclosingSpan - sets span that this NoTerm is contained within (i.e. its sentence)
    * @param v -  
    * @generated */
   public void setEnclosingSpan(Annotation v) {
-    if (DictTerm_Type.featOkTst && ((DictTerm_Type)jcasType).casFeat_enclosingSpan == null)
-      jcasType.jcas.throwFeatMissing("enclosingSpan", "org.apache.uima.conceptMapper.DictTerm");
-    jcasType.ll_cas.ll_setRefValue(addr, ((DictTerm_Type)jcasType).casFeatCode_enclosingSpan, jcasType.ll_cas.ll_getFSRef(v));}    
-   
-    
+    _setFeatureValueNcWj(wrapGetIntCatchException(_FH_enclosingSpan), v);
+  }
+
   //*--------------*
   //* Feature: matchedText
-
   /** getter for matchedText - gets 
    * @return -
    * @generated */
   public String getMatchedText() {
-    if (DictTerm_Type.featOkTst && ((DictTerm_Type)jcasType).casFeat_matchedText == null)
-      jcasType.jcas.throwFeatMissing("matchedText", "org.apache.uima.conceptMapper.DictTerm");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((DictTerm_Type)jcasType).casFeatCode_matchedText);}
-    
+    return _getStringValueNc(wrapGetIntCatchException(_FH_matchedText));
+  }
+
   /** setter for matchedText - sets
    * @param v -  
    * @generated */
   public void setMatchedText(String v) {
-    if (DictTerm_Type.featOkTst && ((DictTerm_Type)jcasType).casFeat_matchedText == null)
-      jcasType.jcas.throwFeatMissing("matchedText", "org.apache.uima.conceptMapper.DictTerm");
-    jcasType.ll_cas.ll_setStringValue(addr, ((DictTerm_Type)jcasType).casFeatCode_matchedText, v);}    
-   
-    
+    _setStringValueNfc(wrapGetIntCatchException(_FH_matchedText), v);
+  }
+
   //*--------------*
   //* Feature: matchedTokens
-
   /** getter for matchedTokens - gets
    * @return - 
    * @generated */
   public FSArray getMatchedTokens() {
-    if (DictTerm_Type.featOkTst && ((DictTerm_Type)jcasType).casFeat_matchedTokens == null)
-      jcasType.jcas.throwFeatMissing("matchedTokens", "org.apache.uima.conceptMapper.DictTerm");
-    return (FSArray)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr, ((DictTerm_Type)jcasType).casFeatCode_matchedTokens)));}
-    
+    return (FSArray) (_getFeatureValueNc(wrapGetIntCatchException(_FH_matchedTokens)));
+  }
+
   /** setter for matchedTokens - sets  
    * @generated 
    * @param v -
    */
   public void setMatchedTokens(FSArray v) {
-    if (DictTerm_Type.featOkTst && ((DictTerm_Type)jcasType).casFeat_matchedTokens == null)
-      jcasType.jcas.throwFeatMissing("matchedTokens", "org.apache.uima.conceptMapper.DictTerm");
-    jcasType.ll_cas.ll_setRefValue(addr, ((DictTerm_Type)jcasType).casFeatCode_matchedTokens, jcasType.ll_cas.ll_getFSRef(v));}    
-    
+    _setFeatureValueNcWj(wrapGetIntCatchException(_FH_matchedTokens), v);
+  }
+
   /** indexed getter for matchedTokens - gets an indexed value - 
    * @param i the index 
    * @return - 
    * @generated */
   public TOP getMatchedTokens(int i) {
-    if (DictTerm_Type.featOkTst && ((DictTerm_Type)jcasType).casFeat_matchedTokens == null)
-      jcasType.jcas.throwFeatMissing("matchedTokens", "org.apache.uima.conceptMapper.DictTerm");
-    jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr, ((DictTerm_Type)jcasType).casFeatCode_matchedTokens), i);
-    return (TOP)(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefArrayValue(jcasType.ll_cas.ll_getRefValue(addr, ((DictTerm_Type)jcasType).casFeatCode_matchedTokens), i)));}
+    return (TOP) (((FSArray) _getFeatureValueNc(wrapGetIntCatchException(_FH_matchedTokens))).get(i));
+  }
 
   /** indexed setter for matchedTokens - sets an indexed value -
    * @param i the index
    * @param v the value to set 
    * @generated */
-  public void setMatchedTokens(int i, TOP v) { 
-    if (DictTerm_Type.featOkTst && ((DictTerm_Type)jcasType).casFeat_matchedTokens == null)
-      jcasType.jcas.throwFeatMissing("matchedTokens", "org.apache.uima.conceptMapper.DictTerm");
-    jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr, ((DictTerm_Type)jcasType).casFeatCode_matchedTokens), i);
-    jcasType.ll_cas.ll_setRefArrayValue(jcasType.ll_cas.ll_getRefValue(addr, ((DictTerm_Type)jcasType).casFeatCode_matchedTokens), i, jcasType.ll_cas.ll_getFSRef(v));}
+  public void setMatchedTokens(int i, TOP v) {
+    ((FSArray) _getFeatureValueNc(wrapGetIntCatchException(_FH_matchedTokens))).set(i, v);
   }
-
-    
\ No newline at end of file
+}

Modified: uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation.java
URL: http://svn.apache.org/viewvc/uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation.java?rev=1829612&r1=1829611&r2=1829612&view=diff
==============================================================================
--- uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation.java (original)
+++ uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation.java Thu Apr 19 20:12:05 2018
@@ -1,51 +1,82 @@
-
-
 /* First created by JCasGen Tue Mar 25 16:39:54 EDT 2008 */
 package org.apache.uima.conceptMapper.support.tokenizer;
 
-import org.apache.uima.jcas.JCas; 
+/* Migrated by uimaj-v3-migration-jcas, Thu Apr 19 15:42:35 EDT 2018
+ Container: 
+    container [id=0, parent.id=null, root or pathToJarOrPear=C:/au/svnCheckouts/uv3/trunk/ConceptMapper,
+ Path in container: C:/au/svnCheckouts/uv3/trunk/ConceptMapper/src/main/java/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation.java
+*/
+import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /** offset tokenizer functionality
  * Updated by JCasGen Tue Mar 25 16:39:54 EDT 2008
  * XML source: /OtherStuff/IBM/eclipse-apacheuima/conceptMapper/src/org/apache/uima/conceptMapper/support/tokenizer/TokenAnnotation.xml
  * @generated */
 public class TokenAnnotation extends uima.tt.TokenAnnotation {
+
   /** @generated
    * @ordered 
    */
-  public final static int typeIndexID = JCasRegistry.register(TokenAnnotation.class);
+  public static final int typeIndexID = JCasRegistry.register(TokenAnnotation.class);
+
   /** @generated
    * @ordered 
    */
-  public final static int type = typeIndexID;
+  public static final int type = typeIndexID;
+
   /** @generated  */
-  public              int getTypeIndexID() {return typeIndexID;}
- 
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
+
+  public static final String _TypeName = "org.apache.uima.conceptMapper.support.tokenizer.TokenAnnotation";
+
+  private static final CallSite _FC_text = TypeSystemImpl.createCallSite(TokenAnnotation.class, "text");
+
+  private static final MethodHandle _FH_text = _FC_text.dynamicInvoker();
+
+  public static final String _FeatName_text = "text";
+
+  private static final CallSite _FC_tokenType = TypeSystemImpl.createCallSite(TokenAnnotation.class, "tokenType");
+
+  private static final MethodHandle _FH_tokenType = _FC_tokenType.dynamicInvoker();
+
+  public static final String _FeatName_tokenType = "tokenType";
+
+  private static final CallSite _FC_tokenClass = TypeSystemImpl.createCallSite(TokenAnnotation.class, "tokenClass");
+
+  private static final MethodHandle _FH_tokenClass = _FC_tokenClass.dynamicInvoker();
+
+  public static final String _FeatName_tokenClass = "tokenClass";
+
   /** Never called.  Disable default constructor
    * @generated */
-  protected TokenAnnotation() {}
-    
+  protected TokenAnnotation() {
+  }
+
   /** Internal - constructor used by generator 
    * @generated 
-   * @param addr -
+   * @param casImpl -
    * @param type -
    */
-  public TokenAnnotation(int addr, TOP_Type type) {
-    super(addr, type);
+  public TokenAnnotation(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
     readObject();
   }
-  
+
   /** @generated 
    * @param jcas -
    */
   public TokenAnnotation(JCas jcas) {
     super(jcas);
-    readObject();   
-  } 
+    readObject();
+  }
 
   /** @generated 
    * @param jcas -
@@ -57,80 +88,66 @@ public class TokenAnnotation extends uim
     setBegin(begin);
     setEnd(end);
     readObject();
-  }   
+  }
 
   /** <!-- begin-user-doc -->
     * Write your own initialization here
     * <!-- end-user-doc -->
   @generated modifiable */
-  private void readObject() {}
-     
- 
-    
+  private void readObject() {
+  }
+
   //*--------------*
   //* Feature: text
-
   /** getter for text - gets text of token
    * @generated 
    * @return -
    */
   public String getText() {
-    if (TokenAnnotation_Type.featOkTst && ((TokenAnnotation_Type)jcasType).casFeat_text == null)
-      jcasType.jcas.throwFeatMissing("text", "org.apache.uima.conceptMapper.support.tokenizer.TokenAnnotation");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((TokenAnnotation_Type)jcasType).casFeatCode_text);}
-    
+    return _getStringValueNc(wrapGetIntCatchException(_FH_text));
+  }
+
   /** setter for text - sets text of token 
    * @generated 
    * @param v -
    */
   public void setText(String v) {
-    if (TokenAnnotation_Type.featOkTst && ((TokenAnnotation_Type)jcasType).casFeat_text == null)
-      jcasType.jcas.throwFeatMissing("text", "org.apache.uima.conceptMapper.support.tokenizer.TokenAnnotation");
-    jcasType.ll_cas.ll_setStringValue(addr, ((TokenAnnotation_Type)jcasType).casFeatCode_text, v);}    
-   
-    
+    _setStringValueNfc(wrapGetIntCatchException(_FH_text), v);
+  }
+
   //*--------------*
   //* Feature: tokenType
-
   /** getter for tokenType - gets 
    * @generated 
    * @return -
    */
   public int getTokenType() {
-    if (TokenAnnotation_Type.featOkTst && ((TokenAnnotation_Type)jcasType).casFeat_tokenType == null)
-      jcasType.jcas.throwFeatMissing("tokenType", "org.apache.uima.conceptMapper.support.tokenizer.TokenAnnotation");
-    return jcasType.ll_cas.ll_getIntValue(addr, ((TokenAnnotation_Type)jcasType).casFeatCode_tokenType);}
-    
+    return _getIntValueNc(wrapGetIntCatchException(_FH_tokenType));
+  }
+
   /** setter for tokenType - sets  
    * @generated 
    * @param v -
    */
   public void setTokenType(int v) {
-    if (TokenAnnotation_Type.featOkTst && ((TokenAnnotation_Type)jcasType).casFeat_tokenType == null)
-      jcasType.jcas.throwFeatMissing("tokenType", "org.apache.uima.conceptMapper.support.tokenizer.TokenAnnotation");
-    jcasType.ll_cas.ll_setIntValue(addr, ((TokenAnnotation_Type)jcasType).casFeatCode_tokenType, v);}    
-   
-    
+    _setIntValueNfc(wrapGetIntCatchException(_FH_tokenType), v);
+  }
+
   //*--------------*
   //* Feature: tokenClass
-
   /** getter for tokenClass - gets semantic class, or other such classification of this token
    * @generated 
    * @return -
    */
   public String getTokenClass() {
-    if (TokenAnnotation_Type.featOkTst && ((TokenAnnotation_Type)jcasType).casFeat_tokenClass == null)
-      jcasType.jcas.throwFeatMissing("tokenClass", "org.apache.uima.conceptMapper.support.tokenizer.TokenAnnotation");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((TokenAnnotation_Type)jcasType).casFeatCode_tokenClass);}
-    
+    return _getStringValueNc(wrapGetIntCatchException(_FH_tokenClass));
+  }
+
   /** setter for tokenClass - sets semantic class, or other such classification of this token 
    * @generated 
    * @param v -
    */
   public void setTokenClass(String v) {
-    if (TokenAnnotation_Type.featOkTst && ((TokenAnnotation_Type)jcasType).casFeat_tokenClass == null)
-      jcasType.jcas.throwFeatMissing("tokenClass", "org.apache.uima.conceptMapper.support.tokenizer.TokenAnnotation");
-    jcasType.ll_cas.ll_setStringValue(addr, ((TokenAnnotation_Type)jcasType).casFeatCode_tokenClass, v);}    
+    _setStringValueNfc(wrapGetIntCatchException(_FH_tokenClass), v);
   }
-
-    
\ No newline at end of file
+}

Modified: uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/uima/tt/TokenAnnotation.java
URL: http://svn.apache.org/viewvc/uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/uima/tt/TokenAnnotation.java?rev=1829612&r1=1829611&r2=1829612&view=diff
==============================================================================
--- uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/uima/tt/TokenAnnotation.java (original)
+++ uima/uv3/addons-v3/trunk/ConceptMapper/src/main/java/uima/tt/TokenAnnotation.java Thu Apr 19 20:12:05 2018
@@ -1,52 +1,65 @@
-
-
 /* First created by JCasGen Mon Jun 23 14:44:24 CEST 2008 */
 package uima.tt;
 
-import org.apache.uima.jcas.JCas; 
+/* Migrated by uimaj-v3-migration-jcas, Thu Apr 19 15:42:36 EDT 2018
+ Container: 
+    container [id=0, parent.id=null, root or pathToJarOrPear=C:/au/svnCheckouts/uv3/trunk/ConceptMapper,
+ Path in container: C:/au/svnCheckouts/uv3/trunk/ConceptMapper/src/main/java/uima/tt/TokenAnnotation.java
+*/
+import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
 import org.apache.uima.jcas.tcas.Annotation;
-
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /** 
  * Updated by JCasGen Mon Jun 23 14:44:24 CEST 2008
  * XML source: D:/code/eclipse330/apache/ConceptMapper/desc/analysis_engine/primitive/OffsetTokenizer.xml
  * @generated */
 public class TokenAnnotation extends Annotation {
+
   /** @generated
    * @ordered 
    */
-  public final static int typeIndexID = JCasRegistry.register(TokenAnnotation.class);
+  public static final int typeIndexID = JCasRegistry.register(TokenAnnotation.class);
+
   /** @generated
    * @ordered 
    */
-  public final static int type = typeIndexID;
+  public static final int type = typeIndexID;
+
   /** @generated  */
-  public              int getTypeIndexID() {return typeIndexID;}
- 
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
+
+  public static final String _TypeName = "uima.tt.TokenAnnotation";
+
   /** Never called.  Disable default constructor
    * @generated */
-  protected TokenAnnotation() {}
-    
+  protected TokenAnnotation() {
+  }
+
   /** Internal - constructor used by generator 
    * @generated 
-   * @param addr -
+   * @param casImpl -
    * @param type -
    */
-  public TokenAnnotation(int addr, TOP_Type type) {
-    super(addr, type);
+  public TokenAnnotation(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
     readObject();
   }
-  
+
   /** @generated 
    * @param jcas -
    */
   public TokenAnnotation(JCas jcas) {
     super(jcas);
-    readObject();   
-  } 
+    readObject();
+  }
 
   /** @generated 
    * @param jcas -
@@ -58,14 +71,12 @@ public class TokenAnnotation extends Ann
     setBegin(begin);
     setEnd(end);
     readObject();
-  }   
+  }
 
   /** <!-- begin-user-doc -->
     * Write your own initialization here
     * <!-- end-user-doc -->
   @generated modifiable */
-  private void readObject() {}
-     
+  private void readObject() {
+  }
 }
-
-    
\ No newline at end of file