You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2007/01/17 16:47:00 UTC

svn commit: r497047 [2/2] - in /incubator/uima/uimaj/trunk/uimaj-core/src: main/java/org/apache/uima/examples/ main/java/org/apache/uima/jcas/ main/java/org/apache/uima/jcas/cas/ main/java/org/apache/uima/jcas/impl/ main/java/org/apache/uima/jcas/tcas/...

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation_Type.java Wed Jan 17 07:46:57 2007
@@ -27,7 +27,7 @@
 import org.apache.uima.cas.impl.FeatureImpl;
 import org.apache.uima.cas.impl.TypeImpl;
 import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.impl.JCasImpl;
+import org.apache.uima.jcas.JCasRegistry;
 
 public class Annotation_Type extends org.apache.uima.jcas.cas.AnnotationBase_Type {
   protected FSGenerator getFSGenerator() {
@@ -52,7 +52,7 @@
 
   public final static int typeIndexID = Annotation.typeIndexID;
 
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("uima.tcas.Annotation");
+  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("uima.tcas.Annotation");
 
   final Feature casFeat_begin;
 
@@ -60,13 +60,13 @@
 
   public int getBegin(int addr) {
     if (featOkTst && casFeat_begin == null)
-      JCasImpl.throwFeatMissing("begin", "uima.tcas.Annotation");
+      this.jcas.throwFeatMissing("begin", "uima.tcas.Annotation");
     return ll_cas.ll_getIntValue(addr, casFeatCode_begin);
   }
 
   public void setBegin(int addr, int v) {
     if (featOkTst && casFeat_begin == null)
-      JCasImpl.throwFeatMissing("begin", "uima.tcas.Annotation");
+      this.jcas.throwFeatMissing("begin", "uima.tcas.Annotation");
     ll_cas.ll_setIntValue(addr, casFeatCode_begin, v);
   }
 
@@ -76,13 +76,13 @@
 
   public int getEnd(int addr) {
     if (featOkTst && casFeat_end == null)
-      JCasImpl.throwFeatMissing("end", "uima.tcas.Annotation");
+      this.jcas.throwFeatMissing("end", "uima.tcas.Annotation");
     return ll_cas.ll_getIntValue(addr, casFeatCode_end);
   }
 
   public void setEnd(int addr, int v) {
     if (featOkTst && casFeat_end == null)
-      JCasImpl.throwFeatMissing("end", "uima.tcas.Annotation");
+      this.jcas.throwFeatMissing("end", "uima.tcas.Annotation");
     ll_cas.ll_setIntValue(addr, casFeatCode_end, v);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/AbstractType.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/AbstractType.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/AbstractType.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/AbstractType.java Wed Jan 17 07:46:57 2007
@@ -35,7 +35,7 @@
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(AbstractType.class);
 
   /**
    * @generated
@@ -90,7 +90,7 @@
    */
   public int getAbstractInt() {
     if (AbstractType_Type.featOkTst && ((AbstractType_Type) jcasType).casFeat_abstractInt == null)
-      JCasImpl.throwFeatMissing("abstractInt", "aa.AbstractType");
+      this.jcasType.jcas.throwFeatMissing("abstractInt", "aa.AbstractType");
     return jcasType.ll_cas.ll_getIntValue(addr,
             ((AbstractType_Type) jcasType).casFeatCode_abstractInt);
   }
@@ -102,7 +102,7 @@
    */
   public void setAbstractInt(int v) {
     if (AbstractType_Type.featOkTst && ((AbstractType_Type) jcasType).casFeat_abstractInt == null)
-      JCasImpl.throwFeatMissing("abstractInt", "aa.AbstractType");
+      this.jcasType.jcas.throwFeatMissing("abstractInt", "aa.AbstractType");
     jcasType.ll_cas.ll_setIntValue(addr, ((AbstractType_Type) jcasType).casFeatCode_abstractInt, v);
   }
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/AbstractType_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/AbstractType_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/AbstractType_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/AbstractType_Type.java Wed Jan 17 07:46:57 2007
@@ -65,7 +65,7 @@
    * @generated
    * @modifiable
    */
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("aa.AbstractType");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("aa.AbstractType");
 
   /** @generated */
   final Feature casFeat_abstractInt;
@@ -76,14 +76,14 @@
   /** @generated */
   public int getAbstractInt(int addr) {
     if (featOkTst && casFeat_abstractInt == null)
-      JCasImpl.throwFeatMissing("abstractInt", "aa.AbstractType");
+      this.jcas.throwFeatMissing("abstractInt", "aa.AbstractType");
     return ll_cas.ll_getIntValue(addr, casFeatCode_abstractInt);
   }
 
   /** @generated */
   public void setAbstractInt(int addr, int v) {
     if (featOkTst && casFeat_abstractInt == null)
-      JCasImpl.throwFeatMissing("abstractInt", "aa.AbstractType");
+      this.jcas.throwFeatMissing("abstractInt", "aa.AbstractType");
     ll_cas.ll_setIntValue(addr, casFeatCode_abstractInt, v);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/ConcreteType.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/ConcreteType.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/ConcreteType.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/ConcreteType.java Wed Jan 17 07:46:57 2007
@@ -34,7 +34,7 @@
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(ConcreteType.class);
 
   /**
    * @generated
@@ -90,7 +90,7 @@
   public String getConcreteString() {
     if (ConcreteType_Type.featOkTst
             && ((ConcreteType_Type) jcasType).casFeat_concreteString == null)
-      JCasImpl.throwFeatMissing("concreteString", "aa.ConcreteType");
+      this.jcasType.jcas.throwFeatMissing("concreteString", "aa.ConcreteType");
     return jcasType.ll_cas.ll_getStringValue(addr,
             ((ConcreteType_Type) jcasType).casFeatCode_concreteString);
   }
@@ -103,7 +103,7 @@
   public void setConcreteString(String v) {
     if (ConcreteType_Type.featOkTst
             && ((ConcreteType_Type) jcasType).casFeat_concreteString == null)
-      JCasImpl.throwFeatMissing("concreteString", "aa.ConcreteType");
+      this.jcasType.jcas.throwFeatMissing("concreteString", "aa.ConcreteType");
     jcasType.ll_cas.ll_setStringValue(addr,
             ((ConcreteType_Type) jcasType).casFeatCode_concreteString, v);
   }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/ConcreteType_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/ConcreteType_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/ConcreteType_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/ConcreteType_Type.java Wed Jan 17 07:46:57 2007
@@ -64,7 +64,7 @@
    * @generated
    * @modifiable
    */
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("aa.ConcreteType");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("aa.ConcreteType");
 
   /** @generated */
   final Feature casFeat_concreteString;
@@ -75,14 +75,14 @@
   /** @generated */
   public String getConcreteString(int addr) {
     if (featOkTst && casFeat_concreteString == null)
-      JCasImpl.throwFeatMissing("concreteString", "aa.ConcreteType");
+      this.jcas.throwFeatMissing("concreteString", "aa.ConcreteType");
     return ll_cas.ll_getStringValue(addr, casFeatCode_concreteString);
   }
 
   /** @generated */
   public void setConcreteString(int addr, String v) {
     if (featOkTst && casFeat_concreteString == null)
-      JCasImpl.throwFeatMissing("concreteString", "aa.ConcreteType");
+      this.jcas.throwFeatMissing("concreteString", "aa.ConcreteType");
     ll_cas.ll_setStringValue(addr, casFeatCode_concreteString, v);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingFeatureInCas.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingFeatureInCas.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingFeatureInCas.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingFeatureInCas.java Wed Jan 17 07:46:57 2007
@@ -35,7 +35,7 @@
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(MissingFeatureInCas.class);
 
   /**
    * @generated
@@ -91,7 +91,7 @@
   public int getHaveThisOne() {
     if (MissingFeatureInCas_Type.featOkTst
             && ((MissingFeatureInCas_Type) jcasType).casFeat_haveThisOne == null)
-      JCasImpl.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
+      this.jcasType.jcas.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
     return jcasType.ll_cas.ll_getIntValue(addr,
             ((MissingFeatureInCas_Type) jcasType).casFeatCode_haveThisOne);
   }
@@ -104,7 +104,7 @@
   public void setHaveThisOne(int v) {
     if (MissingFeatureInCas_Type.featOkTst
             && ((MissingFeatureInCas_Type) jcasType).casFeat_haveThisOne == null)
-      JCasImpl.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
+      this.jcasType.jcas.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
     jcasType.ll_cas.ll_setIntValue(addr,
             ((MissingFeatureInCas_Type) jcasType).casFeatCode_haveThisOne, v);
   }
@@ -120,7 +120,7 @@
   public float getMissingThisOne() {
     if (MissingFeatureInCas_Type.featOkTst
             && ((MissingFeatureInCas_Type) jcasType).casFeat_missingThisOne == null)
-      JCasImpl.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
+      this.jcasType.jcas.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
     return jcasType.ll_cas.ll_getFloatValue(addr,
             ((MissingFeatureInCas_Type) jcasType).casFeatCode_missingThisOne);
   }
@@ -133,7 +133,7 @@
   public void setMissingThisOne(float v) {
     if (MissingFeatureInCas_Type.featOkTst
             && ((MissingFeatureInCas_Type) jcasType).casFeat_missingThisOne == null)
-      JCasImpl.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
+      this.jcasType.jcas.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
     jcasType.ll_cas.ll_setFloatValue(addr,
             ((MissingFeatureInCas_Type) jcasType).casFeatCode_missingThisOne, v);
   }
@@ -149,7 +149,7 @@
   public String getChangedFType() {
     if (MissingFeatureInCas_Type.featOkTst
             && ((MissingFeatureInCas_Type) jcasType).casFeat_changedFType == null)
-      JCasImpl.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
+      this.jcasType.jcas.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
     return jcasType.ll_cas.ll_getStringValue(addr,
             ((MissingFeatureInCas_Type) jcasType).casFeatCode_changedFType);
   }
@@ -162,7 +162,7 @@
   public void setChangedFType(String v) {
     if (MissingFeatureInCas_Type.featOkTst
             && ((MissingFeatureInCas_Type) jcasType).casFeat_changedFType == null)
-      JCasImpl.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
+      this.jcasType.jcas.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
     jcasType.ll_cas.ll_setStringValue(addr,
             ((MissingFeatureInCas_Type) jcasType).casFeatCode_changedFType, v);
   }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingFeatureInCas_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingFeatureInCas_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingFeatureInCas_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingFeatureInCas_Type.java Wed Jan 17 07:46:57 2007
@@ -65,7 +65,7 @@
    * @generated
    * @modifiable
    */
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("aa.MissingFeatureInCas");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("aa.MissingFeatureInCas");
 
   /** @generated */
   final Feature casFeat_haveThisOne;
@@ -76,14 +76,14 @@
   /** @generated */
   public int getHaveThisOne(int addr) {
     if (featOkTst && casFeat_haveThisOne == null)
-      JCasImpl.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
+      this.jcas.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
     return ll_cas.ll_getIntValue(addr, casFeatCode_haveThisOne);
   }
 
   /** @generated */
   public void setHaveThisOne(int addr, int v) {
     if (featOkTst && casFeat_haveThisOne == null)
-      JCasImpl.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
+      this.jcas.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
     ll_cas.ll_setIntValue(addr, casFeatCode_haveThisOne, v);
   }
 
@@ -96,14 +96,14 @@
   /** @generated */
   public float getMissingThisOne(int addr) {
     if (featOkTst && casFeat_missingThisOne == null)
-      JCasImpl.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
+      this.jcas.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
     return ll_cas.ll_getFloatValue(addr, casFeatCode_missingThisOne);
   }
 
   /** @generated */
   public void setMissingThisOne(int addr, float v) {
     if (featOkTst && casFeat_missingThisOne == null)
-      JCasImpl.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
+      this.jcas.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
     ll_cas.ll_setFloatValue(addr, casFeatCode_missingThisOne, v);
   }
 
@@ -116,14 +116,14 @@
   /** @generated */
   public String getChangedFType(int addr) {
     if (featOkTst && casFeat_changedFType == null)
-      JCasImpl.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
+      this.jcas.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
     return ll_cas.ll_getStringValue(addr, casFeatCode_changedFType);
   }
 
   /** @generated */
   public void setChangedFType(int addr, String v) {
     if (featOkTst && casFeat_changedFType == null)
-      JCasImpl.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
+      this.jcas.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
     ll_cas.ll_setStringValue(addr, casFeatCode_changedFType, v);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingInCas.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingInCas.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingInCas.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingInCas.java Wed Jan 17 07:46:57 2007
@@ -35,7 +35,7 @@
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(MissingInCas.class);
 
   /**
    * @generated

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingInCas_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingInCas_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingInCas_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/MissingInCas_Type.java Wed Jan 17 07:46:57 2007
@@ -63,7 +63,7 @@
    * @generated
    * @modifiable
    */
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("aa.MissingInCas");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("aa.MissingInCas");
 
   /**
    * initialize variables to correspond with Cas Type and Features

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/Root.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/Root.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/Root.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/Root.java Wed Jan 17 07:46:57 2007
@@ -39,7 +39,7 @@
    * @generated
    * @ordered
    */
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(Root.class);
 
   /**
    * @generated
@@ -94,7 +94,7 @@
    */
   public IntegerArray getArrayInt() {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayInt == null)
-      JCasImpl.throwFeatMissing("arrayInt", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayInt", "aa.Root");
     return (IntegerArray) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayInt)));
   }
@@ -106,7 +106,7 @@
    */
   public void setArrayInt(IntegerArray v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayInt == null)
-      JCasImpl.throwFeatMissing("arrayInt", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayInt", "aa.Root");
     jcasType.ll_cas.ll_setRefValue(addr, ((Root_Type) jcasType).casFeatCode_arrayInt,
             jcasType.ll_cas.ll_getFSRef(v));
   }
@@ -118,7 +118,7 @@
    */
   public int getArrayInt(int i) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayInt == null)
-      JCasImpl.throwFeatMissing("arrayInt", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayInt", "aa.Root");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayInt), i);
     return jcasType.ll_cas.ll_getIntArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
@@ -132,7 +132,7 @@
    */
   public void setArrayInt(int i, int v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayInt == null)
-      JCasImpl.throwFeatMissing("arrayInt", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayInt", "aa.Root");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayInt), i);
     jcasType.ll_cas.ll_setIntArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
@@ -149,7 +149,7 @@
    */
   public FSArray getArrayRef() {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayRef == null)
-      JCasImpl.throwFeatMissing("arrayRef", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayRef", "aa.Root");
     return (FSArray) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayRef)));
   }
@@ -161,7 +161,7 @@
    */
   public void setArrayRef(FSArray v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayRef == null)
-      JCasImpl.throwFeatMissing("arrayRef", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayRef", "aa.Root");
     jcasType.ll_cas.ll_setRefValue(addr, ((Root_Type) jcasType).casFeatCode_arrayRef,
             jcasType.ll_cas.ll_getFSRef(v));
   }
@@ -173,7 +173,7 @@
    */
   public TOP getArrayRef(int i) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayRef == null)
