You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2016/03/07 22:32:08 UTC
svn commit: r1733987 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java: aa/
org/apache/lang/ org/apache/uima/analysis_engine/impl/
org/apache/uima/cas/test/ org/apache/uima/jcas/test/
org/apache/uima/pear/util/ org/apache/uima/testT...
Author: schor
Date: Mon Mar 7 21:32:07 2016
New Revision: 1733987
URL: http://svn.apache.org/viewvc?rev=1733987&view=rev
Log:
[UIMA-4824] regenerated JCas classes for testing. Also fix sentenceLength feature - should be in Sentence, not Token. Also fix some expected error messages
Added:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem/
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/sofa/
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/sofa/test/
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/sofa/test/CrossAnnotation.java
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/EndOfSentence.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Sentence.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Separator.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Token.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/TokenType.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Word.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/AbstractType.java Mon Mar 7 21:32:07 2016
@@ -1,20 +1,22 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
package aa;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
import org.apache.uima.jcas.cas.TOP;
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Wed Mar 02 13:45:02 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class AbstractType extends TOP {
@@ -35,16 +37,14 @@ public class AbstractType extends TOP {
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
- public final static int _FI_abstractInt = JCasRegistry.registerFeature(typeIndexID);
+ /* Feature Adjusted Offsets */
+ public final static int _FI_abstractInt = TypeSystemImpl.getAdjustedFeatureOffset("abstractInt");
- private int _F_abstractInt; //
-
/** Never called. Disable default constructor
* @generated */
protected AbstractType() {/* intentionally empty block */}
@@ -85,15 +85,16 @@ public class AbstractType extends TOP {
* @generated
* @return value of the feature
*/
- public int getAbstractInt() { return _F_abstractInt;}
+ public int getAbstractInt() { return _getIntValueNc(_FI_abstractInt);}
/** setter for abstractInt - sets
* @generated
* @param v value to set into the feature
*/
public void setAbstractInt(int v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_abstractInt, () -> _F_abstractInt = v);
- }
+ _setIntValueNfc(_getFeatFromAdjOffset(_FI_abstractInt, true), v);
+ }
+
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/ConcreteType.java Mon Mar 7 21:32:07 2016
@@ -1,19 +1,21 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
package aa;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Wed Mar 02 13:45:02 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class ConcreteType extends AbstractType {
@@ -34,16 +36,14 @@ public class ConcreteType extends Abstra
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
- public final static int _FI_concreteString = JCasRegistry.registerFeature(typeIndexID);
+ /* Feature Adjusted Offsets */
+ public final static int _FI_concreteString = TypeSystemImpl.getAdjustedFeatureOffset("concreteString");
- private String _F_concreteString; //
-
/** Never called. Disable default constructor
* @generated */
protected ConcreteType() {/* intentionally empty block */}
@@ -84,15 +84,16 @@ public class ConcreteType extends Abstra
* @generated
* @return value of the feature
*/
- public String getConcreteString() { return _F_concreteString;}
+ public String getConcreteString() { return _getStringValueNc(_FI_concreteString);}
/** setter for concreteString - sets
* @generated
* @param v value to set into the feature
*/
public void setConcreteString(String v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_concreteString, () -> _F_concreteString = v);
- }
+ _setStringValueNfc(_getFeatFromAdjOffset(_FI_concreteString, false), v);
+ }
+
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingFeatureInCas.java Mon Mar 7 21:32:07 2016
@@ -1,20 +1,22 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
package aa;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
import org.apache.uima.jcas.cas.TOP;
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Wed Mar 02 13:45:02 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class MissingFeatureInCas extends TOP {
@@ -35,20 +37,16 @@ public class MissingFeatureInCas extends
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
- public final static int _FI_haveThisOne = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_missingThisOne = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_changedFType = JCasRegistry.registerFeature(typeIndexID);
+ /* Feature Adjusted Offsets */
+ public final static int _FI_haveThisOne = TypeSystemImpl.getAdjustedFeatureOffset("haveThisOne");
+ public final static int _FI_missingThisOne = TypeSystemImpl.getAdjustedFeatureOffset("missingThisOne");
+ public final static int _FI_changedFType = TypeSystemImpl.getAdjustedFeatureOffset("changedFType");
- private int _F_haveThisOne; //
- private float _F_missingThisOne; //
- private String _F_changedFType; //
-
/** Never called. Disable default constructor
* @generated */
protected MissingFeatureInCas() {/* intentionally empty block */}
@@ -89,15 +87,16 @@ public class MissingFeatureInCas extends
* @generated
* @return value of the feature
*/
- public int getHaveThisOne() { return _F_haveThisOne;}
+ public int getHaveThisOne() { return _getIntValueNc(_FI_haveThisOne);}
/** setter for haveThisOne - sets
* @generated
* @param v value to set into the feature
*/
public void setHaveThisOne(int v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_haveThisOne, () -> _F_haveThisOne = v);
- }
+ _setIntValueNfc(_getFeatFromAdjOffset(_FI_haveThisOne, true), v);
+ }
+
//*--------------*
@@ -107,15 +106,16 @@ public class MissingFeatureInCas extends
* @generated
* @return value of the feature
*/
- public float getMissingThisOne() { return _F_missingThisOne;}
+ public float getMissingThisOne() { return _getFloatValueNc(_FI_missingThisOne);}
/** setter for missingThisOne - sets
* @generated
* @param v value to set into the feature
*/
public void setMissingThisOne(float v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_missingThisOne, () -> _F_missingThisOne = v);
- }
+ _setFloatValueNfc(_getFeatFromAdjOffset(_FI_missingThisOne, true), v);
+ }
+
//*--------------*
@@ -125,15 +125,16 @@ public class MissingFeatureInCas extends
* @generated
* @return value of the feature
*/
- public String getChangedFType() { return _F_changedFType;}
+ public String getChangedFType() { return _getStringValueNc(_FI_changedFType);}
/** setter for changedFType - sets
* @generated
* @param v value to set into the feature
*/
public void setChangedFType(String v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_changedFType, () -> _F_changedFType = v);
- }
+ _setStringValueNfc(_getFeatFromAdjOffset(_FI_changedFType, false), v);
+ }
+
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/MissingInCas.java Mon Mar 7 21:32:07 2016
@@ -1,20 +1,22 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Sat Mar 05 14:59:52 EST 2016 */
package aa;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
import org.apache.uima.jcas.cas.TOP;
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Sat Mar 05 14:59:52 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class MissingInCas extends TOP {
@@ -35,14 +37,13 @@ public class MissingInCas extends TOP {
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
+ /* Feature Adjusted Offsets */
-
/** Never called. Disable default constructor
* @generated */
protected MissingInCas() {/* intentionally empty block */}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/aa/Root.java Mon Mar 7 21:32:07 2016
@@ -1,23 +1,26 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
package aa;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.TypeSystemImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.cas.FSArray;
import org.apache.uima.jcas.cas.FloatArray;
-import org.apache.uima.jcas.cas.IntegerArray;
-import org.apache.uima.jcas.cas.StringArray;
import org.apache.uima.jcas.cas.TOP;
+import org.apache.uima.jcas.cas.StringArray;
+import org.apache.uima.jcas.cas.IntegerArray;
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Wed Mar 02 13:45:02 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Root extends TOP {
@@ -38,30 +41,21 @@ public class Root extends TOP {
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
- public final static int _FI_arrayInt = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_arrayRef = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_arrayFloat = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_arrayString = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_plainInt = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_plainFloat = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_plainString = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_plainRef = JCasRegistry.registerFeature(typeIndexID);
+ /* Feature Adjusted Offsets */
+ public final static int _FI_arrayInt = TypeSystemImpl.getAdjustedFeatureOffset("arrayInt");
+ public final static int _FI_arrayRef = TypeSystemImpl.getAdjustedFeatureOffset("arrayRef");
+ public final static int _FI_arrayFloat = TypeSystemImpl.getAdjustedFeatureOffset("arrayFloat");
+ public final static int _FI_arrayString = TypeSystemImpl.getAdjustedFeatureOffset("arrayString");
+ public final static int _FI_plainInt = TypeSystemImpl.getAdjustedFeatureOffset("plainInt");
+ public final static int _FI_plainFloat = TypeSystemImpl.getAdjustedFeatureOffset("plainFloat");
+ public final static int _FI_plainString = TypeSystemImpl.getAdjustedFeatureOffset("plainString");
+ public final static int _FI_plainRef = TypeSystemImpl.getAdjustedFeatureOffset("plainRef");
- private IntegerArray _F_arrayInt; //
- private FSArray _F_arrayRef; //
- private FloatArray _F_arrayFloat; //
- private StringArray _F_arrayString; //
- private int _F_plainInt; //
- private float _F_plainFloat; //
- private String _F_plainString; //
- private Root _F_plainRef; // TokenType testMissingImport;
-
/** Never called. Disable default constructor
* @generated */
protected Root() {/* intentionally empty block */}
@@ -102,16 +96,16 @@ public class Root extends TOP {
* @generated
* @return value of the feature
*/
- public IntegerArray getArrayInt() { return _F_arrayInt;}
+ public IntegerArray getArrayInt() { return (IntegerArray)(_getFeatureValueNc(_FI_arrayInt));}
/** setter for arrayInt - sets
* @generated
* @param v value to set into the feature
*/
public void setArrayInt(IntegerArray v) {
-
- _casView.setWithJournalJFRI(this, _FI_arrayInt, () -> _F_arrayInt = v);
- }
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_arrayInt, false), v);
+ }
+
/** indexed getter for arrayInt - gets an indexed value -
* @generated
@@ -119,7 +113,7 @@ public class Root extends TOP {
* @return value of the element at index i
*/
public int getArrayInt(int i) {
- return getArrayInt().get(i);}
+ return ((IntegerArray)(_getFeatureValueNc(_FI_arrayInt))).get(i);}
/** indexed setter for arrayInt - sets an indexed value -
* @generated
@@ -127,7 +121,8 @@ public class Root extends TOP {
* @param v value to set into the array
*/
public void setArrayInt(int i, int v) {
- getArrayInt().set(i, v);}
+ ((IntegerArray)(_getFeatureValueNc(_FI_arrayInt))).set(i, v);
+ }
//*--------------*
@@ -137,16 +132,16 @@ public class Root extends TOP {
* @generated
* @return value of the feature
*/
- public FSArray getArrayRef() { return _F_arrayRef;}
+ public FSArray getArrayRef() { return (FSArray)(_getFeatureValueNc(_FI_arrayRef));}
/** setter for arrayRef - sets
* @generated
* @param v value to set into the feature
*/
public void setArrayRef(FSArray v) {
-
- _casView.setWithJournalJFRI(this, _FI_arrayRef, () -> _F_arrayRef = v);
- }
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_arrayRef, false), v);
+ }
+
/** indexed getter for arrayRef - gets an indexed value -
* @generated
@@ -154,7 +149,7 @@ public class Root extends TOP {
* @return value of the element at index i
*/
public TOP getArrayRef(int i) {
- return getArrayRef().get(i);}
+ return (TOP)(((FSArray)(_getFeatureValueNc(_FI_arrayRef))).get(i));}
/** indexed setter for arrayRef - sets an indexed value -
* @generated
@@ -162,7 +157,8 @@ public class Root extends TOP {
* @param v value to set into the array
*/
public void setArrayRef(int i, TOP v) {
- getArrayRef().set(i, v);}
+ ((FSArray)(_getFeatureValueNc(_FI_arrayRef))).set(i, v);
+ }
//*--------------*
@@ -172,16 +168,16 @@ public class Root extends TOP {
* @generated
* @return value of the feature
*/
- public FloatArray getArrayFloat() { return _F_arrayFloat;}
+ public FloatArray getArrayFloat() { return (FloatArray)(_getFeatureValueNc(_FI_arrayFloat));}
/** setter for arrayFloat - sets
* @generated
* @param v value to set into the feature
*/
public void setArrayFloat(FloatArray v) {
-
- _casView.setWithJournalJFRI(this, _FI_arrayFloat, () -> _F_arrayFloat = v);
- }
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_arrayFloat, false), v);
+ }
+
/** indexed getter for arrayFloat - gets an indexed value -
* @generated
@@ -189,7 +185,7 @@ public class Root extends TOP {
* @return value of the element at index i
*/
public float getArrayFloat(int i) {
- return getArrayFloat().get(i);}
+ return ((FloatArray)(_getFeatureValueNc(_FI_arrayFloat))).get(i);}
/** indexed setter for arrayFloat - sets an indexed value -
* @generated
@@ -197,7 +193,8 @@ public class Root extends TOP {
* @param v value to set into the array
*/
public void setArrayFloat(int i, float v) {
- getArrayFloat().set(i, v);}
+ ((FloatArray)(_getFeatureValueNc(_FI_arrayFloat))).set(i, v);
+ }
//*--------------*
@@ -207,16 +204,16 @@ public class Root extends TOP {
* @generated
* @return value of the feature
*/
- public StringArray getArrayString() { return _F_arrayString;}
+ public StringArray getArrayString() { return (StringArray)(_getFeatureValueNc(_FI_arrayString));}
/** setter for arrayString - sets
* @generated
* @param v value to set into the feature
*/
public void setArrayString(StringArray v) {
-
- _casView.setWithJournalJFRI(this, _FI_arrayString, () -> _F_arrayString = v);
- }
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_arrayString, false), v);
+ }
+
/** indexed getter for arrayString - gets an indexed value -
* @generated
@@ -224,7 +221,7 @@ public class Root extends TOP {
* @return value of the element at index i
*/
public String getArrayString(int i) {
- return getArrayString().get(i);}
+ return ((StringArray)(_getFeatureValueNc(_FI_arrayString))).get(i);}
/** indexed setter for arrayString - sets an indexed value -
* @generated
@@ -232,7 +229,8 @@ public class Root extends TOP {
* @param v value to set into the array
*/
public void setArrayString(int i, String v) {
- getArrayString().set(i, v);}
+ ((StringArray)(_getFeatureValueNc(_FI_arrayString))).set(i, v);
+ }
//*--------------*
@@ -242,15 +240,16 @@ public class Root extends TOP {
* @generated
* @return value of the feature
*/
- public int getPlainInt() { return _F_plainInt;}
+ public int getPlainInt() { return _getIntValueNc(_FI_plainInt);}
/** setter for plainInt - sets
* @generated
* @param v value to set into the feature
*/
public void setPlainInt(int v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_plainInt, () -> _F_plainInt = v);
- }
+ _setIntValueNfc(_getFeatFromAdjOffset(_FI_plainInt, true), v);
+ }
+
//*--------------*
@@ -260,15 +259,16 @@ public class Root extends TOP {
* @generated
* @return value of the feature
*/
- public float getPlainFloat() { return _F_plainFloat;}
+ public float getPlainFloat() { return _getFloatValueNc(_FI_plainFloat);}
/** setter for plainFloat - sets
* @generated
* @param v value to set into the feature
*/
public void setPlainFloat(float v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_plainFloat, () -> _F_plainFloat = v);
- }
+ _setFloatValueNfc(_getFeatFromAdjOffset(_FI_plainFloat, true), v);
+ }
+
//*--------------*
@@ -278,15 +278,16 @@ public class Root extends TOP {
* @generated
* @return value of the feature
*/
- public String getPlainString() { return _F_plainString;}
+ public String getPlainString() { return _getStringValueNc(_FI_plainString);}
/** setter for plainString - sets
* @generated
* @param v value to set into the feature
*/
public void setPlainString(String v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_plainString, () -> _F_plainString = v);
- }
+ _setStringValueNfc(_getFeatFromAdjOffset(_FI_plainString, false), v);
+ }
+
//*--------------*
@@ -296,16 +297,16 @@ public class Root extends TOP {
* @generated
* @return value of the feature
*/
- public Root getPlainRef() { return _F_plainRef;}
+ public Root getPlainRef() { return (Root)(_getFeatureValueNc(_FI_plainRef));}
/** setter for plainRef - sets TokenType testMissingImport;
* @generated
* @param v value to set into the feature
*/
public void setPlainRef(Root v) {
-
- _casView.setWithJournalJFRI(this, _FI_plainRef, () -> _F_plainRef = v);
- }
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_plainRef, false), v);
+ }
+
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/lang/LanguagePair.java Mon Mar 7 21:32:07 2016
@@ -1,19 +1,22 @@
-/* Apache UIMA v3 - First created by JCasGen Mon Oct 19 15:16:52 EDT 2015 */
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
package org.apache.lang;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.TypeSystemImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.cas.TOP;
/**
- * Updated by JCasGen Mon Oct 19 15:16:52 EDT 2015
+ * Updated by JCasGen Wed Mar 02 13:45:02 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class LanguagePair extends TOP {
@@ -33,21 +36,20 @@ public class LanguagePair extends TOP {
@Override
public int getTypeIndexID() {return typeIndexID;}
+
+ /* *******************
+ * Feature Offsets *
+ * *******************/
+
+ /* Feature Adjusted Offsets */
+ public final static int _FI_lang1 = TypeSystemImpl.getAdjustedFeatureOffset("lang1");
+ public final static int _FI_lang2 = TypeSystemImpl.getAdjustedFeatureOffset("lang2");
+ public final static int _FI_description = TypeSystemImpl.getAdjustedFeatureOffset("description");
- /* *****************
- * Local Data *
- * *****************/
- private String _F_lang1; //
- private String _F_lang2; //
- private String _F_description; //
-// private final int lang1_featCode;
-// private final int lang2_featCode;
-// private final int description_featCode;
-
- /** Never called. Disable default constructor
+ /** Never called. Disable default constructor
* @generated */
- protected LanguagePair() {}
+ protected LanguagePair() {/* intentionally empty block */}
/** Internal - constructor used by generator
* @generated
@@ -85,15 +87,16 @@ public class LanguagePair extends TOP {
* @generated
* @return value of the feature
*/
- public String getLang1() { return _F_lang1;}
+ public String getLang1() { return _getStringValueNc(_FI_lang1);}
/** setter for lang1 - sets
* @generated
* @param v value to set into the feature
*/
public void setLang1(String v) {
- _casView.setWithJournal(this, _typeImpl.getFeatureByBaseName("lang1"), () -> _F_lang1 = v);
- }
+ _setStringValueNfc(_getFeatFromAdjOffset(_FI_lang1, false), v);
+ }
+
//*--------------*
@@ -103,15 +106,16 @@ public class LanguagePair extends TOP {
* @generated
* @return value of the feature
*/
- public String getLang2() { return _F_lang2;}
+ public String getLang2() { return _getStringValueNc(_FI_lang2);}
/** setter for lang2 - sets
* @generated
* @param v value to set into the feature
*/
public void setLang2(String v) {
- _casView.setWithJournal(this, _typeImpl.getFeatureByBaseName("lang2"), () -> _F_lang2 = v);
- }
+ _setStringValueNfc(_getFeatFromAdjOffset(_FI_lang2, false), v);
+ }
+
//*--------------*
@@ -121,14 +125,16 @@ public class LanguagePair extends TOP {
* @generated
* @return value of the feature
*/
- public String getDescription() { return _F_description;}
+ public String getDescription() { return _getStringValueNc(_FI_description);}
/** setter for description - sets
* @generated
* @param v value to set into the feature
*/
public void setDescription(String v) {
- _casView.setWithCheckAndJournal(this, _typeImpl.getFeatureByBaseName("description").getCode(), () -> _F_description = v);
+ _setStringValueNfc(_getFeatFromAdjOffset(_FI_description, false), v);
+ }
+
}
-}
+
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java Mon Mar 7 21:32:07 2016
@@ -95,7 +95,6 @@ import org.apache.uima.util.impl.Process
import org.apache.uima.util.impl.Settings_impl;
import org.xml.sax.ContentHandler;
-import junit.framework.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java Mon Mar 7 21:32:07 2016
@@ -1,19 +1,22 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
package org.apache.uima.cas.test;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.TypeSystemImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.tcas.Annotation;
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Wed Mar 02 13:45:02 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class CrossAnnotation extends Annotation {
@@ -34,16 +37,14 @@ public class CrossAnnotation extends Ann
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
- public final static int _FI_otherAnnotation = JCasRegistry.registerFeature(typeIndexID);
+ /* Feature Adjusted Offsets */
+ public final static int _FI_otherAnnotation = TypeSystemImpl.getAdjustedFeatureOffset("otherAnnotation");
- private Annotation _F_otherAnnotation; //
-
/** Never called. Disable default constructor
* @generated */
protected CrossAnnotation() {/* intentionally empty block */}
@@ -84,16 +85,16 @@ public class CrossAnnotation extends Ann
* @generated
* @return value of the feature
*/
- public Annotation getOtherAnnotation() { return _F_otherAnnotation;}
+ public Annotation getOtherAnnotation() { return (Annotation)(_getFeatureValueNc(_FI_otherAnnotation));}
/** setter for otherAnnotation - sets
* @generated
* @param v value to set into the feature
*/
public void setOtherAnnotation(Annotation v) {
-
- _casView.setWithJournalJFRI(this, _FI_otherAnnotation, () -> _F_otherAnnotation = v);
- }
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_otherAnnotation, false), v);
+ }
+
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/FeatureStructureTest.java Mon Mar 7 21:32:07 2016
@@ -250,7 +250,7 @@ public class FeatureStructureTest extend
try {
token.setFeatureValue(this.startFeature, null);
} catch (CASRuntimeException e) {
- assertTrue(e.getMessageKey().equals(CASRuntimeException.PRIMITIVE_VAL_FEAT));
+ assertTrue(e.getMessageKey().equals(CASRuntimeException.INAPPROP_RANGE));
caughtExc = true;
}
assertTrue(caughtExc);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java Mon Mar 7 21:32:07 2016
@@ -1,19 +1,22 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
package org.apache.uima.cas.test;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.TypeSystemImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.tcas.Annotation;
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Wed Mar 02 13:45:02 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Sentence extends Annotation {
@@ -34,14 +37,13 @@ public class Sentence extends Annotation
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
+ /* Feature Adjusted Offsets */
-
/** Never called. Disable default constructor
* @generated */
protected Sentence() {/* intentionally empty block */}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java Mon Mar 7 21:32:07 2016
@@ -1,19 +1,22 @@
-/* Apache UIMA v3 - First created by JCasGen Wed Oct 28 14:10:07 EDT 2015 */
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:51:54 EST 2016 */
package org.apache.uima.cas.test;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.TypeSystemImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.tcas.Annotation;
/**
- * Updated by JCasGen Wed Oct 28 14:10:07 EDT 2015
+ * Updated by JCasGen Wed Mar 02 13:51:54 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/resources/CASTests/desc/StringSubtypeTest.xml
* @generated */
public class StringSubtypeAnnotation extends Annotation {
@@ -34,11 +37,14 @@ public class StringSubtypeAnnotation ext
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
- private String _F_stringSetFeature; //
-
+ /* *******************
+ * Feature Offsets *
+ * *******************/
+
+ /* Feature Adjusted Offsets */
+ public final static int _FI_stringSetFeature = TypeSystemImpl.getAdjustedFeatureOffset("stringSetFeature");
+
+
/** Never called. Disable default constructor
* @generated */
protected StringSubtypeAnnotation() {/* intentionally empty block */}
@@ -79,17 +85,16 @@ public class StringSubtypeAnnotation ext
* @generated
* @return value of the feature
*/
- public String getStringSetFeature() { return _F_stringSetFeature;}
+ public String getStringSetFeature() { return _getStringValueNc(_FI_stringSetFeature);}
/** setter for stringSetFeature - sets
* @generated
* @param v value to set into the feature
*/
public void setStringSetFeature(String v) {
- _typeImpl.getFeatureByBaseName("stringSetFeature").validateIsInAllowedValue(v);
-
- _casView.setWithJournal(this, _typeImpl.getFeatureByBaseName("stringSetFeature"), () -> _F_stringSetFeature = v);
- }
+ _setStringValueNfc(_getFeatFromAdjOffset(_FI_stringSetFeature, false), v);
+ }
+
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java Mon Mar 7 21:32:07 2016
@@ -1,19 +1,22 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
package org.apache.uima.cas.test;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.TypeSystemImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.tcas.Annotation;
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Wed Mar 02 13:45:02 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Token extends Annotation {
@@ -34,14 +37,13 @@ public class Token extends Annotation {
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
+ /* Feature Adjusted Offsets */
-
/** Never called. Disable default constructor
* @generated */
protected Token() {/* intentionally empty block */}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml Mon Mar 7 21:32:07 2016
@@ -28,7 +28,14 @@
<name>x.y.z.Sentence</name>
<description/>
<supertypeName>uima.tcas.Annotation</supertypeName>
-</typeDescription>
+<features>
+ <featureDescription>
+ <name>sentenceLength</name>
+ <description/>
+ <rangeTypeName>uima.cas.Integer</rangeTypeName>
+ </featureDescription>
+ </features>
+ </typeDescription>
<typeDescription>
<name>x.y.z.Token</name>
<description/>
@@ -50,11 +57,6 @@
<rangeTypeName>uima.cas.String</rangeTypeName>
</featureDescription>
<featureDescription>
-<name>sentenceLength</name>
-<description/>
-<rangeTypeName>uima.cas.Integer</rangeTypeName>
-</featureDescription>
-<featureDescription>
<name>lemmaList</name>
<description/>
<rangeTypeName>uima.cas.StringArray</rangeTypeName>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearRuntimeTest.java Mon Mar 7 21:32:07 2016
@@ -106,7 +106,7 @@ public class PearRuntimeTest extends Tes
// The 3 annotations are the doc annotation, plus 2 room numbers
// The date-time annotators are skipped because the default result spec is "en"
// and is missing the "x-unspecified"
- Assert.assertEquals(cas.getAnnotationIndex().size(), 3);
+ assertEquals(cas.getAnnotationIndex().size(), 3);
// FSIterator i = cas.getAnnotationIndex().iterator();
// while (i.hasNext()) {
// System.out.println(i.next());
@@ -120,7 +120,7 @@ public class PearRuntimeTest extends Tes
CAS cas = this.runPearRuntimeTestcase(new String[]{"pearTests/analysisEngine.pear", "pearTests/analysisEngine2.pear"});
//check if 3 annotations are available in the CAS index
- Assert.assertEquals(cas.getAnnotationIndex().size(), 3);
+ assertEquals(cas.getAnnotationIndex().size(), 3);
}
private Import [] installPears(String [] pears) throws IOException {
@@ -139,14 +139,14 @@ public class PearRuntimeTest extends Tes
// get pear files to install
File pearFile = JUnitExtension.getFile(pear);
- Assert.assertNotNull(pearFile);
+ assertNotNull(pearFile);
// Install PEAR packages
PackageBrowser instPear = PackageInstaller
.installPackage(this.tempInstallDir, pearFile, true);
// check pear PackageBrowser object
- Assert.assertNotNull(instPear);
+ assertNotNull(instPear);
// import pear specifiers
Import impPear = UIMAFramework.getResourceSpecifierFactory().createImport();
@@ -197,7 +197,7 @@ public class PearRuntimeTest extends Tes
private CAS runDesc(AnalysisEngineDescription desc) throws Exception {
// Create analysis engine from aggregate ae description
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(desc, null, null);
- Assert.assertNotNull(ae);
+ assertNotNull(ae);
// Create a CAS with a sample document text and process the CAS
CAS cas = ae.newCAS();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java Mon Mar 7 21:32:07 2016
@@ -18,121 +18,119 @@
*/
-/* First created by JCasGen Wed May 23 14:54:19 EDT 2012 */
-
-
-
-/* Apache UIMA v3 - First created by JCasGen Tue Dec 01 15:07:57 EST 2015 */
+
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:49:16 EST 2016 */
package org.apache.uima.testTypeSystem_arrays;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.TypeSystemImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
import org.apache.uima.jcas.cas.ShortArray;
import org.apache.uima.jcas.tcas.Annotation;
-/**
- * Updated by JCasGen Tue Dec 01 15:07:57 EST 2015
+/**
+ * Updated by JCasGen Wed Mar 02 13:49:16 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_arrays.xml
* @generated */
public class OfShorts extends Annotation {
/** @generated
- * @ordered
+ * @ordered
*/
@SuppressWarnings ("hiding")
public final static int typeIndexID = JCasRegistry.register(OfShorts.class);
/** @generated
- * @ordered
+ * @ordered
*/
@SuppressWarnings ("hiding")
public final static int type = typeIndexID;
/** @generated
- * @return index of the type
+ * @return index of the type
*/
@Override
public int getTypeIndexID() {return typeIndexID;}
+
+
+ /* *******************
+ * Feature Offsets *
+ * *******************/
+
+ /* Feature Adjusted Offsets */
+ public final static int _FI_f1Shorts = TypeSystemImpl.getAdjustedFeatureOffset("f1Shorts");
-
- /* *****************
- * Local Data *
- * *****************/
-
- /* Register Features */
- public final static int _FI_f1Shorts = JCasRegistry.registerFeature(typeIndexID);
-
-
- private ShortArray _F_f1Shorts; //
-
+
/** Never called. Disable default constructor
* @generated */
protected OfShorts() {/* intentionally empty block */}
-
- /** Internal - constructor used by generator
+
+ /** Internal - constructor used by generator
* @generated
* @param casImpl the CAS this Feature Structure belongs to
- * @param type the type of this Feature Structure
+ * @param type the type of this Feature Structure
*/
public OfShorts(TypeImpl type, CASImpl casImpl) {
super(type, casImpl);
readObject();
}
-
+
/** @generated
- * @param jcas JCas to which this Feature Structure belongs
+ * @param jcas JCas to which this Feature Structure belongs
*/
public OfShorts(JCas jcas) {
super(jcas);
- readObject();
- }
+ readObject();
+ }
- /**
+ /**
* <!-- begin-user-doc -->
* Write your own initialization here
* <!-- end-user-doc -->
*
- * @generated modifiable
+ * @generated modifiable
*/
private void readObject() {/*default - does nothing empty block */}
-
-
-
+
+
+
//*--------------*
//* Feature: f1Shorts
- /** getter for f1Shorts - gets
+ /** getter for f1Shorts - gets
* @generated
- * @return value of the feature
+ * @return value of the feature
*/
- public ShortArray getF1Shorts() { return _F_f1Shorts;}
-
- /** setter for f1Shorts - sets
+ public ShortArray getF1Shorts() { return (ShortArray)(_getFeatureValueNc(_FI_f1Shorts));}
+
+ /** setter for f1Shorts - sets
* @generated
- * @param v value to set into the feature
+ * @param v value to set into the feature
*/
public void setF1Shorts(ShortArray v) {
-
- _casView.setWithJournalJFRI(this, _FI_f1Shorts, () -> _F_f1Shorts = v);
- }
-
- /** indexed getter for f1Shorts - gets an indexed value -
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_f1Shorts, false), v);
+ }
+
+
+ /** indexed getter for f1Shorts - gets an indexed value -
* @generated
* @param i index in the array to get
- * @return value of the element at index i
+ * @return value of the element at index i
*/
public short getF1Shorts(int i) {
- return getF1Shorts().get(i);}
+ return ((ShortArray)(_getFeatureValueNc(_FI_f1Shorts))).get(i);}
- /** indexed setter for f1Shorts - sets an indexed value -
+ /** indexed setter for f1Shorts - sets an indexed value -
* @generated
* @param i index in the array to set
- * @param v value to set into the array
+ * @param v value to set into the array
*/
public void setF1Shorts(int i, short v) {
- getF1Shorts().set(i, v);}
+ ((ShortArray)(_getFeatureValueNc(_FI_f1Shorts))).set(i, v);
+ }
}
-
+
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java Mon Mar 7 21:32:07 2016
@@ -18,122 +18,119 @@
*/
-/* First created by JCasGen Wed May 23 14:54:19 EDT 2012 */
-
-
-
-/* Apache UIMA v3 - First created by JCasGen Tue Dec 01 15:07:57 EST 2015 */
+
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:49:16 EST 2016 */
package org.apache.uima.testTypeSystem_arrays;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.TypeSystemImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
import org.apache.uima.jcas.cas.StringArray;
import org.apache.uima.jcas.tcas.Annotation;
-/**
- * Updated by JCasGen Tue Dec 01 15:07:57 EST 2015
+/**
+ * Updated by JCasGen Wed Mar 02 13:49:16 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/resources/ExampleCas/testTypeSystem_arrays.xml
* @generated */
public class OfStrings extends Annotation {
/** @generated
- * @ordered
+ * @ordered
*/
@SuppressWarnings ("hiding")
public final static int typeIndexID = JCasRegistry.register(OfStrings.class);
/** @generated
- * @ordered
+ * @ordered
*/
@SuppressWarnings ("hiding")
public final static int type = typeIndexID;
/** @generated
- * @return index of the type
+ * @return index of the type
*/
@Override
public int getTypeIndexID() {return typeIndexID;}
+
+
+ /* *******************
+ * Feature Offsets *
+ * *******************/
+
+ /* Feature Adjusted Offsets */
+ public final static int _FI_f1Strings = TypeSystemImpl.getAdjustedFeatureOffset("f1Strings");
-
- /* *****************
- * Local Data *
- * *****************/
-
- /* Register Features */
- public final static int _FI_f1Strings = JCasRegistry.registerFeature(typeIndexID);
-
-
- private StringArray _F_f1Strings; //
-
+
/** Never called. Disable default constructor
* @generated */
protected OfStrings() {/* intentionally empty block */}
-
- /** Internal - constructor used by generator
+
+ /** Internal - constructor used by generator
* @generated
* @param casImpl the CAS this Feature Structure belongs to
- * @param type the type of this Feature Structure
+ * @param type the type of this Feature Structure
*/
public OfStrings(TypeImpl type, CASImpl casImpl) {
super(type, casImpl);
readObject();
}
-
+
/** @generated
- * @param jcas JCas to which this Feature Structure belongs
+ * @param jcas JCas to which this Feature Structure belongs
*/
public OfStrings(JCas jcas) {
super(jcas);
- readObject();
- }
+ readObject();
+ }
- /**
+ /**
* <!-- begin-user-doc -->
* Write your own initialization here
* <!-- end-user-doc -->
*
- * @generated modifiable
+ * @generated modifiable
*/
private void readObject() {/*default - does nothing empty block */}
-
-
-
+
+
+
//*--------------*
//* Feature: f1Strings
- /** getter for f1Strings - gets
+ /** getter for f1Strings - gets
* @generated
- * @return value of the feature
+ * @return value of the feature
*/
- public StringArray getF1Strings() { return _F_f1Strings;}
-
- /** setter for f1Strings - sets
+ public StringArray getF1Strings() { return (StringArray)(_getFeatureValueNc(_FI_f1Strings));}
+
+ /** setter for f1Strings - sets
* @generated
- * @param v value to set into the feature
+ * @param v value to set into the feature
*/
public void setF1Strings(StringArray v) {
-
- _casView.setWithJournalJFRI(this, _FI_f1Strings, () -> _F_f1Strings = v);
- }
-
- /** indexed getter for f1Strings - gets an indexed value -
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_f1Strings, false), v);
+ }
+
+
+ /** indexed getter for f1Strings - gets an indexed value -
* @generated
* @param i index in the array to get
- * @return value of the element at index i
+ * @return value of the element at index i
*/
public String getF1Strings(int i) {
- return getF1Strings().get(i);}
+ return ((StringArray)(_getFeatureValueNc(_FI_f1Strings))).get(i);}
- /** indexed setter for f1Strings - sets an indexed value -
+ /** indexed setter for f1Strings - sets an indexed value -
* @generated
* @param i index in the array to set
- * @param v value to set into the array
+ * @param v value to set into the array
*/
public void setF1Strings(int i, String v) {
- getF1Strings().set(i, v);}
+ ((StringArray)(_getFeatureValueNc(_FI_f1Strings))).set(i, v);
+ }
}
-
\ No newline at end of file
Added: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/sofa/test/CrossAnnotation.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/sofa/test/CrossAnnotation.java?rev=1733987&view=auto
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/sofa/test/CrossAnnotation.java (added)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/sofa/test/CrossAnnotation.java Mon Mar 7 21:32:07 2016
@@ -0,0 +1,100 @@
+
+
+
+/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:49:48 EST 2016 */
+
+package sofa.test;
+
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+
+
+import org.apache.uima.jcas.tcas.Annotation;
+
+
+/**
+ * Updated by JCasGen Wed Mar 02 13:49:48 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/resources/ExampleCas/testTypeSystem.xml
+ * @generated */
+public class CrossAnnotation extends Annotation {
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static int typeIndexID = JCasRegistry.register(CrossAnnotation.class);
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static int type = typeIndexID;
+ /** @generated
+ * @return index of the type
+ */
+ @Override
+ public int getTypeIndexID() {return typeIndexID;}
+
+
+ /* *******************
+ * Feature Offsets *
+ * *******************/
+
+ /* Feature Adjusted Offsets */
+ public final static int _FI_otherAnnotation = TypeSystemImpl.getAdjustedFeatureOffset("otherAnnotation");
+
+
+ /** Never called. Disable default constructor
+ * @generated */
+ protected CrossAnnotation() {/* intentionally empty block */}
+
+ /** Internal - constructor used by generator
+ * @generated
+ * @param casImpl the CAS this Feature Structure belongs to
+ * @param type the type of this Feature Structure
+ */
+ public CrossAnnotation(TypeImpl type, CASImpl casImpl) {
+ super(type, casImpl);
+ readObject();
+ }
+
+ /** @generated
+ * @param jcas JCas to which this Feature Structure belongs
+ */
+ public CrossAnnotation(JCas jcas) {
+ super(jcas);
+ readObject();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * Write your own initialization here
+ * <!-- end-user-doc -->
+ *
+ * @generated modifiable
+ */
+ private void readObject() {/*default - does nothing empty block */}
+
+
+
+ //*--------------*
+ //* Feature: otherAnnotation
+
+ /** getter for otherAnnotation - gets
+ * @generated
+ * @return value of the feature
+ */
+ public Annotation getOtherAnnotation() { return (Annotation)(_getFeatureValueNc(_FI_otherAnnotation));}
+
+ /** setter for otherAnnotation - sets
+ * @generated
+ * @param v value to set into the feature
+ */
+ public void setOtherAnnotation(Annotation v) {
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_otherAnnotation, false), v);
+ }
+
+ }
+
+
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/EndOfSentence.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/EndOfSentence.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/EndOfSentence.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/EndOfSentence.java Mon Mar 7 21:32:07 2016
@@ -1,19 +1,21 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
package x.y.z;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.TypeSystemImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Mon Mar 07 09:21:36 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class EndOfSentence extends TokenType {
@@ -34,14 +36,13 @@ public class EndOfSentence extends Token
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
+ /* Feature Adjusted Offsets */
-
/** Never called. Disable default constructor
* @generated */
protected EndOfSentence() {/* intentionally empty block */}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Sentence.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Sentence.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Sentence.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Sentence.java Mon Mar 7 21:32:07 2016
@@ -1,20 +1,22 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
package x.y.z;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
import org.apache.uima.jcas.tcas.Annotation;
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Mon Mar 07 09:21:36 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Sentence extends Annotation {
@@ -35,14 +37,14 @@ public class Sentence extends Annotation
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
+ /* Feature Adjusted Offsets */
+ public final static int _FI_sentenceLength = TypeSystemImpl.getAdjustedFeatureOffset("sentenceLength");
-
/** Never called. Disable default constructor
* @generated */
protected Sentence() {/* intentionally empty block */}
@@ -74,6 +76,25 @@ public class Sentence extends Annotation
*/
private void readObject() {/*default - does nothing empty block */}
-}
+
+
+ //*--------------*
+ //* Feature: sentenceLength
+
+ /** getter for sentenceLength - gets
+ * @generated
+ * @return value of the feature
+ */
+ public int getSentenceLength() { return _getIntValueNc(_FI_sentenceLength);}
+
+ /** setter for sentenceLength - sets
+ * @generated
+ * @param v value to set into the feature
+ */
+ public void setSentenceLength(int v) {
+ _setIntValueNfc(_getFeatFromAdjOffset(_FI_sentenceLength, true), v);
+ }
+
+ }
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Separator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Separator.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Separator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Separator.java Mon Mar 7 21:32:07 2016
@@ -1,19 +1,21 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
package x.y.z;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Mon Mar 07 09:21:36 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Separator extends TokenType {
@@ -34,14 +36,13 @@ public class Separator extends TokenType
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
+ /* Feature Adjusted Offsets */
-
/** Never called. Disable default constructor
* @generated */
protected Separator() {/* intentionally empty block */}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Token.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Token.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Token.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Token.java Mon Mar 7 21:32:07 2016
@@ -1,21 +1,23 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
package x.y.z;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
import org.apache.uima.jcas.cas.StringArray;
import org.apache.uima.jcas.tcas.Annotation;
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Mon Mar 07 09:21:36 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Token extends Annotation {
@@ -36,24 +38,17 @@ public class Token extends Annotation {
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
-
- /* Register Features */
- public final static int _FI_ttype = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_tokenFloatFeat = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_lemma = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_sentenceLength = JCasRegistry.registerFeature(typeIndexID);
- public final static int _FI_lemmaList = JCasRegistry.registerFeature(typeIndexID);
-
-
- private TokenType _F_ttype; //
- private float _F_tokenFloatFeat; //
- private String _F_lemma; //
- private int _F_sentenceLength; //
- private StringArray _F_lemmaList; //
-
+ /* *******************
+ * Feature Offsets *
+ * *******************/
+
+ /* Feature Adjusted Offsets */
+ public final static int _FI_ttype = TypeSystemImpl.getAdjustedFeatureOffset("ttype");
+ public final static int _FI_tokenFloatFeat = TypeSystemImpl.getAdjustedFeatureOffset("tokenFloatFeat");
+ public final static int _FI_lemma = TypeSystemImpl.getAdjustedFeatureOffset("lemma");
+ public final static int _FI_lemmaList = TypeSystemImpl.getAdjustedFeatureOffset("lemmaList");
+
+
/** Never called. Disable default constructor
* @generated */
protected Token() {/* intentionally empty block */}
@@ -94,16 +89,16 @@ public class Token extends Annotation {
* @generated
* @return value of the feature
*/
- public TokenType getTtype() { return _F_ttype;}
+ public TokenType getTtype() { return (TokenType)(_getFeatureValueNc(_FI_ttype));}
/** setter for ttype - sets
* @generated
* @param v value to set into the feature
*/
public void setTtype(TokenType v) {
-
- _casView.setWithJournalJFRI(this, _FI_ttype, () -> _F_ttype = v);
- }
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_ttype, false), v);
+ }
+
//*--------------*
@@ -113,15 +108,16 @@ public class Token extends Annotation {
* @generated
* @return value of the feature
*/
- public float getTokenFloatFeat() { return _F_tokenFloatFeat;}
+ public float getTokenFloatFeat() { return _getFloatValueNc(_FI_tokenFloatFeat);}
/** setter for tokenFloatFeat - sets
* @generated
* @param v value to set into the feature
*/
public void setTokenFloatFeat(float v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_tokenFloatFeat, () -> _F_tokenFloatFeat = v);
- }
+ _setFloatValueNfc(_getFeatFromAdjOffset(_FI_tokenFloatFeat, true), v);
+ }
+
//*--------------*
@@ -131,33 +127,16 @@ public class Token extends Annotation {
* @generated
* @return value of the feature
*/
- public String getLemma() { return _F_lemma;}
+ public String getLemma() { return _getStringValueNc(_FI_lemma);}
/** setter for lemma - sets
* @generated
* @param v value to set into the feature
*/
public void setLemma(String v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_lemma, () -> _F_lemma = v);
- }
-
+ _setStringValueNfc(_getFeatFromAdjOffset(_FI_lemma, false), v);
+ }
- //*--------------*
- //* Feature: sentenceLength
-
- /** getter for sentenceLength - gets
- * @generated
- * @return value of the feature
- */
- public int getSentenceLength() { return _F_sentenceLength;}
-
- /** setter for sentenceLength - sets
- * @generated
- * @param v value to set into the feature
- */
- public void setSentenceLength(int v) {
- _casView.setWithCheckAndJournalJFRI(this, _FI_sentenceLength, () -> _F_sentenceLength = v);
- }
//*--------------*
@@ -167,16 +146,16 @@ public class Token extends Annotation {
* @generated
* @return value of the feature
*/
- public StringArray getLemmaList() { return _F_lemmaList;}
+ public StringArray getLemmaList() { return (StringArray)(_getFeatureValueNc(_FI_lemmaList));}
/** setter for lemmaList - sets
* @generated
* @param v value to set into the feature
*/
public void setLemmaList(StringArray v) {
-
- _casView.setWithJournalJFRI(this, _FI_lemmaList, () -> _F_lemmaList = v);
- }
+ _setFeatureValueNcWj(_getFeatFromAdjOffset(_FI_lemmaList, false), v);
+ }
+
/** indexed getter for lemmaList - gets an indexed value -
* @generated
@@ -184,7 +163,7 @@ public class Token extends Annotation {
* @return value of the element at index i
*/
public String getLemmaList(int i) {
- return getLemmaList().get(i);}
+ return ((StringArray)(_getFeatureValueNc(_FI_lemmaList))).get(i);}
/** indexed setter for lemmaList - sets an indexed value -
* @generated
@@ -192,7 +171,8 @@ public class Token extends Annotation {
* @param v value to set into the array
*/
public void setLemmaList(int i, String v) {
- getLemmaList().set(i, v);}
+ ((StringArray)(_getFeatureValueNc(_FI_lemmaList))).set(i, v);
+ }
}
\ No newline at end of file
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/TokenType.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/TokenType.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/TokenType.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/TokenType.java Mon Mar 7 21:32:07 2016
@@ -1,20 +1,22 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
package x.y.z;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
import org.apache.uima.jcas.cas.TOP;
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Mon Mar 07 09:21:36 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class TokenType extends TOP {
@@ -35,14 +37,13 @@ public class TokenType extends TOP {
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
+ /* Feature Adjusted Offsets */
-
/** Never called. Disable default constructor
* @generated */
protected TokenType() {/* intentionally empty block */}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Word.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Word.java?rev=1733987&r1=1733986&r2=1733987&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Word.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/x/y/z/Word.java Mon Mar 7 21:32:07 2016
@@ -1,19 +1,21 @@
-/* Apache UIMA v3 - First created by JCasGen Tue Nov 03 17:48:38 EST 2015 */
+/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
package x.y.z;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
/**
- * Updated by JCasGen Tue Nov 03 17:48:38 EST 2015
+ * Updated by JCasGen Mon Mar 07 09:21:36 EST 2016
* XML source: C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Word extends TokenType {
@@ -34,14 +36,13 @@ public class Word extends TokenType {
public int getTypeIndexID() {return typeIndexID;}
- /* *****************
- * Local Data *
- * *****************/
+ /* *******************
+ * Feature Offsets *
+ * *******************/
- /* Register Features */
+ /* Feature Adjusted Offsets */
-
/** Never called. Disable default constructor
* @generated */
protected Word() {/* intentionally empty block */}