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/08/02 13:44:31 UTC

svn commit: r1754917 - in /uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java: example/ org/apache/uima/examples/tokenizer/ org/apache/uima/tutorial/

Author: schor
Date: Tue Aug  2 13:44:31 2016
New Revision: 1754917

URL: http://svn.apache.org/viewvc?rev=1754917&view=rev
Log:
[UIMA-4666] update the JCas types in examples for v3

Removed:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting_Type.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot_Type.java
Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/example/PersonTitle.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java
    uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/example/PersonTitle.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/example/PersonTitle.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/example/PersonTitle.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/example/PersonTitle.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,99 +16,98 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package example;
 
 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.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /**
  * A Personal Title. Updated by JCasGen Mon May 23 17:48:43 EDT 2005 XML source:
  * c:\a\eclipse\301jxe\jedii_examples\descriptors\analysis_engine\NamesAndPersonTitles_TAE.xml
- * 
+ *
  * @generated
  */
 public class PersonTitle extends Annotation {
-  /**
+
+    /**
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasRegistry.register(PersonTitle.class);
+    public static final int typeIndexID = JCasRegistry.register(PersonTitle.class);
 
-  /**
+    /**
    * @generated
    * @ordered
    */
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
+    /** @generated */
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
 
-  /**
+    public static final int _FI_Kind = TypeSystemImpl.getAdjustedFeatureOffset("Kind");
+
+    /**
    * Never called. Disable default constructor
-   * 
+   *
    * @generated
    */
-  protected PersonTitle() {
-  }
+    protected  PersonTitle() {
+    }
 
-  /**
+    /**
    * Internal - constructor used by generator
-   * 
+   *
    * @generated
    */
-  public PersonTitle(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public PersonTitle(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  public PersonTitle(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
+    public  PersonTitle(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+        readObject();
+    }
+
+    /** @generated */
+    public  PersonTitle(JCas jcas) {
+        super(jcas);
+        readObject();
+    }
+
+    public  PersonTitle(JCas jcas, int begin, int end) {
+        super(jcas);
+        setBegin(begin);
+        setEnd(end);
+        readObject();
+    }
 
-  /**
+    /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
+   *
    * @generated modifiable
    */
-  private void readObject() {
-  }
-
-  // *--------------*
-  // * Feature: Kind
+    private void readObject() {
+    }
 
-  /**
+    // *--------------*
+    // * Feature: Kind
+    /**
    * getter for Kind - gets The kind of title - Civilian, Military, or Government.
-   * 
+   *
    * @generated
    */
-  public String getKind() {
-    if (PersonTitle_Type.featOkTst && ((PersonTitle_Type) jcasType).casFeat_Kind == null)
-      this.jcasType.jcas.throwFeatMissing("Kind", "example.PersonTitle");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((PersonTitle_Type) jcasType).casFeatCode_Kind);
-  }
+    public String getKind() {
+        return _getStringValueNc(_FI_Kind);
+    }
 
-  /**
+    /**
    * setter for Kind - sets The kind of title - Civilian, Military, or Government.
-   * 
+   *
    * @generated
    */
-  public void setKind(String v) {
-    if (PersonTitle_Type.featOkTst && ((PersonTitle_Type) jcasType).casFeat_Kind == null)
-      this.jcasType.jcas.throwFeatMissing("Kind", "example.PersonTitle");
-    jcasType.ll_cas.ll_setStringValue(addr, ((PersonTitle_Type) jcasType).casFeatCode_Kind, v);
-  }
+    public void setKind(String v) {
+        _setStringValueNfc(_FI_Kind, v);
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,38 +16,39 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.examples.tokenizer;
 
 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.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 public class Sentence extends Annotation {
 
-  public final static int typeIndexID = JCasRegistry.register(Sentence.class);
+    public static final int typeIndexID = JCasRegistry.register(Sentence.class);
 
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  // Never called. Disable default constructor
-  protected Sentence() {
-  }
-
-  /** Internal - Constructor used by generator */
-  public Sentence(int addr, TOP_Type type) {
-    super(addr, type);
-  }
-
-  public Sentence(JCas jcas) {
-    super(jcas);
-  }
-
-  public Sentence(JCas jcas, int start, int end) {
-    super(jcas, start, end);
-  }
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
+
+    // Never called. Disable default constructor
+    protected  Sentence() {
+    }
+
+    /** Internal - Constructor used by generator */
+    public  Sentence(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+    }
+
+    public  Sentence(JCas jcas) {
+        super(jcas);
+    }
+
+    public  Sentence(JCas jcas, int start, int end) {
+        super(jcas, start, end);
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,38 +16,39 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.examples.tokenizer;
 
 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.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 public class Token extends Annotation {
 
-  public final static int typeIndexID = JCasRegistry.register(Token.class);
+    public static final int typeIndexID = JCasRegistry.register(Token.class);
 
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
-
-  // Never called. Disable default constructor
-  protected Token() {
-  }
-
-  /** Internal - Constructor used by generator */
-  public Token(int addr, TOP_Type type) {
-    super(addr, type);
-  }
-
-  public Token(JCas jcas) {
-    super(jcas);
-  }
-
-  public Token(JCas jcas, int start, int end) {
-    super(jcas, start, end);
-  }
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
+
+    // Never called. Disable default constructor
+    protected  Token() {
+    }
+
+    /** Internal - Constructor used by generator */
+    public  Token(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+    }
+
+    public  Token(JCas jcas) {
+        super(jcas);
+    }
+
+    public  Token(JCas jcas, int start, int end) {
+        super(jcas, start, end);
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,74 +16,75 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.tutorial;
 
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
+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 Nov 29 15:02:38 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * 
+ *
  * @generated
  */
 public class DateAnnot extends DateTimeAnnot {
-  /**
+
+    /**
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasRegistry.register(DateAnnot.class);
+    public static final int typeIndexID = JCasRegistry.register(DateAnnot.class);
 
-  /**
+    /**
    * @generated
    * @ordered
    */
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
+    /** @generated */
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
 
-  /**
+    /**
    * Never called. Disable default constructor
-   * 
+   *
    * @generated
    */
-  protected DateAnnot() {
-  }
+    protected  DateAnnot() {
+    }
 
-  /**
+    /**
    * Internal - constructor used by generator
-   * 
+   *
    * @generated
    */
-  public DateAnnot(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public DateAnnot(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  public DateAnnot(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
+    public  DateAnnot(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+        readObject();
+    }
+
+    /** @generated */
+    public  DateAnnot(JCas jcas) {
+        super(jcas);
+        readObject();
+    }
+
+    public  DateAnnot(JCas jcas, int begin, int end) {
+        super(jcas);
+        setBegin(begin);
+        setEnd(end);
+        readObject();
+    }
 
-  /**
+    /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
+   *
    * @generated modifiable
    */
-  private void readObject() {
-  }
-
+    private void readObject() {
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,103 +16,98 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.tutorial;
 
 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.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /**
  * Updated by JCasGen Mon Nov 29 15:02:38 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * 
+ *
  * @generated
  */
 public class DateTimeAnnot extends Annotation {
-  /**
+
+    /**
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasRegistry.register(DateTimeAnnot.class);
+    public static final int typeIndexID = JCasRegistry.register(DateTimeAnnot.class);
 
-  /**
+    /**
    * @generated
    * @ordered
    */
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
+    /** @generated */
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
 
-  /**
+    public static final int _FI_shortDateString = TypeSystemImpl.getAdjustedFeatureOffset("shortDateString");
+
+    /**
    * Never called. Disable default constructor
-   * 
+   *
    * @generated
    */
-  protected DateTimeAnnot() {
-  }
+    protected  DateTimeAnnot() {
+    }
 
-  /**
+    /**
    * Internal - constructor used by generator
-   * 
+   *
    * @generated
    */
-  public DateTimeAnnot(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public DateTimeAnnot(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  public DateTimeAnnot(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
+    public  DateTimeAnnot(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+        readObject();
+    }
+
+    /** @generated */
+    public  DateTimeAnnot(JCas jcas) {
+        super(jcas);
+        readObject();
+    }
+
+    public  DateTimeAnnot(JCas jcas, int begin, int end) {
+        super(jcas);
+        setBegin(begin);
+        setEnd(end);
+        readObject();
+    }
 
-  /**
+    /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
+   *
    * @generated modifiable
    */
-  private void readObject() {
-  }
-
-  // *--------------*
-  // * Feature: shortDateString
+    private void readObject() {
+    }
 
-  /**
+    // *--------------*
+    // * Feature: shortDateString
+    /**
    * getter for shortDateString - gets
-   * 
+   *
    * @generated
    */
-  public String getShortDateString() {
-    if (DateTimeAnnot_Type.featOkTst
-            && ((DateTimeAnnot_Type) jcasType).casFeat_shortDateString == null)
-      this.jcasType.jcas.throwFeatMissing("shortDateString", "org.apache.uima.tutorial.DateTimeAnnot");
-    return jcasType.ll_cas.ll_getStringValue(addr,
-            ((DateTimeAnnot_Type) jcasType).casFeatCode_shortDateString);
-  }
+    public String getShortDateString() {
+        return _getStringValueNc(_FI_shortDateString);
+    }
 
-  /**
+    /**
    * setter for shortDateString - sets
-   * 
+   *
    * @generated
    */
-  public void setShortDateString(String v) {
-    if (DateTimeAnnot_Type.featOkTst
-            && ((DateTimeAnnot_Type) jcasType).casFeat_shortDateString == null)
-      this.jcasType.jcas.throwFeatMissing("shortDateString", "org.apache.uima.tutorial.DateTimeAnnot");
-    jcasType.ll_cas.ll_setStringValue(addr,
-            ((DateTimeAnnot_Type) jcasType).casFeatCode_shortDateString, v);
-  }
+    public void setShortDateString(String v) {
+        _setStringValueNfc(_FI_shortDateString, v);
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,198 +16,177 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.tutorial;
 
 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.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /**
  * Updated by JCasGen Mon Nov 29 15:02:38 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * 
+ *
  * @generated
  */
 public class Meeting extends Annotation {
-  /**
+
+    /**
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasRegistry.register(Meeting.class);
+    public static final int typeIndexID = JCasRegistry.register(Meeting.class);
 
-  /**
+    /**
    * @generated
    * @ordered
    */
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
+
+    /** @generated */
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
+
+    public static final int _FI_room = TypeSystemImpl.getAdjustedFeatureOffset("room");
+
+    public static final int _FI_date = TypeSystemImpl.getAdjustedFeatureOffset("date");
+
+    public static final int _FI_startTime = TypeSystemImpl.getAdjustedFeatureOffset("startTime");
 
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
+    public static final int _FI_endTime = TypeSystemImpl.getAdjustedFeatureOffset("endTime");
 
-  /**
+    /**
    * Never called. Disable default constructor
-   * 
+   *
    * @generated
    */
-  protected Meeting() {
-  }
+    protected  Meeting() {
+    }
 
-  /**
+    /**
    * Internal - constructor used by generator
-   * 
+   *
    * @generated
    */
-  public Meeting(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public Meeting(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  public Meeting(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
+    public  Meeting(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+        readObject();
+    }
+
+    /** @generated */
+    public  Meeting(JCas jcas) {
+        super(jcas);
+        readObject();
+    }
+
+    public  Meeting(JCas jcas, int begin, int end) {
+        super(jcas);
+        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: room
-
-  /**
+    // *--------------*
+    // * Feature: room
+    /**
    * getter for room - gets
-   * 
+   *
    * @generated
    */
-  public RoomNumber getRoom() {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_room == null)
-      this.jcasType.jcas.throwFeatMissing("room", "org.apache.uima.tutorial.Meeting");
-    return (RoomNumber) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Meeting_Type) jcasType).casFeatCode_room)));
-  }
+    public RoomNumber getRoom() {
+        return (RoomNumber) (_getFeatureValueNc(_FI_room));
+    }
 
-  /**
+    /**
    * setter for room - sets
-   * 
+   *
    * @generated
    */
-  public void setRoom(RoomNumber v) {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_room == null)
-      this.jcasType.jcas.throwFeatMissing("room", "org.apache.uima.tutorial.Meeting");
-    jcasType.ll_cas.ll_setRefValue(addr, ((Meeting_Type) jcasType).casFeatCode_room,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  // *--------------*
-  // * Feature: date
+    public void setRoom(RoomNumber v) {
+        _setFeatureValueNcWj(_FI_room, v);
+    }
 
-  /**
+    // *--------------*
+    // * Feature: date
+    /**
    * getter for date - gets
-   * 
+   *
    * @generated
    */
-  public DateAnnot getDate() {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_date == null)
-      this.jcasType.jcas.throwFeatMissing("date", "org.apache.uima.tutorial.Meeting");
-    return (DateAnnot) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Meeting_Type) jcasType).casFeatCode_date)));
-  }
+    public DateAnnot getDate() {
+        return (DateAnnot) (_getFeatureValueNc(_FI_date));
+    }
 
-  /**
+    /**
    * setter for date - sets
-   * 
+   *
    * @generated
    */
-  public void setDate(DateAnnot v) {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_date == null)
-      this.jcasType.jcas.throwFeatMissing("date", "org.apache.uima.tutorial.Meeting");
-    jcasType.ll_cas.ll_setRefValue(addr, ((Meeting_Type) jcasType).casFeatCode_date,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  // *--------------*
-  // * Feature: startTime
+    public void setDate(DateAnnot v) {
+        _setFeatureValueNcWj(_FI_date, v);
+    }
 
-  /**
+    // *--------------*
+    // * Feature: startTime
+    /**
    * getter for startTime - gets
-   * 
+   *
    * @generated
    */
-  public TimeAnnot getStartTime() {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_startTime == null)
-      this.jcasType.jcas.throwFeatMissing("startTime", "org.apache.uima.tutorial.Meeting");
-    return (TimeAnnot) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Meeting_Type) jcasType).casFeatCode_startTime)));
-  }
+    public TimeAnnot getStartTime() {
+        return (TimeAnnot) (_getFeatureValueNc(_FI_startTime));
+    }
 
-  /**
+    /**
    * setter for startTime - sets
-   * 
+   *
    * @generated
    */
-  public void setStartTime(TimeAnnot v) {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_startTime == null)
-      this.jcasType.jcas.throwFeatMissing("startTime", "org.apache.uima.tutorial.Meeting");
-    jcasType.ll_cas.ll_setRefValue(addr, ((Meeting_Type) jcasType).casFeatCode_startTime,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
+    public void setStartTime(TimeAnnot v) {
+        _setFeatureValueNcWj(_FI_startTime, v);
+    }
 
-  // *--------------*
-  // * Feature: endTime
-
-  /**
+    // *--------------*
+    // * Feature: endTime
+    /**
    * getter for endTime - gets
-   * 
+   *
    * @generated
    */
-  public TimeAnnot getEndTime() {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_endTime == null)
-      this.jcasType.jcas.throwFeatMissing("endTime", "org.apache.uima.tutorial.Meeting");
-    return (TimeAnnot) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
-            ((Meeting_Type) jcasType).casFeatCode_endTime)));
-  }
+    public TimeAnnot getEndTime() {
+        return (TimeAnnot) (_getFeatureValueNc(_FI_endTime));
+    }
 
-  /**
+    /**
    * setter for endTime - sets
-   * 
+   *
    * @generated
    */
-  public void setEndTime(TimeAnnot v) {
-    if (Meeting_Type.featOkTst && ((Meeting_Type) jcasType).casFeat_endTime == null)
-      this.jcasType.jcas.throwFeatMissing("endTime", "org.apache.uima.tutorial.Meeting");
-    jcasType.ll_cas.ll_setRefValue(addr, ((Meeting_Type) jcasType).casFeatCode_endTime,
-            jcasType.ll_cas.ll_getFSRef(v));
-  }
-
-  /** Custom constructor taking all parameters */
-  public Meeting(JCas jcas, int start, int end, RoomNumber room, DateAnnot date,
-          TimeAnnot startTime, TimeAnnot endTime) {
-    this(jcas, start, end);
-    setRoom(room);
-    setDate(date);
-    setStartTime(startTime);
-    setEndTime(endTime);
-  }
-
-  public String toString() {
-    return "Meeting in " + getRoom().getCoveredText() + " on " + getDate().getCoveredText() + ", "
-            + getStartTime().getCoveredText() + " - " + getEndTime().getCoveredText();
-  }
-
+    public void setEndTime(TimeAnnot v) {
+        _setFeatureValueNcWj(_FI_endTime, v);
+    }
+
+    /** Custom constructor taking all parameters */
+    public  Meeting(JCas jcas, int start, int end, RoomNumber room, DateAnnot date, TimeAnnot startTime, TimeAnnot endTime) {
+        this(jcas, start, end);
+        setRoom(room);
+        setDate(date);
+        setStartTime(startTime);
+        setEndTime(endTime);
+    }
+
+    public String toString() {
+        return "Meeting in " + getRoom().getCoveredText() + " on " + getDate().getCoveredText() + ", " + getStartTime().getCoveredText() + " - " + getEndTime().getCoveredText();
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,100 +16,98 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.tutorial;
 
 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.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /**
  * Updated by JCasGen Mon Nov 29 15:02:37 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * 
+ *
  * @generated
  */
 public class RoomNumber extends Annotation {
-  /**
+
+    /**
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasRegistry.register(RoomNumber.class);
+    public static final int typeIndexID = JCasRegistry.register(RoomNumber.class);
 
-  /**
+    /**
    * @generated
    * @ordered
    */
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
+    /** @generated */
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
 
-  /**
+    public static final int _FI_building = TypeSystemImpl.getAdjustedFeatureOffset("building");
+
+    /**
    * Never called. Disable default constructor
-   * 
+   *
    * @generated
    */
-  protected RoomNumber() {
-  }
+    protected  RoomNumber() {
+    }
 
-  /**
+    /**
    * Internal - constructor used by generator
-   * 
+   *
    * @generated
    */
-  public RoomNumber(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public RoomNumber(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  public RoomNumber(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
+    public  RoomNumber(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+        readObject();
+    }
+
+    /** @generated */
+    public  RoomNumber(JCas jcas) {
+        super(jcas);
+        readObject();
+    }
+
+    public  RoomNumber(JCas jcas, int begin, int end) {
+        super(jcas);
+        setBegin(begin);
+        setEnd(end);
+        readObject();
+    }
 
-  /**
+    /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
+   *
    * @generated modifiable
    */
-  private void readObject() {
-  }
-
-  // *--------------*
-  // * Feature: building
+    private void readObject() {
+    }
 
-  /**
+    // *--------------*
+    // * Feature: building
+    /**
    * getter for building - gets Building containing this room
-   * 
+   *
    * @generated
    */
-  public String getBuilding() {
-    if (RoomNumber_Type.featOkTst && ((RoomNumber_Type) jcasType).casFeat_building == null)
-      this.jcasType.jcas.throwFeatMissing("building", "org.apache.uima.tutorial.RoomNumber");
-    return jcasType.ll_cas.ll_getStringValue(addr,
-            ((RoomNumber_Type) jcasType).casFeatCode_building);
-  }
+    public String getBuilding() {
+        return _getStringValueNc(_FI_building);
+    }
 
-  /**
+    /**
    * setter for building - sets Building containing this room
-   * 
+   *
    * @generated
    */
-  public void setBuilding(String v) {
-    if (RoomNumber_Type.featOkTst && ((RoomNumber_Type) jcasType).casFeat_building == null)
-      this.jcasType.jcas.throwFeatMissing("building", "org.apache.uima.tutorial.RoomNumber");
-    jcasType.ll_cas.ll_setStringValue(addr, ((RoomNumber_Type) jcasType).casFeatCode_building, v);
-  }
+    public void setBuilding(String v) {
+        _setStringValueNfc(_FI_building, v);
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,75 +16,76 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.tutorial;
 
 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.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /**
  * Updated by JCasGen Mon Nov 29 15:02:37 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * 
+ *
  * @generated
  */
 public class SentenceAnnot extends Annotation {
-  /**
+
+    /**
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasRegistry.register(SentenceAnnot.class);
+    public static final int typeIndexID = JCasRegistry.register(SentenceAnnot.class);
 
-  /**
+    /**
    * @generated
    * @ordered
    */
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
+    /** @generated */
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
 
-  /**
+    /**
    * Never called. Disable default constructor
-   * 
+   *
    * @generated
    */
-  protected SentenceAnnot() {
-  }
+    protected  SentenceAnnot() {
+    }
 
-  /**
+    /**
    * Internal - constructor used by generator
-   * 
+   *
    * @generated
    */
-  public SentenceAnnot(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public SentenceAnnot(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  public SentenceAnnot(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
+    public  SentenceAnnot(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+        readObject();
+    }
+
+    /** @generated */
+    public  SentenceAnnot(JCas jcas) {
+        super(jcas);
+        readObject();
+    }
+
+    public  SentenceAnnot(JCas jcas, int begin, int end) {
+        super(jcas);
+        setBegin(begin);
+        setEnd(end);
+        readObject();
+    }
 
-  /**
+    /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
+   *
    * @generated modifiable
    */
-  private void readObject() {
-  }
-
+    private void readObject() {
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,74 +16,75 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.tutorial;
 
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
+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 Nov 29 15:02:38 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * 
+ *
  * @generated
  */
 public class TimeAnnot extends DateTimeAnnot {
-  /**
+
+    /**
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasRegistry.register(TimeAnnot.class);
+    public static final int typeIndexID = JCasRegistry.register(TimeAnnot.class);
 
-  /**
+    /**
    * @generated
    * @ordered
    */
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
+    /** @generated */
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
 
-  /**
+    /**
    * Never called. Disable default constructor
-   * 
+   *
    * @generated
    */
-  protected TimeAnnot() {
-  }
+    protected  TimeAnnot() {
+    }
 
-  /**
+    /**
    * Internal - constructor used by generator
-   * 
+   *
    * @generated
    */
-  public TimeAnnot(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public TimeAnnot(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  public TimeAnnot(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
+    public  TimeAnnot(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+        readObject();
+    }
+
+    /** @generated */
+    public  TimeAnnot(JCas jcas) {
+        super(jcas);
+        readObject();
+    }
+
+    public  TimeAnnot(JCas jcas, int begin, int end) {
+        super(jcas);
+        setBegin(begin);
+        setEnd(end);
+        readObject();
+    }
 
-  /**
+    /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
+   *
    * @generated modifiable
    */
-  private void readObject() {
-  }
-
+    private void readObject() {
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,107 +16,104 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.tutorial;
 
 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.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /**
  * Updated by JCasGen Mon Nov 29 15:02:38 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * 
+ *
  * @generated
  */
 public class UimaAcronym extends Annotation {
-  /**
+
+    /**
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasRegistry.register(UimaAcronym.class);
+    public static final int typeIndexID = JCasRegistry.register(UimaAcronym.class);
 
-  /**
+    /**
    * @generated
    * @ordered
    */
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
+    /** @generated */
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
 
-  /**
+    public static final int _FI_expandedForm = TypeSystemImpl.getAdjustedFeatureOffset("expandedForm");
+
+    /**
    * Never called. Disable default constructor
-   * 
+   *
    * @generated
    */
-  protected UimaAcronym() {
-  }
+    protected  UimaAcronym() {
+    }
 
-  /**
+    /**
    * Internal - constructor used by generator
-   * 
+   *
    * @generated
    */
-  public UimaAcronym(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public UimaAcronym(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  public UimaAcronym(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
+    public  UimaAcronym(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+        readObject();
+    }
+
+    /** @generated */
+    public  UimaAcronym(JCas jcas) {
+        super(jcas);
+        readObject();
+    }
+
+    public  UimaAcronym(JCas jcas, int begin, int end) {
+        super(jcas);
+        setBegin(begin);
+        setEnd(end);
+        readObject();
+    }
 
-  /**
+    /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
+   *
    * @generated modifiable
    */
-  private void readObject() {
-  }
-
-  // *--------------*
-  // * Feature: expandedForm
+    private void readObject() {
+    }
 
-  /**
+    // *--------------*
+    // * Feature: expandedForm
+    /**
    * getter for expandedForm - gets
-   * 
+   *
    * @generated
    */
-  public String getExpandedForm() {
-    if (UimaAcronym_Type.featOkTst && ((UimaAcronym_Type) jcasType).casFeat_expandedForm == null)
-      this.jcasType.jcas.throwFeatMissing("expandedForm", "org.apache.uima.tutorial.UimaAcronym");
-    return jcasType.ll_cas.ll_getStringValue(addr,
-            ((UimaAcronym_Type) jcasType).casFeatCode_expandedForm);
-  }
+    public String getExpandedForm() {
+        return _getStringValueNc(_FI_expandedForm);
+    }
 
-  /**
+    /**
    * setter for expandedForm - sets
-   * 
+   *
    * @generated
    */
-  public void setExpandedForm(String v) {
-    if (UimaAcronym_Type.featOkTst && ((UimaAcronym_Type) jcasType).casFeat_expandedForm == null)
-      this.jcasType.jcas.throwFeatMissing("expandedForm", "org.apache.uima.tutorial.UimaAcronym");
-    jcasType.ll_cas.ll_setStringValue(addr, ((UimaAcronym_Type) jcasType).casFeatCode_expandedForm,
-            v);
-  }
-
-  /** Custom constructor taking all parameters */
-  public UimaAcronym(JCas jcas, int start, int end, String expandedForm) {
-    super(jcas, start, end);
-    setExpandedForm(expandedForm);
-  }
+    public void setExpandedForm(String v) {
+        _setStringValueNfc(_FI_expandedForm, v);
+    }
+
+    /** Custom constructor taking all parameters */
+    public  UimaAcronym(JCas jcas, int start, int end, String expandedForm) {
+        super(jcas, start, end);
+        setExpandedForm(expandedForm);
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,79 +16,80 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.tutorial;
 
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
+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 Nov 29 15:02:38 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * 
+ *
  * @generated
  */
 public class UimaMeeting extends Meeting {
-  /**
+
+    /**
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasRegistry.register(UimaMeeting.class);
+    public static final int typeIndexID = JCasRegistry.register(UimaMeeting.class);
 
-  /**
+    /**
    * @generated
    * @ordered
    */
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
+    /** @generated */
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
 
-  /**
+    /**
    * Never called. Disable default constructor
-   * 
+   *
    * @generated
    */
-  protected UimaMeeting() {
-  }
+    protected  UimaMeeting() {
+    }
 
-  /**
+    /**
    * Internal - constructor used by generator
-   * 
+   *
    * @generated
    */
-  public UimaMeeting(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public UimaMeeting(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  public UimaMeeting(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
+    public  UimaMeeting(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+        readObject();
+    }
+
+    /** @generated */
+    public  UimaMeeting(JCas jcas) {
+        super(jcas);
+        readObject();
+    }
+
+    public  UimaMeeting(JCas jcas, int begin, int end) {
+        super(jcas);
+        setBegin(begin);
+        setEnd(end);
+        readObject();
+    }
 
-  /**
+    /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
+   *
    * @generated modifiable
    */
-  private void readObject() {
-  }
+    private void readObject() {
+    }
 
-  /** Custom constructor taking all parameters */
-  public UimaMeeting(JCas jcas, int start, int end, RoomNumber room, DateAnnot date,
-          TimeAnnot startTime, TimeAnnot endTime) {
-    super(jcas, start, end, room, date, startTime, endTime);
-  }
+    /** Custom constructor taking all parameters */
+    public  UimaMeeting(JCas jcas, int start, int end, RoomNumber room, DateAnnot date, TimeAnnot startTime, TimeAnnot endTime) {
+        super(jcas, start, end, room, date, startTime, endTime);
+    }
 }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java?rev=1754917&r1=1754916&r2=1754917&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java Tue Aug  2 13:44:31 2016
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,75 +16,76 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.uima.tutorial;
 
 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.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
 
 /**
  * Updated by JCasGen Mon Nov 29 15:02:38 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * 
+ *
  * @generated
  */
 public class WordAnnot extends Annotation {
-  /**
+
+    /**
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasRegistry.register(WordAnnot.class);
+    public static final int typeIndexID = JCasRegistry.register(WordAnnot.class);
 
-  /**
+    /**
    * @generated
    * @ordered
    */
-  public final static int type = typeIndexID;
+    public static final int type = typeIndexID;
 
-  /** @generated */
-  public int getTypeIndexID() {
-    return typeIndexID;
-  }
+    /** @generated */
+    public int getTypeIndexID() {
+        return typeIndexID;
+    }
 
-  /**
+    /**
    * Never called. Disable default constructor
-   * 
+   *
    * @generated
    */
-  protected WordAnnot() {
-  }
+    protected  WordAnnot() {
+    }
 
-  /**
+    /**
    * Internal - constructor used by generator
-   * 
+   *
    * @generated
    */
-  public WordAnnot(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-
-  /** @generated */
-  public WordAnnot(JCas jcas) {
-    super(jcas);
-    readObject();
-  }
-
-  public WordAnnot(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }
+    public  WordAnnot(TypeImpl type, CASImpl casImpl) {
+        super(type, casImpl);
+        readObject();
+    }
+
+    /** @generated */
+    public  WordAnnot(JCas jcas) {
+        super(jcas);
+        readObject();
+    }
+
+    public  WordAnnot(JCas jcas, int begin, int end) {
+        super(jcas);
+        setBegin(begin);
+        setEnd(end);
+        readObject();
+    }
 
-  /**
+    /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
-   * 
+   *
    * @generated modifiable
    */
-  private void readObject() {
-  }
-
+    private void readObject() {
+    }
 }