-      JCasImpl.throwFeatMissing("arrayRef", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayRef", "aa.Root");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayRef), i);
     return (TOP) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefArrayValue(
@@ -187,7 +187,7 @@
    */
   public void setArrayRef(int i, TOP v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayRef == null)
-      JCasImpl.throwFeatMissing("arrayRef", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayRef", "aa.Root");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayRef), i);
     jcasType.ll_cas.ll_setRefArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
@@ -204,7 +204,7 @@
    */
   public FloatArray getArrayFloat() {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayFloat == null)
-      JCasImpl.throwFeatMissing("arrayFloat", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayFloat", "aa.Root");
     return (FloatArray) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayFloat)));
   }
@@ -216,7 +216,7 @@
    */
   public void setArrayFloat(FloatArray v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayFloat == null)
-      JCasImpl.throwFeatMissing("arrayFloat", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayFloat", "aa.Root");
     jcasType.ll_cas.ll_setRefValue(addr, ((Root_Type) jcasType).casFeatCode_arrayFloat,
             jcasType.ll_cas.ll_getFSRef(v));
   }
@@ -228,7 +228,7 @@
    */
   public float getArrayFloat(int i) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayFloat == null)
-      JCasImpl.throwFeatMissing("arrayFloat", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayFloat", "aa.Root");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayFloat), i);
     return jcasType.ll_cas.ll_getFloatArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
@@ -242,7 +242,7 @@
    */
   public void setArrayFloat(int i, float v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayFloat == null)
-      JCasImpl.throwFeatMissing("arrayFloat", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayFloat", "aa.Root");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayFloat), i);
     jcasType.ll_cas.ll_setFloatArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
@@ -259,7 +259,7 @@
    */
   public StringArray getArrayString() {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayString == null)
-      JCasImpl.throwFeatMissing("arrayString", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayString", "aa.Root");
     return (StringArray) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayString)));
   }
