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 2006/12/23 23:37:33 UTC
svn commit: r489936 [2/3] - in /incubator/uima/uimaj/trunk/uimaj-core/src:
main/java/org/apache/uima/analysis_component/
main/java/org/apache/uima/analysis_engine/
main/java/org/apache/uima/analysis_engine/annotator/
main/java/org/apache/uima/analysis_...
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList_Type.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFSList_Type.java Sat Dec 23 14:37:29 2006
@@ -26,7 +26,8 @@
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class NonEmptyFSList_Type extends FSList_Type {
protected FSGenerator getFSGenerator() {
@@ -51,7 +52,7 @@
public final static int typeIndexID = NonEmptyFSList.typeIndexID;
- public final static boolean featOkTst = JCas.getFeatOkTst("uima.cas.NonEmptyFSList");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("uima.cas.NonEmptyFSList");
final Feature casFeat_head;
@@ -59,13 +60,13 @@
public int getHead(int addr) {
if (featOkTst && casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyFSList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyFSList");
return ll_cas.ll_getRefValue(addr, casFeatCode_head);
}
public void setHead(int addr, int v) {
if (featOkTst && casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyFSList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyFSList");
ll_cas.ll_setRefValue(addr, casFeatCode_head, v);
}
@@ -75,13 +76,13 @@
public int getTail(int addr) {
if (featOkTst && casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyFSList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyFSList");
return ll_cas.ll_getRefValue(addr, casFeatCode_tail);
}
public void setTail(int addr, int v) {
if (featOkTst && casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyFSList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyFSList");
ll_cas.ll_setRefValue(addr, casFeatCode_tail, v);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java Sat Dec 23 14:37:29 2006
@@ -19,11 +19,12 @@
package org.apache.uima.jcas.cas;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class NonEmptyFloatList extends FloatList {
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
public final static int type = typeIndexID;
@@ -50,7 +51,7 @@
public float getHead() {
if (NonEmptyFloatList_Type.featOkTst
&& ((NonEmptyFloatList_Type) jcasType).casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyFloatList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyFloatList");
return jcasType.ll_cas.ll_getFloatValue(addr,
((NonEmptyFloatList_Type) jcasType).casFeatCode_head);
}
@@ -59,7 +60,7 @@
public void setHead(float v) {
if (NonEmptyFloatList_Type.featOkTst
&& ((NonEmptyFloatList_Type) jcasType).casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyFloatList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyFloatList");
jcasType.ll_cas.ll_setFloatValue(addr, ((NonEmptyFloatList_Type) jcasType).casFeatCode_head, v);
}
@@ -69,7 +70,7 @@
public FloatList getTail() {
if (NonEmptyFloatList_Type.featOkTst
&& ((NonEmptyFloatList_Type) jcasType).casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyFloatList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyFloatList");
return (FloatList) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
((NonEmptyFloatList_Type) jcasType).casFeatCode_tail)));
}
@@ -78,7 +79,7 @@
public void setTail(FloatList v) {
if (NonEmptyFloatList_Type.featOkTst
&& ((NonEmptyFloatList_Type) jcasType).casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyFloatList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyFloatList");
jcasType.ll_cas.ll_setRefValue(addr, ((NonEmptyFloatList_Type) jcasType).casFeatCode_tail,
jcasType.ll_cas.ll_getFSRef(v));
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList_Type.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList_Type.java Sat Dec 23 14:37:29 2006
@@ -26,7 +26,8 @@
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class NonEmptyFloatList_Type extends FloatList_Type {
protected FSGenerator getFSGenerator() {
@@ -51,7 +52,7 @@
public final static int typeIndexID = NonEmptyFloatList.typeIndexID;
- public final static boolean featOkTst = JCas.getFeatOkTst("uima.cas.NonEmptyFloatList");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("uima.cas.NonEmptyFloatList");
final Feature casFeat_head;
@@ -59,13 +60,13 @@
public float getHead(int addr) {
if (featOkTst && casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyFloatList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyFloatList");
return ll_cas.ll_getFloatValue(addr, casFeatCode_head);
}
public void setHead(int addr, float v) {
if (featOkTst && casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyFloatList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyFloatList");
ll_cas.ll_setFloatValue(addr, casFeatCode_head, v);
}
@@ -75,13 +76,13 @@
public int getTail(int addr) {
if (featOkTst && casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyFloatList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyFloatList");
return ll_cas.ll_getRefValue(addr, casFeatCode_tail);
}
public void setTail(int addr, int v) {
if (featOkTst && casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyFloatList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyFloatList");
ll_cas.ll_setRefValue(addr, casFeatCode_tail, v);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java Sat Dec 23 14:37:29 2006
@@ -19,11 +19,12 @@
package org.apache.uima.jcas.cas;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class NonEmptyIntegerList extends IntegerList {
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
public final static int type = typeIndexID;
@@ -50,7 +51,7 @@
public int getHead() {
if (NonEmptyIntegerList_Type.featOkTst
&& ((NonEmptyIntegerList_Type) jcasType).casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyIntegerList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyIntegerList");
return jcasType.ll_cas.ll_getIntValue(addr,
((NonEmptyIntegerList_Type) jcasType).casFeatCode_head);
}
@@ -59,7 +60,7 @@
public void setHead(int v) {
if (NonEmptyIntegerList_Type.featOkTst
&& ((NonEmptyIntegerList_Type) jcasType).casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyIntegerList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyIntegerList");
jcasType.ll_cas.ll_setIntValue(addr, ((NonEmptyIntegerList_Type) jcasType).casFeatCode_head, v);
}
@@ -69,7 +70,7 @@
public IntegerList getTail() {
if (NonEmptyIntegerList_Type.featOkTst
&& ((NonEmptyIntegerList_Type) jcasType).casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyIntegerList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyIntegerList");
return (IntegerList) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
((NonEmptyIntegerList_Type) jcasType).casFeatCode_tail)));
}
@@ -78,7 +79,7 @@
public void setTail(IntegerList v) {
if (NonEmptyIntegerList_Type.featOkTst
&& ((NonEmptyIntegerList_Type) jcasType).casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyIntegerList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyIntegerList");
jcasType.ll_cas.ll_setRefValue(addr, ((NonEmptyIntegerList_Type) jcasType).casFeatCode_tail,
jcasType.ll_cas.ll_getFSRef(v));
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList_Type.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList_Type.java Sat Dec 23 14:37:29 2006
@@ -26,7 +26,8 @@
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class NonEmptyIntegerList_Type extends IntegerList_Type {
protected FSGenerator getFSGenerator() {
@@ -51,7 +52,7 @@
public final static int typeIndexID = NonEmptyIntegerList.typeIndexID;
- public final static boolean featOkTst = JCas.getFeatOkTst("uima.cas.NonEmptyIntegerList");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("uima.cas.NonEmptyIntegerList");
final Feature casFeat_head;
@@ -59,13 +60,13 @@
public int getHead(int addr) {
if (featOkTst && casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyIntegerList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyIntegerList");
return ll_cas.ll_getIntValue(addr, casFeatCode_head);
}
public void setHead(int addr, int v) {
if (featOkTst && casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyIntegerList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyIntegerList");
ll_cas.ll_setIntValue(addr, casFeatCode_head, v);
}
@@ -75,13 +76,13 @@
public int getTail(int addr) {
if (featOkTst && casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyIntegerList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyIntegerList");
return ll_cas.ll_getRefValue(addr, casFeatCode_tail);
}
public void setTail(int addr, int v) {
if (featOkTst && casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyIntegerList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyIntegerList");
ll_cas.ll_setRefValue(addr, casFeatCode_tail, v);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList.java Sat Dec 23 14:37:29 2006
@@ -19,11 +19,12 @@
package org.apache.uima.jcas.cas;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class NonEmptyStringList extends StringList {
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
public final static int type = typeIndexID;
@@ -50,7 +51,7 @@
public String getHead() {
if (NonEmptyStringList_Type.featOkTst
&& ((NonEmptyStringList_Type) jcasType).casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyStringList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyStringList");
return jcasType.ll_cas.ll_getStringValue(addr,
((NonEmptyStringList_Type) jcasType).casFeatCode_head);
}
@@ -59,7 +60,7 @@
public void setHead(String v) {
if (NonEmptyStringList_Type.featOkTst
&& ((NonEmptyStringList_Type) jcasType).casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyStringList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyStringList");
jcasType.ll_cas.ll_setStringValue(addr, ((NonEmptyStringList_Type) jcasType).casFeatCode_head,
v);
}
@@ -70,7 +71,7 @@
public StringList getTail() {
if (NonEmptyStringList_Type.featOkTst
&& ((NonEmptyStringList_Type) jcasType).casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyStringList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyStringList");
return (StringList) (jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
((NonEmptyStringList_Type) jcasType).casFeatCode_tail)));
}
@@ -79,7 +80,7 @@
public void setTail(StringList v) {
if (NonEmptyStringList_Type.featOkTst
&& ((NonEmptyStringList_Type) jcasType).casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyStringList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyStringList");
jcasType.ll_cas.ll_setRefValue(addr, ((NonEmptyStringList_Type) jcasType).casFeatCode_tail,
jcasType.ll_cas.ll_getFSRef(v));
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyStringList_Type.java Sat Dec 23 14:37:29 2006
@@ -26,7 +26,8 @@
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class NonEmptyStringList_Type extends StringList_Type {
protected FSGenerator getFSGenerator() {
@@ -51,7 +52,7 @@
public final static int typeIndexID = NonEmptyStringList.typeIndexID;
- public final static boolean featOkTst = JCas.getFeatOkTst("uima.cas.NonEmptyStringList");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("uima.cas.NonEmptyStringList");
final Feature casFeat_head;
@@ -59,13 +60,13 @@
public String getHead(int addr) {
if (featOkTst && casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyStringList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyStringList");
return ll_cas.ll_getStringValue(addr, casFeatCode_head);
}
public void setHead(int addr, String v) {
if (featOkTst && casFeat_head == null)
- JCas.throwFeatMissing("head", "uima.cas.NonEmptyStringList");
+ JCasImpl.throwFeatMissing("head", "uima.cas.NonEmptyStringList");
ll_cas.ll_setStringValue(addr, casFeatCode_head, v);
}
@@ -75,13 +76,13 @@
public int getTail(int addr) {
if (featOkTst && casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyStringList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyStringList");
return ll_cas.ll_getRefValue(addr, casFeatCode_tail);
}
public void setTail(int addr, int v) {
if (featOkTst && casFeat_tail == null)
- JCas.throwFeatMissing("tail", "uima.cas.NonEmptyStringList");
+ JCasImpl.throwFeatMissing("tail", "uima.cas.NonEmptyStringList");
ll_cas.ll_setRefValue(addr, casFeatCode_tail, v);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java Sat Dec 23 14:37:29 2006
@@ -20,7 +20,8 @@
package org.apache.uima.jcas.cas;
import org.apache.uima.cas.ShortArrayFS;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/** JCas class model for ShortArray */
public final class ShortArray extends TOP implements ShortArrayFS {
@@ -28,7 +29,7 @@
* Each cover class when loaded sets an index. Used in the JCas typeArray to go from the cover
* class or class instance to the corresponding instance of the _Type class
*/
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
public final static int type = typeIndexID;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray_Type.java Sat Dec 23 14:37:29 2006
@@ -24,7 +24,7 @@
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
// *********************************
// * Implementation of ShortArray_Type for JCas
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java Sat Dec 23 14:37:29 2006
@@ -30,7 +30,8 @@
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TCASImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* Updated by JCasGen Fri Apr 29 16:05:04 EDT 2005
@@ -40,7 +41,7 @@
* @generated
* @ordered
*/
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
/**
* @generated
@@ -72,7 +73,7 @@
}
/**
- * @deprecated As of v2.0, use {@link JCas#createView(String)} to create a view, which will also
+ * @deprecated As of v2.0, use {@link JCasImpl#createView(String)} to create a view, which will also
* create the Sofa for that view.
*/
public Sofa(JCas jcas, SofaID ID, String mimeType) {
@@ -100,7 +101,7 @@
*/
public int getSofaNum() {
if (Sofa_Type.featOkTst && ((Sofa_Type) jcasType).casFeat_sofaNum == null)
- JCas.throwFeatMissing("sofaNum", "uima.cas.Sofa");
+ JCasImpl.throwFeatMissing("sofaNum", "uima.cas.Sofa");
return jcasType.ll_cas.ll_getIntValue(addr, ((Sofa_Type) jcasType).casFeatCode_sofaNum);
}
@@ -114,7 +115,7 @@
*/
public String getSofaID() {
if (Sofa_Type.featOkTst && ((Sofa_Type) jcasType).casFeat_sofaID == null)
- JCas.throwFeatMissing("sofaID", "uima.cas.Sofa");
+ JCasImpl.throwFeatMissing("sofaID", "uima.cas.Sofa");
return jcasType.ll_cas.ll_getStringValue(addr, ((Sofa_Type) jcasType).casFeatCode_sofaID);
}
@@ -128,7 +129,7 @@
*/
public String getMimeType() {
if (Sofa_Type.featOkTst && ((Sofa_Type) jcasType).casFeat_mimeType == null)
- JCas.throwFeatMissing("mimeType", "uima.cas.Sofa");
+ JCasImpl.throwFeatMissing("mimeType", "uima.cas.Sofa");
return jcasType.ll_cas.ll_getStringValue(addr, ((Sofa_Type) jcasType).casFeatCode_mimeType);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa_Type.java Sat Dec 23 14:37:29 2006
@@ -26,7 +26,8 @@
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* Updated by JCasGen Fri Apr 29 16:05:04 EDT 2005
@@ -63,7 +64,7 @@
* @generated
* @modifiable
*/
- public final static boolean featOkTst = JCas.getFeatOkTst("uima.cas.Sofa");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("uima.cas.Sofa");
/** @generated */
final Feature casFeat_sofaNum;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray.java Sat Dec 23 14:37:29 2006
@@ -20,7 +20,8 @@
package org.apache.uima.jcas.cas;
import org.apache.uima.cas.StringArrayFS;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/** JCas class model for StringArray */
public final class StringArray extends TOP implements StringArrayFS {
@@ -28,7 +29,7 @@
* Each cover class when loaded sets an index. Used in the JCas typeArray to go from the cover
* class or class instance to the corresponding instance of the _Type class
*/
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
public final static int type = typeIndexID;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray_Type.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringArray_Type.java Sat Dec 23 14:37:29 2006
@@ -24,7 +24,7 @@
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
// *********************************
// * Implementation of StringArray_Type for JCas
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java Sat Dec 23 14:37:29 2006
@@ -20,11 +20,12 @@
package org.apache.uima.jcas.cas;
import org.apache.uima.cas.CASRuntimeException;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class StringList extends org.apache.uima.jcas.cas.TOP {
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
public final static int type = typeIndexID;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList_Type.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList_Type.java Sat Dec 23 14:37:29 2006
@@ -24,7 +24,8 @@
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class StringList_Type extends org.apache.uima.jcas.cas.TOP_Type {
protected FSGenerator getFSGenerator() {
@@ -49,7 +50,7 @@
public final static int typeIndexID = StringList.typeIndexID;
- public final static boolean featOkTst = JCas.getFeatOkTst("uima.cas.StringList");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("uima.cas.StringList");
// * initialize variables to correspond with Cas Type and Features
public StringList_Type(JCas jcas, Type casType) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP.java Sat Dec 23 14:37:29 2006
@@ -25,7 +25,8 @@
import org.apache.uima.cas.impl.FeatureStructureImpl;
import org.apache.uima.cas.impl.LowLevelCAS;
import org.apache.uima.cas.impl.TCASImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
// *********************************
// * Implementation of TOP *
@@ -41,7 +42,7 @@
* Each cover class when loaded sets an index. Used in the JCas typeArray to go from the cover
* class or class instance to the corresponding instance of the _Type class
*/
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
public final static int type = typeIndexID;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java Sat Dec 23 14:37:29 2006
@@ -26,7 +26,7 @@
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.LowLevelCAS;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
// *********************************
// * Implementation of TOP_Type *
Copied: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java (from r489924, incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java)
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java?view=diff&rev=489936&p1=incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java&r1=489924&p2=incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java Sat Dec 23 14:37:29 2006
@@ -64,6 +64,7 @@
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.text.TCAS;
import org.apache.uima.cas.text.TCASRuntimeException;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JFSIndexRepository;
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.FloatArray;
@@ -137,7 +138,7 @@
* reset when the CAS is reset, and are initialized lazily, on first use.
*/
-public class JCas extends AbstractCas_ImplBase implements AbstractCas {
+public class JCasImpl extends AbstractCas_ImplBase implements AbstractCas, JCas {
// * FSIndexRepository - the get method returns the java type *
// * so FSIndexRepository can't be in the implements clause *
@@ -146,11 +147,6 @@
// *************************************************
private final static int INITIAL_HASHMAP_SIZE = 200;
- /**
- * (internal use)
- */
- public final static int INVALID_FEATURE_CODE = -1;
-
private static int nextIndex = 0;
private static ArrayList loadedJCasTypeClassNames = new ArrayList();
@@ -235,41 +231,50 @@
// *********************************
// * Getters for read-only objects *
// *********************************
- /** return the FSIndexRepository object for this Cas. */
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getFSIndexRepository()
+ */
public FSIndexRepository getFSIndexRepository() {
return casImpl.getIndexRepository();
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getLowLevelIndexRepository()
+ */
public LowLevelIndexRepository getLowLevelIndexRepository() {
return ll_IndexRepository;
}
- /** return the Cas object for this JCas instantiation */
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getCas()
+ */
public CAS getCas() {
return casImpl;
}
- /** internal use */
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getCasImpl()
+ */
public CASImpl getCasImpl() {
return casImpl;
}
- /** internal use */
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getLowLevelCas()
+ */
public LowLevelCAS getLowLevelCas() {
return casImpl;
}
- /** return the Cas TypeSystem for this JCas. */
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getTypeSystem()
+ */
public TypeSystem getTypeSystem() {
return casImpl.getTypeSystem();
}
- /**
- * get the JCas _Type instance for a particular CAS type constant
- *
- * @param i
- * the CAS type constant, written as Foo.type
- * @return the instance of the JCas xxx_Type object for the specified type
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getType(int)
*/
public TOP_Type getType(int i) {
if (i >= typeArray.length || null == typeArray[i]) {
@@ -299,24 +304,15 @@
return typeArray[i];
}
- /**
- * Given Foo.type, return the corresponding CAS Type object. This is useful in the methods which
- * require a CAS Type, for instance iterator creation.
- *
- * @param i -
- * index returned by Foo.type
- * @return the CAS Java Type object for this CAS Type.
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getCasType(int)
*/
public Type getCasType(int i) {
return getType(i).casType;
}
- /**
- * get the JCas x_Type instance for a particular Java instance of a type
- *
- * @param instance
- * @return the associated xxx_Type instance
- * @deprecated use instance.jcasType instead - faster
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getType(org.apache.uima.jcas.cas.TOP)
*/
public TOP_Type getType(TOP instance) {
return getType(instance.getTypeIndexID());
@@ -341,7 +337,7 @@
}
// never called, but have to set values to null because they're final
- private JCas() {
+ private JCasImpl() {
sharedView = null;
casImpl = null;
typeArray = null;
@@ -358,7 +354,7 @@
* The CAS must be initialized when this is called.
*
*/
- private JCas(CASImpl cas) throws CASException {
+ private JCasImpl(CASImpl cas) throws CASException {
// * A new instance of JCas exists for each CAS
// * At this point, some but not necessarily all of the Types have been loaded
@@ -385,7 +381,7 @@
// * loading of the JCas Type classes until this thread's loading
// * completes.
- synchronized (JCas.class) {
+ synchronized (JCasImpl.class) {
final TypeSystem ts = casImpl.getTypeSystem();
Iterator typeIt = ts.getTypeIterator();
@@ -431,7 +427,7 @@
}
}
- typeArray = new TOP_Type[JCas.getNextIndexNoIncr()];
+ typeArray = new TOP_Type[JCasImpl.getNextIndexNoIncr()];
Iterator jcasTypeIt = jcasTypes.entrySet().iterator();
while (jcasTypeIt.hasNext()) {
@@ -477,8 +473,8 @@
* a CAS instance
* @return newly created and initialized JCas
*/
- public static JCas getJCas(CASImpl cas) throws CASException {
- JCas jcas = new JCas(cas);
+ public static JCasImpl getJCas(CASImpl cas) throws CASException {
+ JCasImpl jcas = new JCasImpl(cas);
if (jcas.sharedView.errorSet.size() > 0) {
StringBuffer msg = new StringBuffer(100);
CASException e = new CASException(CASException.JCAS_INIT_ERROR);
@@ -602,9 +598,8 @@
return true;
}
- /**
- * Internal use - looks up a type-name-string in the CAS type system and returns the Cas Type
- * object. Throws CASException if the type isn't found
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getRequiredType(java.lang.String)
*/
public Type getRequiredType(String s) throws CASException {
Type t = getTypeSystem().getType(s);
@@ -616,9 +611,8 @@
return t;
}
- /**
- * Internal use - look up a feature-name-string in the CAS type system and returns the Cas Feature
- * object. Throws CASException if the feature isn't found
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getRequiredFeature(org.apache.uima.cas.Type, java.lang.String)
*/
public Feature getRequiredFeature(Type t, String s) throws CASException {
Feature f = t.getFeatureByBaseName(s);
@@ -631,9 +625,8 @@
return f;
}
- /**
- * Internal Use - look up a feature-name-string in the CAS type system and returns the Cas Feature
- * object. If the feature isn't found, adds an exception to the errorSet but doesn't throw
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getRequiredFeatureDE(org.apache.uima.cas.Type, java.lang.String, java.lang.String, boolean)
*/
public Feature getRequiredFeatureDE(Type t, String s, String rangeName, boolean featOkTst) {
@@ -676,15 +669,15 @@
/** internal use - constant used in getting constructors */
final static private Class[] jcasBaseAndType = new Class[] { JCas.class, Type.class };
- /**
- * internal - sets the corresponding Java instance for a Cas instance
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#putJfsFromCaddr(int, org.apache.uima.cas.FeatureStructure)
*/
public void putJfsFromCaddr(int casAddr, FeatureStructure fs) {
cAddr2Jfs.put(new Integer(casAddr), fs);
}
- /**
- * internal - sets the corresponding Java instance for a Cas instance
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getJfsFromCaddr(int)
*/
public TOP getJfsFromCaddr(int casAddr) {
return (TOP) cAddr2Jfs.get(new Integer(casAddr));
@@ -697,7 +690,7 @@
* associations.
*/
public static void clearData(CAS cas) throws CASException {
- JCas jcas = cas.getJCas();
+ JCasImpl jcas = cas.getJCas();
int hashSize = Math.max(jcas.cAddr2Jfs.size(), 32); // not worth dropping below 32
// System.out.println("\n***JCas Resizing Hashtable: size is: " + hashSize + ", curmax = " +
// jcas.prevCaddr2JfsSize);
@@ -717,13 +710,18 @@
jcas.sharedView.integerArray0L = null;
}
- /** calls the cas reset() function */
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#reset()
+ */
public void reset() {
getCas().reset();
}
private final static int NULL = 0;
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#checkArrayBounds(int, int)
+ */
public final void checkArrayBounds(int fsRef, int pos) {
if (NULL == fsRef) {
LowLevelException e = new LowLevelException(LowLevelException.NULL_ARRAY_ACCESS);
@@ -743,14 +741,16 @@
// * Sofa support *
// *****************
- /**
- * @deprecated As of v2.0, use {#getView(String)}. From the view you can access the Sofa data, or
- * call {@link #getSofa()} if you truly need to access the SofaFS object.
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getSofa(org.apache.uima.cas.SofaID)
*/
public Sofa getSofa(SofaID sofaID) {
return (Sofa) casImpl.getSofa(sofaID);
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getSofa()
+ */
public Sofa getSofa() {
if (casImpl instanceof TCAS)
return (Sofa) ((TCAS) casImpl).getSofa();
@@ -760,14 +760,23 @@
throw casEx;
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#createView(java.lang.String)
+ */
public JCas createView(String sofaID) throws CASException {
return casImpl.createView(sofaID).getJCas();
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getJCas(org.apache.uima.jcas.cas.Sofa)
+ */
public JCas getJCas(Sofa sofa) throws CASException {
return casImpl.getJCas(sofa);
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getSofaIterator()
+ */
public FSIterator getSofaIterator() {
return casImpl.getSofaIterator();
}
@@ -776,6 +785,9 @@
// * Index support *
// *****************
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getJFSIndexRepository()
+ */
public JFSIndexRepository getJFSIndexRepository() {
return jfsIndexRepository;
}
@@ -784,15 +796,8 @@
// * TCas support *
// ****************
- /**
- * @see org.apache.uima.cas.text.TCAS#getDocumentAnnotation
- *
- * @return The one instance of the DocumentAnnotation annotation
- *
- * @deprecated Use of this method is not safe and may cause ClassCastExceptions in certain
- * deployments. Instead, use {@link #getDocumentAnnotationFs()}, which has a return
- * type of TOP, and typecast the returned object to
- * {@link org.apache.uima.jcas.tcas.DocumentAnnotation}.
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getDocumentAnnotation()
*/
public DocumentAnnotation getDocumentAnnotation() {
if (casImpl instanceof TCAS)
@@ -803,17 +808,8 @@
throw casEx;
}
- /**
- * Gets the document annotation. The object returned from this method can be typecast to
- * {@link org.apache.uima.jcas.tcas.DocumentAnnotation}.
- * <p>
- * The reason that the return type of this method is not DocumentAnnotation is because of problems
- * that arise when using the UIMA Extension ClassLoader to load annotator classes. The
- * DocumentAnnotation type may be defined in the UIMA extension ClassLoader, differently than in
- * the framework ClassLoader.
- *
- * @return The one instance of the DocumentAnnotation annotation.
- * @see org.apache.uima.cas.text.TCAS#getDocumentAnnotation
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getDocumentAnnotationFs()
*/
public TOP getDocumentAnnotationFs() {
if (casImpl instanceof TCAS)
@@ -824,10 +820,8 @@
throw casEx;
}
- /**
- * @see org.apache.uima.cas.text.TCAS#getDocumentText
- *
- * @return String representing the Sofa data
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getDocumentText()
*/
public String getDocumentText() {
if (casImpl instanceof TCAS)
@@ -838,10 +832,8 @@
throw casEx;
}
- /**
- * @see org.apache.uima.cas.text.TCAS#getSofaDataArray
- *
- * @return FSARRAY representing the Sofa data
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getSofaDataArray()
*/
public FSArray getSofaDataArray() {
if (casImpl instanceof TCAS)
@@ -852,10 +844,8 @@
throw casEx;
}
- /**
- * @see org.apache.uima.cas.text.TCAS#getSofaDataURI
- *
- * @return String holding the URI of the Sofa data
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getSofaDataURI()
*/
public String getSofaDataURI() {
if (casImpl instanceof TCAS)
@@ -866,9 +856,8 @@
throw casEx;
}
- /**
- * @see org.apache.uima.cas.text.TCAS#setDocumentText
- *
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#setDocumentText(java.lang.String)
*/
public void setDocumentText(String text) throws TCASRuntimeException {
if (casImpl instanceof TCAS)
@@ -881,9 +870,8 @@
}
}
- /**
- * @see org.apache.uima.cas.text.TCAS#setSofaDataString
- *
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#setSofaDataString(java.lang.String, java.lang.String)
*/
public void setSofaDataString(String text, String mime) throws TCASRuntimeException {
if (casImpl instanceof TCAS)
@@ -896,9 +884,8 @@
}
}
- /**
- * @see org.apache.uima.cas.text.TCAS#setSofaDataArray
- *
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#setSofaDataArray(org.apache.uima.jcas.cas.TOP, java.lang.String)
*/
public void setSofaDataArray(TOP array, String mime) throws TCASRuntimeException {
if (casImpl instanceof TCAS)
@@ -911,9 +898,8 @@
}
}
- /**
- * @see org.apache.uima.cas.text.TCAS#setSofaDataURI
- *
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#setSofaDataURI(java.lang.String, java.lang.String)
*/
public void setSofaDataURI(String uri, String mime) throws TCASRuntimeException {
if (casImpl instanceof TCAS)
@@ -926,10 +912,8 @@
}
}
- /**
- * @see org.apache.uima.cas.text.TCAS#getDocumentLanguage
- *
- * @return String representing the language of the document in the JCAS
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getDocumentLanguage()
*/
public String getDocumentLanguage() {
if (casImpl instanceof TCAS)
@@ -940,9 +924,8 @@
throw casEx;
}
- /**
- * @see org.apache.uima.cas.text.TCAS#setDocumentLanguage
- *
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#setDocumentLanguage(java.lang.String)
*/
public void setDocumentLanguage(String language) throws TCASRuntimeException {
if (casImpl instanceof TCAS)
@@ -955,10 +938,8 @@
}
}
- /**
- * @see org.apache.uima.cas.text.TCAS#getSofaDataStream
- *
- * @return InputStream handle to the Sofa data
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getSofaDataStream()
*/
public InputStream getSofaDataStream() {
if (casImpl instanceof TCAS)
@@ -969,41 +950,29 @@
throw casEx;
}
- /**
- * @see org.apache.uima.cas.CAS#getConstraintFactory
- * @return ConstraintFactory instance
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getConstraintFactory()
*/
public ConstraintFactory getConstraintFactory() {
return casImpl.getConstraintFactory();
}
- /**
- * @see org.apache.uima.cas.CAS#createFeaturePath
- *
- * @return FeaturePath instance
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#createFeaturePath()
*/
public FeaturePath createFeaturePath() {
return casImpl.createFeaturePath();
}
- /**
- * @see org.apache.uima.cas.CAS#createFilteredIterator
- *
- * @param it
- * the iterator to filter
- * @param constraint
- * the constraint to apply to the iterator to filter the results
- * @return a filtered iterator
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#createFilteredIterator(org.apache.uima.cas.FSIterator, org.apache.uima.cas.FSMatchConstraint)
*/
public FSIterator createFilteredIterator(FSIterator it, FSMatchConstraint constraint) {
return casImpl.createFilteredIterator(it, constraint);
}
- /**
- * A constant for each cas which holds a 0-length instance. Since this can be a common value, we
- * avoid creating multiple copies of it. All uses can use the same valuee because it is not
- * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
- * the CAS is reset.
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getStringArray0L()
*/
public StringArray getStringArray0L() {
@@ -1012,11 +981,8 @@
return sharedView.stringArray0L;
}
- /**
- * A constant for each cas which holds a 0-length instance. Since this can be a common value, we
- * avoid creating multiple copies of it. All uses can use the same valuee because it is not
- * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
- * the CAS is reset.
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getIntegerArray0L()
*/
public IntegerArray getIntegerArray0L() {
if (null == sharedView.integerArray0L)
@@ -1024,11 +990,8 @@
return sharedView.integerArray0L;
}
- /**
- * A constant for each cas which holds a 0-length instance. Since this can be a common value, we
- * avoid creating multiple copies of it. All uses can use the same valuee because it is not
- * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
- * the CAS is reset.
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getFloatArray0L()
*/
public FloatArray getFloatArray0L() {
if (null == sharedView.floatArray0L)
@@ -1036,11 +999,8 @@
return sharedView.floatArray0L;
}
- /**
- * A constant for each cas which holds a 0-length instance. Since this can be a common value, we
- * avoid creating multiple copies of it. All uses can use the same valuee because it is not
- * updatable (it has no subfields). This is initialized lazily on first reference, and reset when
- * the CAS is reset.
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getFSArray0L()
*/
public FSArray getFSArray0L() {
if (null == sharedView.fsArray0L)
@@ -1048,10 +1008,8 @@
return sharedView.fsArray0L;
}
- /**
- * initialize the JCas for new Cas content. Not used, does nothing.
- *
- * @deprecated not required, does nothing
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#processInit()
*/
public void processInit() {
// unused
@@ -1062,35 +1020,37 @@
*
* @see org.apache.uima.cas.AbstractCas_ImplBase#setOwn
*/
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#setOwner(org.apache.uima.cas.CasOwner)
+ */
public void setOwner(CasOwner aCasOwner) {
casImpl.setOwner(aCasOwner);
}
- /**
- * @see org.apache.uima.cas.AbstractCas_ImplBase#release()
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#release()
*/
public void release() {
getCas().release();
}
- /**
- * @see org.apache.uima.cas.CAS#getView(String localViewName);
- * @param localViewName
- * @return
- * @throws CASException
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#getView(java.lang.String)
*/
public JCas getView(String localViewName) throws CASException {
return getJCas((CASImpl) casImpl.getView(localViewName));
}
- /**
- * @see org.apache.uima.cas.CAS#addFsToIndexes(FeatureStructure);
- * @param instance
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#addFsToIndexes(org.apache.uima.cas.FeatureStructure)
*/
public void addFsToIndexes(FeatureStructure instance) {
casImpl.addFsToIndexes(instance);
}
+ /* (non-Javadoc)
+ * @see org.apache.uima.jcas.impl.IJCas#removeFsFromIndexes(org.apache.uima.cas.FeatureStructure)
+ */
public void removeFsFromIndexes(FeatureStructure instance) {
casImpl.removeFsFromIndexes(instance);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java Sat Dec 23 14:37:29 2006
@@ -26,6 +26,7 @@
import org.apache.uima.cas.FSIndex;
import org.apache.uima.cas.FSIndexRepository;
import org.apache.uima.cas.text.TCAS;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JFSIndexRepository;
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java Sat Dec 23 14:37:29 2006
@@ -21,9 +21,10 @@
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.AnnotationBase;
import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* the JCas class model for the CAS type uima.cas.Annotation. It defines two integer valued features
@@ -32,7 +33,7 @@
*/
public class Annotation extends AnnotationBase implements AnnotationFS {
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
public final static int type = typeIndexID;
@@ -61,7 +62,7 @@
*/
public int getBegin() {
if (Annotation_Type.featOkTst && ((Annotation_Type) jcasType).casFeat_begin == null)
- JCas.throwFeatMissing("begin", "uima.tcas.Annotation");
+ JCasImpl.throwFeatMissing("begin", "uima.tcas.Annotation");
return jcasType.ll_cas.ll_getIntValue(addr, ((Annotation_Type) jcasType).casFeatCode_begin);
}
@@ -70,7 +71,7 @@
*/
public void setBegin(int v) {
if (Annotation_Type.featOkTst && ((Annotation_Type) jcasType).casFeat_begin == null)
- JCas.throwFeatMissing("begin", "uima.tcas.Annotation");
+ JCasImpl.throwFeatMissing("begin", "uima.tcas.Annotation");
jcasType.ll_cas.ll_setIntValue(addr, ((Annotation_Type) jcasType).casFeatCode_begin, v);
}
@@ -83,7 +84,7 @@
*/
public int getEnd() {
if (Annotation_Type.featOkTst && ((Annotation_Type) jcasType).casFeat_end == null)
- JCas.throwFeatMissing("end", "uima.tcas.Annotation");
+ JCasImpl.throwFeatMissing("end", "uima.tcas.Annotation");
return jcasType.ll_cas.ll_getIntValue(addr, ((Annotation_Type) jcasType).casFeatCode_end);
}
@@ -92,7 +93,7 @@
*/
public void setEnd(int v) {
if (Annotation_Type.featOkTst && ((Annotation_Type) jcasType).casFeat_end == null)
- JCas.throwFeatMissing("end", "uima.tcas.Annotation");
+ JCasImpl.throwFeatMissing("end", "uima.tcas.Annotation");
jcasType.ll_cas.ll_setIntValue(addr, ((Annotation_Type) jcasType).casFeatCode_end, v);
}
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=489936&r1=489935&r2=489936
==============================================================================
--- 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 Sat Dec 23 14:37:29 2006
@@ -26,7 +26,8 @@
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class Annotation_Type extends org.apache.uima.jcas.cas.AnnotationBase_Type {
protected FSGenerator getFSGenerator() {
@@ -51,7 +52,7 @@
public final static int typeIndexID = Annotation.typeIndexID;
- public final static boolean featOkTst = JCas.getFeatOkTst("uima.tcas.Annotation");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("uima.tcas.Annotation");
final Feature casFeat_begin;
@@ -59,13 +60,13 @@
public int getBegin(int addr) {
if (featOkTst && casFeat_begin == null)
- JCas.throwFeatMissing("begin", "uima.tcas.Annotation");
+ JCasImpl.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)
- JCas.throwFeatMissing("begin", "uima.tcas.Annotation");
+ JCasImpl.throwFeatMissing("begin", "uima.tcas.Annotation");
ll_cas.ll_setIntValue(addr, casFeatCode_begin, v);
}
@@ -75,13 +76,13 @@
public int getEnd(int addr) {
if (featOkTst && casFeat_end == null)
- JCas.throwFeatMissing("end", "uima.tcas.Annotation");
+ JCasImpl.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)
- JCas.throwFeatMissing("end", "uima.tcas.Annotation");
+ JCasImpl.throwFeatMissing("end", "uima.tcas.Annotation");
ll_cas.ll_setIntValue(addr, casFeatCode_end, v);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation.java Sat Dec 23 14:37:29 2006
@@ -19,19 +19,20 @@
package org.apache.uima.jcas.tcas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* The JCas class definition for the CAS <code>DocumentAnnotation</code> type. When text CASs are
* created, one instance of this type is created and made accessable via a call to the
- * {@link JCas#getDocumentAnnotationFs()} method. It is also a subtype of {@link Annotation} and
+ * {@link JCasImpl#getDocumentAnnotationFs()} method. It is also a subtype of {@link Annotation} and
* therefore would appear as one of the annotations that an iterator over all the annotations would
* return.
*/
public class DocumentAnnotation extends Annotation {
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
public final static int type = typeIndexID;
@@ -60,7 +61,7 @@
public String getLanguage() {
if (DocumentAnnotation_Type.featOkTst
&& ((DocumentAnnotation_Type) jcasType).casFeat_language == null)
- JCas.throwFeatMissing("language", "uima.tcas.DocumentAnnotation");
+ JCasImpl.throwFeatMissing("language", "uima.tcas.DocumentAnnotation");
return jcasType.ll_cas.ll_getStringValue(addr,
((DocumentAnnotation_Type) jcasType).casFeatCode_language);
}
@@ -71,7 +72,7 @@
public void setLanguage(String v) {
if (DocumentAnnotation_Type.featOkTst
&& ((DocumentAnnotation_Type) jcasType).casFeat_language == null)
- JCas.throwFeatMissing("language", "uima.tcas.DocumentAnnotation");
+ JCasImpl.throwFeatMissing("language", "uima.tcas.DocumentAnnotation");
jcasType.ll_cas.ll_setStringValue(addr,
((DocumentAnnotation_Type) jcasType).casFeatCode_language, v);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/DocumentAnnotation_Type.java Sat Dec 23 14:37:29 2006
@@ -26,7 +26,8 @@
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
public class DocumentAnnotation_Type extends Annotation_Type {
protected FSGenerator getFSGenerator() {
@@ -51,7 +52,7 @@
public final static int typeIndexID = DocumentAnnotation.typeIndexID;
- public final static boolean featOkTst = JCas.getFeatOkTst("uima.tcas.DocumentAnnotation");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("uima.tcas.DocumentAnnotation");
final Feature casFeat_language;
@@ -59,13 +60,13 @@
public String getLanguage(int addr) {
if (featOkTst && casFeat_language == null)
- JCas.throwFeatMissing("language", "uima.tcas.DocumentAnnotation");
+ JCasImpl.throwFeatMissing("language", "uima.tcas.DocumentAnnotation");
return ll_cas.ll_getStringValue(addr, casFeatCode_language);
}
public void setLanguage(int addr, String v) {
if (featOkTst && casFeat_language == null)
- JCas.throwFeatMissing("language", "uima.tcas.DocumentAnnotation");
+ JCasImpl.throwFeatMissing("language", "uima.tcas.DocumentAnnotation");
ll_cas.ll_setStringValue(addr, casFeatCode_language, v);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java Sat Dec 23 14:37:29 2006
@@ -29,7 +29,7 @@
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CASException;
import org.apache.uima.cas.impl.TCASImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
import org.apache.uima.resource.CasDefinition;
import org.apache.uima.resource.CasManager;
import org.apache.uima.resource.ResourceInitializationException;
@@ -141,7 +141,7 @@
public AbstractCas getCasInterface(CAS cas, Class requiredInterface) {
if (requiredInterface == CAS.class) {
return cas;
- } else if (requiredInterface == JCas.class) {
+ } else if (requiredInterface == JCasImpl.class) {
try {
return cas.getJCas();
} catch (CASException e) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/FileSystemCollectionReader.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/FileSystemCollectionReader.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/FileSystemCollectionReader.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/FileSystemCollectionReader.java Sat Dec 23 14:37:29 2006
@@ -34,7 +34,7 @@
import org.apache.uima.collection.CollectionReaderDescription;
import org.apache.uima.collection.CollectionReader_ImplBase;
import org.apache.uima.examples.SourceDocumentInformation;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.DocumentAnnotation;
import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.ResourceInitializationException;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/InlineXmlCasConsumer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/InlineXmlCasConsumer.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/InlineXmlCasConsumer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/InlineXmlCasConsumer.java Sat Dec 23 14:37:29 2006
@@ -35,7 +35,7 @@
import org.apache.uima.collection.CasConsumerDescription;
import org.apache.uima.collection.CasConsumer_ImplBase;
import org.apache.uima.examples.SourceDocumentInformation;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceProcessException;
import org.xml.sax.SAXException;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java Sat Dec 23 14:37:29 2006
@@ -27,18 +27,19 @@
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.TextAnalysisEngine;
import org.apache.uima.cas.CASException;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.ProcessingResourceMetaData;
/**
- * This class represents a simple pool of {@link JCas} instances. This is useful for multithreaded
+ * This class represents a simple pool of {@link JCasImpl} instances. This is useful for multithreaded
* applications, where there is a need for multiple CASes to be processed simultaneously. Because
* JCas creation is expensive, it is a good idea to create a pool of reusable JCas instances at
* initialization time, rather than creating a new JCas each time one is needed.
* <p>
* Clients check-out JCas instances from the pool using the {@link #getJCas()} method and check-in
- * JCas instances using the {@link #releaseJCas(JCas)} method.
+ * JCas instances using the {@link #releaseJCas(JCasImpl)} method.
*
*
*
@@ -137,7 +138,7 @@
}
/**
- * Checks in a JCas to the pool. This automatically calls the {@link JCas#reset()} method, to
+ * Checks in a JCas to the pool. This automatically calls the {@link JCasImpl#reset()} method, to
* ensure that when the JCas is later retrieved from the pool it will be ready to use. Also
* notifies other Threads that may be waiting for an instance to become available.
*
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XCasWriterCasConsumer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XCasWriterCasConsumer.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XCasWriterCasConsumer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XCasWriterCasConsumer.java Sat Dec 23 14:37:29 2006
@@ -34,7 +34,7 @@
import org.apache.uima.collection.CasConsumerDescription;
import org.apache.uima.collection.CasConsumer_ImplBase;
import org.apache.uima.examples.SourceDocumentInformation;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceProcessException;
import org.xml.sax.SAXException;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmiWriterCasConsumer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmiWriterCasConsumer.java?view=diff&rev=489936&r1=489935&r2=489936
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmiWriterCasConsumer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XmiWriterCasConsumer.java Sat Dec 23 14:37:29 2006
@@ -34,7 +34,7 @@
import org.apache.uima.collection.CasConsumerDescription;
import org.apache.uima.collection.CasConsumer_ImplBase;
import org.apache.uima.examples.SourceDocumentInformation;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceProcessException;
import org.xml.sax.SAXException;
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=489936&r1=489935&r2=489936
==============================================================================
--- 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 Sat Dec 23 14:37:29 2006
@@ -19,9 +19,10 @@
package aa;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* Updated by JCasGen Tue Feb 21 14:56:04 EST 2006 XML source:
@@ -34,7 +35,7 @@
* @generated
* @ordered
*/
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
/**
* @generated
@@ -89,7 +90,7 @@
*/
public int getAbstractInt() {
if (AbstractType_Type.featOkTst && ((AbstractType_Type) jcasType).casFeat_abstractInt == null)
- JCas.throwFeatMissing("abstractInt", "aa.AbstractType");
+ JCasImpl.throwFeatMissing("abstractInt", "aa.AbstractType");
return jcasType.ll_cas.ll_getIntValue(addr,
((AbstractType_Type) jcasType).casFeatCode_abstractInt);
}
@@ -101,7 +102,7 @@
*/
public void setAbstractInt(int v) {
if (AbstractType_Type.featOkTst && ((AbstractType_Type) jcasType).casFeat_abstractInt == null)
- JCas.throwFeatMissing("abstractInt", "aa.AbstractType");
+ JCasImpl.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=489936&r1=489935&r2=489936
==============================================================================
--- 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 Sat Dec 23 14:37:29 2006
@@ -26,8 +26,9 @@
import org.apache.uima.cas.impl.FSGenerator;
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.cas.TOP_Type;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* Updated by JCasGen Tue Feb 21 14:56:04 EST 2006
@@ -64,7 +65,7 @@
* @generated
* @modifiable
*/
- public final static boolean featOkTst = JCas.getFeatOkTst("aa.AbstractType");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("aa.AbstractType");
/** @generated */
final Feature casFeat_abstractInt;
@@ -75,14 +76,14 @@
/** @generated */
public int getAbstractInt(int addr) {
if (featOkTst && casFeat_abstractInt == null)
- JCas.throwFeatMissing("abstractInt", "aa.AbstractType");
+ JCasImpl.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)
- JCas.throwFeatMissing("abstractInt", "aa.AbstractType");
+ JCasImpl.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=489936&r1=489935&r2=489936
==============================================================================
--- 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 Sat Dec 23 14:37:29 2006
@@ -19,8 +19,9 @@
package aa;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* Updated by JCasGen Tue Feb 21 14:56:04 EST 2006 XML source:
@@ -33,7 +34,7 @@
* @generated
* @ordered
*/
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
/**
* @generated
@@ -89,7 +90,7 @@
public String getConcreteString() {
if (ConcreteType_Type.featOkTst
&& ((ConcreteType_Type) jcasType).casFeat_concreteString == null)
- JCas.throwFeatMissing("concreteString", "aa.ConcreteType");
+ JCasImpl.throwFeatMissing("concreteString", "aa.ConcreteType");
return jcasType.ll_cas.ll_getStringValue(addr,
((ConcreteType_Type) jcasType).casFeatCode_concreteString);
}
@@ -102,7 +103,7 @@
public void setConcreteString(String v) {
if (ConcreteType_Type.featOkTst
&& ((ConcreteType_Type) jcasType).casFeat_concreteString == null)
- JCas.throwFeatMissing("concreteString", "aa.ConcreteType");
+ JCasImpl.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=489936&r1=489935&r2=489936
==============================================================================
--- 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 Sat Dec 23 14:37:29 2006
@@ -26,7 +26,8 @@
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* Updated by JCasGen Tue Feb 21 14:56:04 EST 2006
@@ -63,7 +64,7 @@
* @generated
* @modifiable
*/
- public final static boolean featOkTst = JCas.getFeatOkTst("aa.ConcreteType");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("aa.ConcreteType");
/** @generated */
final Feature casFeat_concreteString;
@@ -74,14 +75,14 @@
/** @generated */
public String getConcreteString(int addr) {
if (featOkTst && casFeat_concreteString == null)
- JCas.throwFeatMissing("concreteString", "aa.ConcreteType");
+ JCasImpl.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)
- JCas.throwFeatMissing("concreteString", "aa.ConcreteType");
+ JCasImpl.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=489936&r1=489935&r2=489936
==============================================================================
--- 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 Sat Dec 23 14:37:29 2006
@@ -19,9 +19,10 @@
package aa;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* Updated by JCasGen Tue Feb 21 14:56:04 EST 2006 XML source:
@@ -34,7 +35,7 @@
* @generated
* @ordered
*/
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
/**
* @generated
@@ -90,7 +91,7 @@
public int getHaveThisOne() {
if (MissingFeatureInCas_Type.featOkTst
&& ((MissingFeatureInCas_Type) jcasType).casFeat_haveThisOne == null)
- JCas.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
+ JCasImpl.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
return jcasType.ll_cas.ll_getIntValue(addr,
((MissingFeatureInCas_Type) jcasType).casFeatCode_haveThisOne);
}
@@ -103,7 +104,7 @@
public void setHaveThisOne(int v) {
if (MissingFeatureInCas_Type.featOkTst
&& ((MissingFeatureInCas_Type) jcasType).casFeat_haveThisOne == null)
- JCas.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
+ JCasImpl.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
jcasType.ll_cas.ll_setIntValue(addr,
((MissingFeatureInCas_Type) jcasType).casFeatCode_haveThisOne, v);
}
@@ -119,7 +120,7 @@
public float getMissingThisOne() {
if (MissingFeatureInCas_Type.featOkTst
&& ((MissingFeatureInCas_Type) jcasType).casFeat_missingThisOne == null)
- JCas.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
+ JCasImpl.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
return jcasType.ll_cas.ll_getFloatValue(addr,
((MissingFeatureInCas_Type) jcasType).casFeatCode_missingThisOne);
}
@@ -132,7 +133,7 @@
public void setMissingThisOne(float v) {
if (MissingFeatureInCas_Type.featOkTst
&& ((MissingFeatureInCas_Type) jcasType).casFeat_missingThisOne == null)
- JCas.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
+ JCasImpl.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
jcasType.ll_cas.ll_setFloatValue(addr,
((MissingFeatureInCas_Type) jcasType).casFeatCode_missingThisOne, v);
}
@@ -148,7 +149,7 @@
public String getChangedFType() {
if (MissingFeatureInCas_Type.featOkTst
&& ((MissingFeatureInCas_Type) jcasType).casFeat_changedFType == null)
- JCas.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
+ JCasImpl.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
return jcasType.ll_cas.ll_getStringValue(addr,
((MissingFeatureInCas_Type) jcasType).casFeatCode_changedFType);
}
@@ -161,7 +162,7 @@
public void setChangedFType(String v) {
if (MissingFeatureInCas_Type.featOkTst
&& ((MissingFeatureInCas_Type) jcasType).casFeat_changedFType == null)
- JCas.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
+ JCasImpl.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=489936&r1=489935&r2=489936
==============================================================================
--- 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 Sat Dec 23 14:37:29 2006
@@ -26,8 +26,9 @@
import org.apache.uima.cas.impl.FSGenerator;
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.cas.TOP_Type;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* Updated by JCasGen Tue Feb 21 14:56:04 EST 2006
@@ -64,7 +65,7 @@
* @generated
* @modifiable
*/
- public final static boolean featOkTst = JCas.getFeatOkTst("aa.MissingFeatureInCas");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("aa.MissingFeatureInCas");
/** @generated */
final Feature casFeat_haveThisOne;
@@ -75,14 +76,14 @@
/** @generated */
public int getHaveThisOne(int addr) {
if (featOkTst && casFeat_haveThisOne == null)
- JCas.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
+ JCasImpl.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)
- JCas.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
+ JCasImpl.throwFeatMissing("haveThisOne", "aa.MissingFeatureInCas");
ll_cas.ll_setIntValue(addr, casFeatCode_haveThisOne, v);
}
@@ -95,14 +96,14 @@
/** @generated */
public float getMissingThisOne(int addr) {
if (featOkTst && casFeat_missingThisOne == null)
- JCas.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
+ JCasImpl.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)
- JCas.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
+ JCasImpl.throwFeatMissing("missingThisOne", "aa.MissingFeatureInCas");
ll_cas.ll_setFloatValue(addr, casFeatCode_missingThisOne, v);
}
@@ -115,14 +116,14 @@
/** @generated */
public String getChangedFType(int addr) {
if (featOkTst && casFeat_changedFType == null)
- JCas.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
+ JCasImpl.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)
- JCas.throwFeatMissing("changedFType", "aa.MissingFeatureInCas");
+ JCasImpl.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=489936&r1=489935&r2=489936
==============================================================================
--- 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 Sat Dec 23 14:37:29 2006
@@ -19,9 +19,10 @@
package aa;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* Updated by JCasGen Tue Feb 21 14:56:04 EST 2006 XML source:
@@ -34,7 +35,7 @@
* @generated
* @ordered
*/
- public final static int typeIndexID = JCas.getNextIndex();
+ public final static int typeIndexID = JCasImpl.getNextIndex();
/**
* @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=489936&r1=489935&r2=489936
==============================================================================
--- 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 Sat Dec 23 14:37:29 2006
@@ -24,8 +24,9 @@
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.impl.JCas;
+import org.apache.uima.jcas.impl.JCasImpl;
/**
* Updated by JCasGen Tue Feb 21 14:56:04 EST 2006
@@ -62,7 +63,7 @@
* @generated
* @modifiable
*/
- public final static boolean featOkTst = JCas.getFeatOkTst("aa.MissingInCas");
+ public final static boolean featOkTst = JCasImpl.getFeatOkTst("aa.MissingInCas");
/**
* initialize variables to correspond with Cas Type and Features