@@ -271,7 +271,7 @@
    */
   public void setArrayString(StringArray v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayString == null)
-      JCasImpl.throwFeatMissing("arrayString", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayString", "aa.Root");
     jcasType.ll_cas.ll_setRefValue(addr, ((Root_Type) jcasType).casFeatCode_arrayString,
             jcasType.ll_cas.ll_getFSRef(v));
   }
@@ -283,7 +283,7 @@
    */
   public String getArrayString(int i) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayString == null)
-      JCasImpl.throwFeatMissing("arrayString", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayString", "aa.Root");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayString), i);
     return jcasType.ll_cas.ll_getStringArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
@@ -297,7 +297,7 @@
    */
   public void setArrayString(int i, String v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_arrayString == null)
-      JCasImpl.throwFeatMissing("arrayString", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("arrayString", "aa.Root");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_arrayString), i);
     jcasType.ll_cas.ll_setStringArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
@@ -314,7 +314,7 @@
    */
   public int getPlainInt() {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainInt == null)
-      JCasImpl.throwFeatMissing("plainInt", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("plainInt", "aa.Root");
     return jcasType.ll_cas.ll_getIntValue(addr, ((Root_Type) jcasType).casFeatCode_plainInt);
   }
 
@@ -325,7 +325,7 @@
    */
   public void setPlainInt(int v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainInt == null)
-      JCasImpl.throwFeatMissing("plainInt", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("plainInt", "aa.Root");
     jcasType.ll_cas.ll_setIntValue(addr, ((Root_Type) jcasType).casFeatCode_plainInt, v);
   }
 
@@ -339,7 +339,7 @@
    */
   public float getPlainFloat() {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainFloat == null)
-      JCasImpl.throwFeatMissing("plainFloat", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("plainFloat", "aa.Root");
     return jcasType.ll_cas.ll_getFloatValue(addr, ((Root_Type) jcasType).casFeatCode_plainFloat);
   }
 
@@ -350,7 +350,7 @@
    */
   public void setPlainFloat(float v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainFloat == null)
-      JCasImpl.throwFeatMissing("plainFloat", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("plainFloat", "aa.Root");
     jcasType.ll_cas.ll_setFloatValue(addr, ((Root_Type) jcasType).casFeatCode_plainFloat, v);
   }
 
@@ -364,7 +364,7 @@
    */
   public String getPlainString() {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainString == null)
-      JCasImpl.throwFeatMissing("plainString", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("plainString", "aa.Root");
     return jcasType.ll_cas.ll_getStringValue(addr, ((Root_Type) jcasType).casFeatCode_plainString);
   }
 
@@ -375,7 +375,7 @@
    */
   public void setPlainString(String v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainString == null)
-      JCasImpl.throwFeatMissing("plainString", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("plainString", "aa.Root");
     jcasType.ll_cas.ll_setStringValue(addr, ((Root_Type) jcasType).casFeatCode_plainString, v);
   }
 
@@ -389,7 +389,7 @@
    */
   public Root getPlainRef() {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainRef == null)
-      JCasImpl.throwFeatMissing("plainRef", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("plainRef", "aa.Root");
     return (Root) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
             ((Root_Type) jcasType).casFeatCode_plainRef)));
   }
@@ -401,7 +401,7 @@
    */
   public void setPlainRef(Root v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_plainRef == null)
-      JCasImpl.throwFeatMissing("plainRef", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("plainRef", "aa.Root");
     jcasType.ll_cas.ll_setRefValue(addr, ((Root_Type) jcasType).casFeatCode_plainRef,
             jcasType.ll_cas.ll_getFSRef(v));
   }
@@ -416,7 +416,7 @@
    */
   public String getConcreteString() {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_concreteString == null)
-      JCasImpl.throwFeatMissing("concreteString", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("concreteString", "aa.Root");
     return jcasType.ll_cas.ll_getStringValue(addr,
             ((Root_Type) jcasType).casFeatCode_concreteString);
   }
@@ -428,7 +428,7 @@
    */
   public void setConcreteString(String v) {
     if (Root_Type.featOkTst && ((Root_Type) jcasType).casFeat_concreteString == null)
-      JCasImpl.throwFeatMissing("concreteString", "aa.Root");
+      this.jcasType.jcas.throwFeatMissing("concreteString", "aa.Root");
     jcasType.ll_cas.ll_setStringValue(addr, ((Root_Type) jcasType).casFeatCode_concreteString, v);
   }
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/Root_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/Root_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/Root_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/aa/Root_Type.java Wed Jan 17 07:46:57 2007
@@ -65,7 +65,7 @@
    * @generated
    * @modifiable
    */
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("aa.Root");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("aa.Root");
 
   /** @generated */
   final Feature casFeat_arrayInt;
@@ -76,21 +76,21 @@
   /** @generated */
   public int getArrayInt(int addr) {
     if (featOkTst && casFeat_arrayInt == null)
-      JCasImpl.throwFeatMissing("arrayInt", "aa.Root");
+      this.jcas.throwFeatMissing("arrayInt", "aa.Root");
     return ll_cas.ll_getRefValue(addr, casFeatCode_arrayInt);
   }
 
   /** @generated */
   public void setArrayInt(int addr, int v) {
     if (featOkTst && casFeat_arrayInt == null)
-      JCasImpl.throwFeatMissing("arrayInt", "aa.Root");
+      this.jcas.throwFeatMissing("arrayInt", "aa.Root");
     ll_cas.ll_setRefValue(addr, casFeatCode_arrayInt, v);
   }
 
   /** @generated */
   public int getArrayInt(int addr, int i) {
     if (featOkTst && casFeat_arrayInt == null)
-      JCasImpl.throwFeatMissing("arrayInt", "aa.Root");
+      this.jcas.throwFeatMissing("arrayInt", "aa.Root");
     if (lowLevelTypeChecks)
       return ll_cas.ll_getIntArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_arrayInt), i, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_arrayInt), i);
@@ -100,7 +100,7 @@
   /** @generated */
   public void setArrayInt(int addr, int i, int v) {
     if (featOkTst && casFeat_arrayInt == null)
-      JCasImpl.throwFeatMissing("arrayInt", "aa.Root");
+      this.jcas.throwFeatMissing("arrayInt", "aa.Root");
     if (lowLevelTypeChecks)
       ll_cas.ll_setIntArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_arrayInt), i, v, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_arrayInt), i);
@@ -116,21 +116,21 @@
   /** @generated */
   public int getArrayRef(int addr) {
     if (featOkTst && casFeat_arrayRef == null)
-      JCasImpl.throwFeatMissing("arrayRef", "aa.Root");
+      this.jcas.throwFeatMissing("arrayRef", "aa.Root");
     return ll_cas.ll_getRefValue(addr, casFeatCode_arrayRef);
   }
 
   /** @generated */
   public void setArrayRef(int addr, int v) {
     if (featOkTst && casFeat_arrayRef == null)
-      JCasImpl.throwFeatMissing("arrayRef", "aa.Root");
+      this.jcas.throwFeatMissing("arrayRef", "aa.Root");
     ll_cas.ll_setRefValue(addr, casFeatCode_arrayRef, v);
   }
 
   /** @generated */
   public int getArrayRef(int addr, int i) {
     if (featOkTst && casFeat_arrayRef == null)
-      JCasImpl.throwFeatMissing("arrayRef", "aa.Root");
+      this.jcas.throwFeatMissing("arrayRef", "aa.Root");
     if (lowLevelTypeChecks)
       return ll_cas.ll_getRefArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_arrayRef), i, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_arrayRef), i);
@@ -140,7 +140,7 @@
   /** @generated */
   public void setArrayRef(int addr, int i, int v) {
     if (featOkTst && casFeat_arrayRef == null)
-      JCasImpl.throwFeatMissing("arrayRef", "aa.Root");
+      this.jcas.throwFeatMissing("arrayRef", "aa.Root");
     if (lowLevelTypeChecks)
       ll_cas.ll_setRefArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_arrayRef), i, v, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_arrayRef), i);
@@ -156,21 +156,21 @@
   /** @generated */
   public int getArrayFloat(int addr) {
     if (featOkTst && casFeat_arrayFloat == null)
-      JCasImpl.throwFeatMissing("arrayFloat", "aa.Root");
+      this.jcas.throwFeatMissing("arrayFloat", "aa.Root");
     return ll_cas.ll_getRefValue(addr, casFeatCode_arrayFloat);
   }
 
   /** @generated */
   public void setArrayFloat(int addr, int v) {
     if (featOkTst && casFeat_arrayFloat == null)
-      JCasImpl.throwFeatMissing("arrayFloat", "aa.Root");
+      this.jcas.throwFeatMissing("arrayFloat", "aa.Root");
     ll_cas.ll_setRefValue(addr, casFeatCode_arrayFloat, v);
   }
 
   /** @generated */
   public float getArrayFloat(int addr, int i) {
     if (featOkTst && casFeat_arrayFloat == null)
-      JCasImpl.throwFeatMissing("arrayFloat", "aa.Root");
+      this.jcas.throwFeatMissing("arrayFloat", "aa.Root");
     if (lowLevelTypeChecks)
       return ll_cas.ll_getFloatArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_arrayFloat), i,
               true);
@@ -181,7 +181,7 @@
   /** @generated */
   public void setArrayFloat(int addr, int i, float v) {
     if (featOkTst && casFeat_arrayFloat == null)
-      JCasImpl.throwFeatMissing("arrayFloat", "aa.Root");
+      this.jcas.throwFeatMissing("arrayFloat", "aa.Root");
     if (lowLevelTypeChecks)
       ll_cas.ll_setFloatArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_arrayFloat), i, v, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_arrayFloat), i);
@@ -197,21 +197,21 @@
   /** @generated */
   public int getArrayString(int addr) {
     if (featOkTst && casFeat_arrayString == null)
-      JCasImpl.throwFeatMissing("arrayString", "aa.Root");
+      this.jcas.throwFeatMissing("arrayString", "aa.Root");
     return ll_cas.ll_getRefValue(addr, casFeatCode_arrayString);
   }
 
   /** @generated */
   public void setArrayString(int addr, int v) {
     if (featOkTst && casFeat_arrayString == null)
-      JCasImpl.throwFeatMissing("arrayString", "aa.Root");
+      this.jcas.throwFeatMissing("arrayString", "aa.Root");
     ll_cas.ll_setRefValue(addr, casFeatCode_arrayString, v);
   }
 
   /** @generated */
   public String getArrayString(int addr, int i) {
     if (featOkTst && casFeat_arrayString == null)
-      JCasImpl.throwFeatMissing("arrayString", "aa.Root");
+      this.jcas.throwFeatMissing("arrayString", "aa.Root");
     if (lowLevelTypeChecks)
       return ll_cas.ll_getStringArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_arrayString), i,
               true);
@@ -222,7 +222,7 @@
   /** @generated */
   public void setArrayString(int addr, int i, String v) {
     if (featOkTst && casFeat_arrayString == null)
-      JCasImpl.throwFeatMissing("arrayString", "aa.Root");
+      this.jcas.throwFeatMissing("arrayString", "aa.Root");
     if (lowLevelTypeChecks)
       ll_cas.ll_setStringArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_arrayString), i, v,
               true);
@@ -239,14 +239,14 @@
   /** @generated */
   public int getPlainInt(int addr) {
     if (featOkTst && casFeat_plainInt == null)
-      JCasImpl.throwFeatMissing("plainInt", "aa.Root");
+      this.jcas.throwFeatMissing("plainInt", "aa.Root");
     return ll_cas.ll_getIntValue(addr, casFeatCode_plainInt);
   }
 
   /** @generated */
   public void setPlainInt(int addr, int v) {
     if (featOkTst && casFeat_plainInt == null)
-      JCasImpl.throwFeatMissing("plainInt", "aa.Root");
+      this.jcas.throwFeatMissing("plainInt", "aa.Root");
     ll_cas.ll_setIntValue(addr, casFeatCode_plainInt, v);
   }
 
@@ -259,14 +259,14 @@
   /** @generated */
   public float getPlainFloat(int addr) {
     if (featOkTst && casFeat_plainFloat == null)
-      JCasImpl.throwFeatMissing("plainFloat", "aa.Root");
+      this.jcas.throwFeatMissing("plainFloat", "aa.Root");
     return ll_cas.ll_getFloatValue(addr, casFeatCode_plainFloat);
   }
 
   /** @generated */
   public void setPlainFloat(int addr, float v) {
     if (featOkTst && casFeat_plainFloat == null)
-      JCasImpl.throwFeatMissing("plainFloat", "aa.Root");
+      this.jcas.throwFeatMissing("plainFloat", "aa.Root");
     ll_cas.ll_setFloatValue(addr, casFeatCode_plainFloat, v);
   }
 
@@ -279,14 +279,14 @@
   /** @generated */
   public String getPlainString(int addr) {
     if (featOkTst && casFeat_plainString == null)
-      JCasImpl.throwFeatMissing("plainString", "aa.Root");
+      this.jcas.throwFeatMissing("plainString", "aa.Root");
     return ll_cas.ll_getStringValue(addr, casFeatCode_plainString);
   }
 
   /** @generated */
   public void setPlainString(int addr, String v) {
     if (featOkTst && casFeat_plainString == null)
-      JCasImpl.throwFeatMissing("plainString", "aa.Root");
+      this.jcas.throwFeatMissing("plainString", "aa.Root");
     ll_cas.ll_setStringValue(addr, casFeatCode_plainString, v);
   }
 
@@ -299,14 +299,14 @@
   /** @generated */
   public int getPlainRef(int addr) {
     if (featOkTst && casFeat_plainRef == null)
-      JCasImpl.throwFeatMissing("plainRef", "aa.Root");
+      this.jcas.throwFeatMissing("plainRef", "aa.Root");
     return ll_cas.ll_getRefValue(addr, casFeatCode_plainRef);
   }
 
   /** @generated */
   public void setPlainRef(int addr, int v) {
     if (featOkTst && casFeat_plainRef == null)
-      JCasImpl.throwFeatMissing("plainRef", "aa.Root");
+      this.jcas.throwFeatMissing("plainRef", "aa.Root");
     ll_cas.ll_setRefValue(addr, casFeatCode_plainRef, v);
   }
 
@@ -319,14 +319,14 @@
   /** @generated */
   public String getConcreteString(int addr) {
     if (featOkTst && casFeat_concreteString == null)
-      JCasImpl.throwFeatMissing("concreteString", "aa.Root");
+      this.jcas.throwFeatMissing("concreteString", "aa.Root");
     return ll_cas.ll_getStringValue(addr, casFeatCode_concreteString);
   }
 
   /** @generated */
   public void setConcreteString(int addr, String v) {
     if (featOkTst && casFeat_concreteString == null)
-      JCasImpl.throwFeatMissing("concreteString", "aa.Root");
+      this.jcas.throwFeatMissing("concreteString", "aa.Root");
     ll_cas.ll_setStringValue(addr, casFeatCode_concreteString, v);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java Wed Jan 17 07:46:57 2007
@@ -27,7 +27,7 @@
 /* comment 7 of 14 */
 public class LanguagePair extends TOP {
 
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(LanguagePair.class);
 
   public final static int type = typeIndexID;
 
@@ -61,7 +61,7 @@
   /** getter for lang1 * */
   public String getLang1() {
     if (LanguagePair_Type.featOkTst && ((LanguagePair_Type) jcasType).casFeat_lang1 == null)
-      JCasImpl.throwFeatMissing("lang1", "org.apache.lang.LanguagePair");
+      this.jcasType.jcas.throwFeatMissing("lang1", "org.apache.lang.LanguagePair");
     return jcasType.ll_cas
             .ll_getStringValue(addr, ((LanguagePair_Type) jcasType).casFeatCode_lang1);
   }
@@ -69,7 +69,7 @@
   /** setter for lang1 * */
   public void setLang1(String v) {
     if (LanguagePair_Type.featOkTst && ((LanguagePair_Type) jcasType).casFeat_lang1 == null)
-      JCasImpl.throwFeatMissing("lang1", "org.apache.lang.LanguagePair");
+      this.jcasType.jcas.throwFeatMissing("lang1", "org.apache.lang.LanguagePair");
     jcasType.ll_cas.ll_setStringValue(addr, ((LanguagePair_Type) jcasType).casFeatCode_lang1, v);
   }
 
@@ -78,7 +78,7 @@
   /** getter for lang2 * */
   public String getLang2() {
     if (LanguagePair_Type.featOkTst && ((LanguagePair_Type) jcasType).casFeat_lang2 == null)
-      JCasImpl.throwFeatMissing("lang2", "org.apache.lang.LanguagePair");
+      this.jcasType.jcas.throwFeatMissing("lang2", "org.apache.lang.LanguagePair");
     return jcasType.ll_cas
             .ll_getStringValue(addr, ((LanguagePair_Type) jcasType).casFeatCode_lang2);
   }
@@ -86,7 +86,7 @@
   /** setter for lang2 * */
   public void setLang2(String v) {
     if (LanguagePair_Type.featOkTst && ((LanguagePair_Type) jcasType).casFeat_lang2 == null)
-      JCasImpl.throwFeatMissing("lang2", "org.apache.lang.LanguagePair");
+      this.jcasType.jcas.throwFeatMissing("lang2", "org.apache.lang.LanguagePair");
     jcasType.ll_cas.ll_setStringValue(addr, ((LanguagePair_Type) jcasType).casFeatCode_lang2, v);
   }
 
@@ -95,7 +95,7 @@
   /** getter for description * */
   public String getDescription() {
     if (LanguagePair_Type.featOkTst && ((LanguagePair_Type) jcasType).casFeat_description == null)
-      JCasImpl.throwFeatMissing("description", "org.apache.lang.LanguagePair");
+      this.jcasType.jcas.throwFeatMissing("description", "org.apache.lang.LanguagePair");
     return jcasType.ll_cas.ll_getStringValue(addr,
             ((LanguagePair_Type) jcasType).casFeatCode_description);
   }
@@ -103,7 +103,7 @@
   /** setter for description * */
   public void setDescription(String v) {
     if (LanguagePair_Type.featOkTst && ((LanguagePair_Type) jcasType).casFeat_description == null)
-      JCasImpl.throwFeatMissing("description", "org.apache.lang.LanguagePair");
+      this.jcasType.jcas.throwFeatMissing("description", "org.apache.lang.LanguagePair");
     jcasType.ll_cas.ll_setStringValue(addr, ((LanguagePair_Type) jcasType).casFeatCode_description,
             v);
   }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/lang/LanguagePair_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/lang/LanguagePair_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/lang/LanguagePair_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/lang/LanguagePair_Type.java Wed Jan 17 07:46:57 2007
@@ -54,7 +54,7 @@
 
   public final static int typeIndexID = LanguagePair.typeIndexID;
 
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("org.apache.lang.LanguagePair");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("org.apache.lang.LanguagePair");
 
   final Feature casFeat_lang1;
 
@@ -62,13 +62,13 @@
 
   public String getLang1(int addr) {
     if (featOkTst && casFeat_lang1 == null)
-      JCasImpl.throwFeatMissing("lang1", "org.apache.lang.LanguagePair");
+      this.jcas.throwFeatMissing("lang1", "org.apache.lang.LanguagePair");
     return ll_cas.ll_getStringValue(addr, casFeatCode_lang1);
   }
 
   public void setLang1(int addr, String v) {
     if (featOkTst && casFeat_lang1 == null)
-      JCasImpl.throwFeatMissing("lang1", "org.apache.lang.LanguagePair");
+      this.jcas.throwFeatMissing("lang1", "org.apache.lang.LanguagePair");
     ll_cas.ll_setStringValue(addr, casFeatCode_lang1, v);
   }
 
@@ -78,13 +78,13 @@
 
   public String getLang2(int addr) {
     if (featOkTst && casFeat_lang2 == null)
-      JCasImpl.throwFeatMissing("lang2", "org.apache.lang.LanguagePair");
+      this.jcas.throwFeatMissing("lang2", "org.apache.lang.LanguagePair");
     return ll_cas.ll_getStringValue(addr, casFeatCode_lang2);
   }
 
   public void setLang2(int addr, String v) {
     if (featOkTst && casFeat_lang2 == null)
-      JCasImpl.throwFeatMissing("lang2", "org.apache.lang.LanguagePair");
+      this.jcas.throwFeatMissing("lang2", "org.apache.lang.LanguagePair");
     ll_cas.ll_setStringValue(addr, casFeatCode_lang2, v);
   }
 
@@ -94,13 +94,13 @@
 
   public String getDescription(int addr) {
     if (featOkTst && casFeat_description == null)
-      JCasImpl.throwFeatMissing("description", "org.apache.lang.LanguagePair");
+      this.jcas.throwFeatMissing("description", "org.apache.lang.LanguagePair");
     return ll_cas.ll_getStringValue(addr, casFeatCode_description);
   }
 
   public void setDescription(int addr, String v) {
     if (featOkTst && casFeat_description == null)
-      JCasImpl.throwFeatMissing("description", "org.apache.lang.LanguagePair");
+      this.jcas.throwFeatMissing("description", "org.apache.lang.LanguagePair");
     ll_cas.ll_setStringValue(addr, casFeatCode_description, v);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java Wed Jan 17 07:46:57 2007
@@ -29,7 +29,7 @@
  */
 public class CrossAnnotation extends Annotation {
 
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(CrossAnnotation.class);
 
   public final static int type = typeIndexID;
 
@@ -56,7 +56,7 @@
   public Annotation getOtherAnnotation() {
     if (CrossAnnotation_Type.featOkTst
             && ((CrossAnnotation_Type) jcasType).casFeat_otherAnnotation == null)
-      JCasImpl.throwFeatMissing("otherAnnotation", "uima.tcas.CrossAnnotation");
+      this.jcasType.jcas.throwFeatMissing("otherAnnotation", "uima.tcas.CrossAnnotation");
     return (Annotation) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
             ((CrossAnnotation_Type) jcasType).casFeatCode_otherAnnotation)));
   }
@@ -65,7 +65,7 @@
   public void setOtherAnnotation(Annotation v) {
     if (CrossAnnotation_Type.featOkTst
             && ((CrossAnnotation_Type) jcasType).casFeat_otherAnnotation == null)
-      JCasImpl.throwFeatMissing("otherAnnotation", "uima.tcas.CrossAnnotation");
+      this.jcasType.jcas.throwFeatMissing("otherAnnotation", "uima.tcas.CrossAnnotation");
     jcasType.ll_cas.ll_setRefValue(addr,
             ((CrossAnnotation_Type) jcasType).casFeatCode_otherAnnotation, jcasType.ll_cas
                     .ll_getFSRef(v));

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation_Type.java Wed Jan 17 07:46:57 2007
@@ -57,7 +57,7 @@
 
   public final static int typeIndexID = CrossAnnotation.typeIndexID;
 
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("uima.tcas.CrossAnnotation");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("uima.tcas.CrossAnnotation");
 
   final Feature casFeat_otherAnnotation;
 
@@ -65,13 +65,13 @@
 
   public int getOtherAnnotation(int addr) {
     if (featOkTst && casFeat_otherAnnotation == null)
-      JCasImpl.throwFeatMissing("otherAnnotation", "uima.tcas.CrossAnnotation");
+      this.jcas.throwFeatMissing("otherAnnotation", "uima.tcas.CrossAnnotation");
     return ll_cas.ll_getRefValue(addr, casFeatCode_otherAnnotation);
   }
 
   public void setOtherAnnotation(int addr, int v) {
     if (featOkTst && casFeat_otherAnnotation == null)
-      JCasImpl.throwFeatMissing("otherAnnotation", "uima.tcas.CrossAnnotation");
+      this.jcas.throwFeatMissing("otherAnnotation", "uima.tcas.CrossAnnotation");
     ll_cas.ll_setRefValue(addr, casFeatCode_otherAnnotation, v);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java Wed Jan 17 07:46:57 2007
@@ -18,7 +18,7 @@
   /** @generated
    * @ordered 
    */
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(StringSubtypeAnnotation.class);
   /** @generated
    * @ordered 
    */
@@ -66,14 +66,14 @@
    * @generated */
   public String getStringSetFeature() {
     if (StringSubtypeAnnotation_Type.featOkTst && ((StringSubtypeAnnotation_Type)jcasType).casFeat_stringSetFeature == null)
-      JCasImpl.throwFeatMissing("stringSetFeature", "org.apache.uima.cas.test.StringSubtypeAnnotation");
+      this.jcasType.jcas.throwFeatMissing("stringSetFeature", "org.apache.uima.cas.test.StringSubtypeAnnotation");
     return jcasType.ll_cas.ll_getStringValue(addr, ((StringSubtypeAnnotation_Type)jcasType).casFeatCode_stringSetFeature);}
     
   /** setter for stringSetFeature - sets  
    * @generated */
   public void setStringSetFeature(String v) {
     if (StringSubtypeAnnotation_Type.featOkTst && ((StringSubtypeAnnotation_Type)jcasType).casFeat_stringSetFeature == null)
-      JCasImpl.throwFeatMissing("stringSetFeature", "org.apache.uima.cas.test.StringSubtypeAnnotation");
+      this.jcasType.jcas.throwFeatMissing("stringSetFeature", "org.apache.uima.cas.test.StringSubtypeAnnotation");
     jcasType.ll_cas.ll_setStringValue(addr, ((StringSubtypeAnnotation_Type)jcasType).casFeatCode_stringSetFeature, v);}    
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation_Type.java Wed Jan 17 07:46:57 2007
@@ -39,7 +39,7 @@
   public final static int typeIndexID = StringSubtypeAnnotation.typeIndexID;
   /** @generated 
      @modifiable */
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("org.apache.uima.cas.test.StringSubtypeAnnotation");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("org.apache.uima.cas.test.StringSubtypeAnnotation");
  
   /** @generated */
   final Feature casFeat_stringSetFeature;
@@ -48,13 +48,13 @@
   /** @generated */ 
   public String getStringSetFeature(int addr) {
         if (featOkTst && casFeat_stringSetFeature == null)
-      JCasImpl.throwFeatMissing("stringSetFeature", "org.apache.uima.cas.test.StringSubtypeAnnotation");
+      this.jcas.throwFeatMissing("stringSetFeature", "org.apache.uima.cas.test.StringSubtypeAnnotation");
     return ll_cas.ll_getStringValue(addr, casFeatCode_stringSetFeature);
   }
   /** @generated */    
   public void setStringSetFeature(int addr, String v) {
         if (featOkTst && casFeat_stringSetFeature == null)
-      JCasImpl.throwFeatMissing("stringSetFeature", "org.apache.uima.cas.test.StringSubtypeAnnotation");
+      this.jcas.throwFeatMissing("stringSetFeature", "org.apache.uima.cas.test.StringSubtypeAnnotation");
     ll_cas.ll_setStringValue(addr, casFeatCode_stringSetFeature, v);}
     
   

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/EndOfSentence.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/EndOfSentence.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/EndOfSentence.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/EndOfSentence.java Wed Jan 17 07:46:57 2007
@@ -26,7 +26,7 @@
 /* comment 6 of 14 */
 public class EndOfSentence extends TokenType {
 
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(EndOfSentence.class);
 
   public final static int type = typeIndexID;
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/EndOfSentence_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/EndOfSentence_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/EndOfSentence_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/EndOfSentence_Type.java Wed Jan 17 07:46:57 2007
@@ -51,7 +51,7 @@
 
   public final static int typeIndexID = EndOfSentence.typeIndexID;
 
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("x.y.z.EndOfSentence");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("x.y.z.EndOfSentence");
 
   // * initialize variables to correspond with Cas Type and Features
   public EndOfSentence_Type(JCas jcas, Type casType) {

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Sentence.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Sentence.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Sentence.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Sentence.java Wed Jan 17 07:46:57 2007
@@ -27,7 +27,7 @@
 /* comment 1 of 14 */
 public class Sentence extends Annotation {
 
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(Sentence.class);
 
   public final static int type = typeIndexID;
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Sentence_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Sentence_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Sentence_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Sentence_Type.java Wed Jan 17 07:46:57 2007
@@ -52,7 +52,7 @@
 
   public final static int typeIndexID = Sentence.typeIndexID;
 
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("x.y.z.Sentence");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("x.y.z.Sentence");
 
   // * initialize variables to correspond with Cas Type and Features
   public Sentence_Type(JCas jcas, Type casType) {

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Separator.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Separator.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Separator.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Separator.java Wed Jan 17 07:46:57 2007
@@ -26,7 +26,7 @@
 /* comment 5 of 14 */
 public class Separator extends TokenType {
 
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(Separator.class);
 
   public final static int type = typeIndexID;
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Separator_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Separator_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Separator_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Separator_Type.java Wed Jan 17 07:46:57 2007
@@ -51,7 +51,7 @@
 
   public final static int typeIndexID = Separator.typeIndexID;
 
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("x.y.z.Separator");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("x.y.z.Separator");
 
   // * initialize variables to correspond with Cas Type and Features
   public Separator_Type(JCas jcas, Type casType) {

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Token.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Token.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Token.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Token.java Wed Jan 17 07:46:57 2007
@@ -28,7 +28,7 @@
 /* comment 2 of 14 */
 public class Token extends Annotation {
 
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(Token.class);
 
   public final static int type = typeIndexID;
 
@@ -69,7 +69,7 @@
   /** getter for ttype * */
   public TokenType getTtype() {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_ttype == null)
-      JCasImpl.throwFeatMissing("ttype", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("ttype", "x.y.z.Token");
     return (TokenType) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
             ((Token_Type) jcasType).casFeatCode_ttype)));
   }
@@ -77,7 +77,7 @@
   /** setter for ttype * */
   public void setTtype(TokenType v) {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_ttype == null)
-      JCasImpl.throwFeatMissing("ttype", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("ttype", "x.y.z.Token");
     jcasType.ll_cas.ll_setRefValue(addr, ((Token_Type) jcasType).casFeatCode_ttype, jcasType.ll_cas
             .ll_getFSRef(v));
   }
@@ -87,7 +87,7 @@
   /** getter for tokenFloatFeat * */
   public float getTokenFloatFeat() {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_tokenFloatFeat == null)
-      JCasImpl.throwFeatMissing("tokenFloatFeat", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("tokenFloatFeat", "x.y.z.Token");
     return jcasType.ll_cas.ll_getFloatValue(addr,
             ((Token_Type) jcasType).casFeatCode_tokenFloatFeat);
   }
@@ -95,7 +95,7 @@
   /** setter for tokenFloatFeat * */
   public void setTokenFloatFeat(float v) {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_tokenFloatFeat == null)
-      JCasImpl.throwFeatMissing("tokenFloatFeat", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("tokenFloatFeat", "x.y.z.Token");
     jcasType.ll_cas.ll_setFloatValue(addr, ((Token_Type) jcasType).casFeatCode_tokenFloatFeat, v);
   }
 
@@ -104,14 +104,14 @@
   /** getter for lemma * */
   public String getLemma() {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_lemma == null)
-      JCasImpl.throwFeatMissing("lemma", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("lemma", "x.y.z.Token");
     return jcasType.ll_cas.ll_getStringValue(addr, ((Token_Type) jcasType).casFeatCode_lemma);
   }
 
   /** setter for lemma * */
   public void setLemma(String v) {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_lemma == null)
-      JCasImpl.throwFeatMissing("lemma", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("lemma", "x.y.z.Token");
     jcasType.ll_cas.ll_setStringValue(addr, ((Token_Type) jcasType).casFeatCode_lemma, v);
   }
 
@@ -120,14 +120,14 @@
   /** getter for sentenceLength * */
   public int getSentenceLength() {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_sentenceLength == null)
-      JCasImpl.throwFeatMissing("sentenceLength", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("sentenceLength", "x.y.z.Token");
     return jcasType.ll_cas.ll_getIntValue(addr, ((Token_Type) jcasType).casFeatCode_sentenceLength);
   }
 
   /** setter for sentenceLength * */
   public void setSentenceLength(int v) {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_sentenceLength == null)
-      JCasImpl.throwFeatMissing("sentenceLength", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("sentenceLength", "x.y.z.Token");
     jcasType.ll_cas.ll_setIntValue(addr, ((Token_Type) jcasType).casFeatCode_sentenceLength, v);
   }
 
@@ -136,7 +136,7 @@
   /** getter for lemmaList * */
   public StringArray getLemmaList() {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_lemmaList == null)
-      JCasImpl.throwFeatMissing("lemmaList", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("lemmaList", "x.y.z.Token");
     return (StringArray) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
             ((Token_Type) jcasType).casFeatCode_lemmaList)));
   }
@@ -144,7 +144,7 @@
   /** indexed getter for lemmaList * */
   public String getLemmaList(int i) {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_lemmaList == null)
-      JCasImpl.throwFeatMissing("lemmaList", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("lemmaList", "x.y.z.Token");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
             ((Token_Type) jcasType).casFeatCode_lemmaList), i);
     return jcasType.ll_cas.ll_getStringArrayValue(jcasType.ll_cas.ll_getRefValue(addr,
@@ -154,7 +154,7 @@
   /** setter for lemmaList * */
   public void setLemmaList(StringArray v) {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_lemmaList == null)
-      JCasImpl.throwFeatMissing("lemmaList", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("lemmaList", "x.y.z.Token");
     jcasType.ll_cas.ll_setRefValue(addr, ((Token_Type) jcasType).casFeatCode_lemmaList,
             jcasType.ll_cas.ll_getFSRef(v));
   }
@@ -162,7 +162,7 @@
   /** indexed setter for lemmaList * */
   public void setLemmaList(int i, String v) {
     if (Token_Type.featOkTst && ((Token_Type) jcasType).casFeat_lemmaList == null)
-      JCasImpl.throwFeatMissing("lemmaList", "x.y.z.Token");
+      this.jcasType.jcas.throwFeatMissing("lemmaList", "x.y.z.Token");
     jcasType.jcas.checkArrayBounds(jcasType.ll_cas.ll_getRefValue(addr,
             ((Token_Type) jcasType).casFeatCode_lemmaList), i);
     jcasType.ll_cas.ll_setStringArrayValue(jcasType.ll_cas.ll_getRefValue(addr,

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/TokenType.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/TokenType.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/TokenType.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/TokenType.java Wed Jan 17 07:46:57 2007
@@ -27,7 +27,7 @@
 /* comment 3 of 14 */
 public class TokenType extends TOP {
 
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(TokenType.class);
 
   public final static int type = typeIndexID;
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/TokenType_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/TokenType_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/TokenType_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/TokenType_Type.java Wed Jan 17 07:46:57 2007
@@ -52,7 +52,7 @@
 
   public final static int typeIndexID = TokenType.typeIndexID;
 
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("x.y.z.TokenType");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("x.y.z.TokenType");
 
   // * initialize variables to correspond with Cas Type and Features
   public TokenType_Type(JCas jcas, Type casType) {

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Token_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Token_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Token_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Token_Type.java Wed Jan 17 07:46:57 2007
@@ -54,7 +54,7 @@
 
   public final static int typeIndexID = Token.typeIndexID;
 
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("x.y.z.Token");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("x.y.z.Token");
 
   final Feature casFeat_ttype;
 
@@ -62,13 +62,13 @@
 
   public int getTtype(int addr) {
     if (featOkTst && casFeat_ttype == null)
-      JCasImpl.throwFeatMissing("ttype", "x.y.z.Token");
+      this.jcas.throwFeatMissing("ttype", "x.y.z.Token");
     return ll_cas.ll_getRefValue(addr, casFeatCode_ttype);
   }
 
   public void setTtype(int addr, int v) {
     if (featOkTst && casFeat_ttype == null)
-      JCasImpl.throwFeatMissing("ttype", "x.y.z.Token");
+      this.jcas.throwFeatMissing("ttype", "x.y.z.Token");
     ll_cas.ll_setRefValue(addr, casFeatCode_ttype, v);
   }
 
@@ -78,13 +78,13 @@
 
   public float getTokenFloatFeat(int addr) {
     if (featOkTst && casFeat_tokenFloatFeat == null)
-      JCasImpl.throwFeatMissing("tokenFloatFeat", "x.y.z.Token");
+      this.jcas.throwFeatMissing("tokenFloatFeat", "x.y.z.Token");
     return ll_cas.ll_getFloatValue(addr, casFeatCode_tokenFloatFeat);
   }
 
   public void setTokenFloatFeat(int addr, float v) {
     if (featOkTst && casFeat_tokenFloatFeat == null)
-      JCasImpl.throwFeatMissing("tokenFloatFeat", "x.y.z.Token");
+      this.jcas.throwFeatMissing("tokenFloatFeat", "x.y.z.Token");
     ll_cas.ll_setFloatValue(addr, casFeatCode_tokenFloatFeat, v);
   }
 
@@ -94,13 +94,13 @@
 
   public String getLemma(int addr) {
     if (featOkTst && casFeat_lemma == null)
-      JCasImpl.throwFeatMissing("lemma", "x.y.z.Token");
+      this.jcas.throwFeatMissing("lemma", "x.y.z.Token");
     return ll_cas.ll_getStringValue(addr, casFeatCode_lemma);
   }
 
   public void setLemma(int addr, String v) {
     if (featOkTst && casFeat_lemma == null)
-      JCasImpl.throwFeatMissing("lemma", "x.y.z.Token");
+      this.jcas.throwFeatMissing("lemma", "x.y.z.Token");
     ll_cas.ll_setStringValue(addr, casFeatCode_lemma, v);
   }
 
@@ -110,13 +110,13 @@
 
   public int getSentenceLength(int addr) {
     if (featOkTst && casFeat_sentenceLength == null)
-      JCasImpl.throwFeatMissing("sentenceLength", "x.y.z.Token");
+      this.jcas.throwFeatMissing("sentenceLength", "x.y.z.Token");
     return ll_cas.ll_getIntValue(addr, casFeatCode_sentenceLength);
   }
 
   public void setSentenceLength(int addr, int v) {
     if (featOkTst && casFeat_sentenceLength == null)
-      JCasImpl.throwFeatMissing("sentenceLength", "x.y.z.Token");
+      this.jcas.throwFeatMissing("sentenceLength", "x.y.z.Token");
     ll_cas.ll_setIntValue(addr, casFeatCode_sentenceLength, v);
   }
 
@@ -126,13 +126,13 @@
 
   public int getLemmaList(int addr) {
     if (featOkTst && casFeat_lemmaList == null)
-      JCasImpl.throwFeatMissing("lemmaList", "x.y.z.Token");
+      this.jcas.throwFeatMissing("lemmaList", "x.y.z.Token");
     return ll_cas.ll_getRefValue(addr, casFeatCode_lemmaList);
   }
 
   public String getLemmaList(int addr, int i) {
     if (featOkTst && casFeat_lemmaList == null)
-      JCasImpl.throwFeatMissing("lemmaList", "x.y.z.Token");
+      this.jcas.throwFeatMissing("lemmaList", "x.y.z.Token");
     if (lowLevelTypeChecks)
       return ll_cas.ll_getStringArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_lemmaList), i,
               true);
@@ -142,13 +142,13 @@
 
   public void setLemmaList(int addr, int v) {
     if (featOkTst && casFeat_lemmaList == null)
-      JCasImpl.throwFeatMissing("lemmaList", "x.y.z.Token");
+      this.jcas.throwFeatMissing("lemmaList", "x.y.z.Token");
     ll_cas.ll_setRefValue(addr, casFeatCode_lemmaList, v);
   }
 
   public void setLemmaList(int addr, int i, String v) {
     if (featOkTst && casFeat_lemmaList == null)
-      JCasImpl.throwFeatMissing("lemmaList", "x.y.z.Token");
+      this.jcas.throwFeatMissing("lemmaList", "x.y.z.Token");
     if (lowLevelTypeChecks)
       ll_cas.ll_setStringArrayValue(ll_cas.ll_getRefValue(addr, casFeatCode_lemmaList), i, v, true);
     jcas.checkArrayBounds(ll_cas.ll_getRefValue(addr, casFeatCode_lemmaList), i);

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Word.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Word.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Word.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Word.java Wed Jan 17 07:46:57 2007
@@ -26,7 +26,7 @@
 /* comment 4 of 14 */
 public class Word extends TokenType {
 
-  public final static int typeIndexID = JCasImpl.getNextIndex();
+  public final static int typeIndexID = org.apache.uima.jcas.JCasRegistry.register(Word.class);
 
   public final static int type = typeIndexID;
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Word_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Word_Type.java?view=diff&rev=497047&r1=497046&r2=497047
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Word_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/x/y/z/Word_Type.java Wed Jan 17 07:46:57 2007
@@ -51,7 +51,7 @@
 
   public final static int typeIndexID = Word.typeIndexID;
 
-  public final static boolean featOkTst = JCasImpl.getFeatOkTst("x.y.z.Word");
+  public final static boolean featOkTst = org.apache.uima.jcas.JCasRegistry.getFeatOkTst("x.y.z.Word");
 
   // * initialize variables to correspond with Cas Type and Features
   public Word_Type(JCas jcas, Type casType) {