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/12/16 15:58:13 UTC
svn commit: r1774630 - in /uima/uimaj/branches/experiment-v3-jcas:
uima-docbook-v3-users-guide/src/docbook/
uimaj-core/src/main/java/org/apache/uima/jcas/cas/
uimaj-core/src/test/java/aa/ uimaj-core/src/test/java/org/apache/lang/
uimaj-core/src/test/ja...
Author: schor
Date: Fri Dec 16 15:58:13 2016
New Revision: 1774630
URL: http://svn.apache.org/viewvc?rev=1774630&view=rev
Log:
[UIMA-5137] [UIMA-5207] [UIMA-5208] add doc about _Type removal, including access from JCas interface.
merges for doc update. merge impls for uima arrays and lists enhancements
Modified:
uima/uimaj/branches/experiment-v3-jcas/uima-docbook-v3-users-guide/src/docbook/uv3.backwards_compatibility.xml
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java (contents, props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java (contents, props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java (contents, props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java (contents, props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java (contents, props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java (contents, props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java (contents, props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java
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/cas/test/CrossAnnotation.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/Token.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java (contents, props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java (contents, props changed)
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/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/uima-docbook-v3-users-guide/src/docbook/uv3.backwards_compatibility.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uima-docbook-v3-users-guide/src/docbook/uv3.backwards_compatibility.xml?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uima-docbook-v3-users-guide/src/docbook/uv3.backwards_compatibility.xml (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uima-docbook-v3-users-guide/src/docbook/uv3.backwards_compatibility.xml Fri Dec 16 15:58:13 2016
@@ -34,7 +34,9 @@ under the License.
<para>To this end, version 3 is designed to be backwards compatible, except for needing a new set of JCas classes (if these were
previously being used). There is a migration tool to handle the upgrading of the JCas classes, described in
- a later chapter.</para>
+ a later chapter. The JCas class changes include no longer needing, using, or supporting the <code>Xyz_Type</code>
+ sister classes for each main JCas class. Methods in the JCas API that gave access to these class instances
+ have been removed.</para>
<section id="uv3.backwards_compatibility.serialization">
<title>Serialization forms</title>
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java Fri Dec 16 15:58:13 2016
@@ -19,6 +19,9 @@
package org.apache.uima.jcas.cas;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
import org.apache.uima.cas.BooleanArrayFS;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
@@ -26,7 +29,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/** JCas class model for BooleanArray */
-public final class BooleanArray extends TOP implements CommonPrimitiveArray, BooleanArrayFS {
+public final class BooleanArray extends TOP implements CommonPrimitiveArray, BooleanArrayFS, Iterable<Boolean> {
/**
* 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
@@ -182,4 +185,24 @@ public final class BooleanArray extends
set(i, Boolean.parseBoolean(v));
}
+ @Override
+ public Iterator<Boolean> iterator() {
+ return new Iterator<Boolean>() {
+ int i = 0;
+
+ @Override
+ public boolean hasNext() {
+ return i < size();
+ }
+
+ @Override
+ public Boolean next() {
+ if (!hasNext())
+ throw new NoSuchElementException();
+ return get(i++);
+ }
+
+ };
+ }
+
}
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 16 15:58:13 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/BooleanArray.java:1690273-1774622
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java Fri Dec 16 15:58:13 2016
@@ -19,6 +19,9 @@
package org.apache.uima.jcas.cas;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
import org.apache.uima.cas.ByteArrayFS;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
@@ -26,7 +29,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/** JCas class model for ByteArray */
-public final class ByteArray extends TOP implements CommonPrimitiveArray, ByteArrayFS {
+public final class ByteArray extends TOP implements CommonPrimitiveArray, ByteArrayFS, Iterable<Byte> {
/**
* 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
@@ -179,4 +182,23 @@ public final class ByteArray extends TOP
set(i, Byte.parseByte(v));
}
+ @Override
+ public Iterator<Byte> iterator() {
+ return new Iterator<Byte>() {
+ int i = 0;
+
+ @Override
+ public boolean hasNext() {
+ return i < size();
+ }
+
+ @Override
+ public Byte next() {
+ if (!hasNext())
+ throw new NoSuchElementException();
+ return get(i++);
+ }
+ };
+ }
+
}
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 16 15:58:13 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ByteArray.java:1690273-1774622
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java Fri Dec 16 15:58:13 2016
@@ -20,9 +20,9 @@
package org.apache.uima.jcas.cas;
import java.util.Arrays;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.function.DoubleConsumer;
import org.apache.uima.cas.DoubleArrayFS;
import org.apache.uima.cas.impl.CASImpl;
@@ -31,7 +31,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/** JCas class model for DoubleArray */
-public final class DoubleArray extends TOP implements CommonPrimitiveArray, DoubleArrayFS {
+public final class DoubleArray extends TOP implements CommonPrimitiveArray, DoubleArrayFS, Iterable<Double> {
/**
* 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
@@ -186,4 +186,23 @@ public final class DoubleArray extends T
return Arrays.spliterator(theArray);
}
+ @Override
+ public Iterator<Double> iterator() {
+ return new Iterator<Double>() {
+ int i = 0;
+
+ @Override
+ public boolean hasNext() {
+ return i < size();
+ }
+
+ @Override
+ public Double next() {
+ if (!hasNext())
+ throw new NoSuchElementException();
+ return get(i++);
+ }
+ };
+ }
+
}
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 16 15:58:13 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/DoubleArray.java:1690273-1774622
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java Fri Dec 16 15:58:13 2016
@@ -123,5 +123,14 @@ public abstract class FSList extends TOP
return Collections.emptyIterator(); // overridden by NonEmptyFSList
}
+ /**
+ * pushes item onto front of this list
+ * @param item the item to push onto the list
+ * @return the new list, with this item as the head value of the first element
+ */
+ public NonEmptyFSList push(TOP item) {
+ return new NonEmptyFSList(_casView.getExistingJCas(), item, this);
+ }
+
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java Fri Dec 16 15:58:13 2016
@@ -19,8 +19,6 @@
package org.apache.uima.jcas.cas;
-import java.util.Spliterator;
-
import org.apache.uima.cas.FloatArrayFS;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 16 15:58:13 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatArray.java:1690273-1774622
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FloatList.java Fri Dec 16 15:58:13 2016
@@ -19,11 +19,14 @@
package org.apache.uima.jcas.cas;
+import java.util.Collections;
+import java.util.Iterator;
+
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.jcas.JCas;
-public abstract class FloatList extends TOP implements CommonList {
+public abstract class FloatList extends TOP implements CommonList, Iterable<Float> {
// Never called.
protected FloatList() {// Disable default constructor
@@ -54,4 +57,21 @@ public abstract class FloatList extends
NonEmptyFloatList node = new NonEmptyFloatList(this._casView.getTypeSystemImpl().floatNeListType, this._casView);
return node;
}
+
+ /**
+ * pushes item onto front of this list
+ * @param item the item to push onto the list
+ * @return the new list, with this item as the head value of the first element
+ */
+ public NonEmptyFloatList push(float item) {
+ return new NonEmptyFloatList(_casView.getExistingJCas(), item, this);
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Iterable#iterator()
+ */
+ @Override
+ public Iterator<Float> iterator() {
+ return Collections.emptyIterator(); // overridden by NonEmptyXxList
+ }
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java Fri Dec 16 15:58:13 2016
@@ -20,8 +20,9 @@
package org.apache.uima.jcas.cas;
import java.util.Arrays;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
import java.util.Spliterator;
-import java.util.function.IntConsumer;
import org.apache.uima.List_of_ints;
import org.apache.uima.cas.IntArrayFS;
@@ -31,7 +32,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/** The Java Class model corresponding to the Cas IntegerArray_JCasImpl type. */
-public final class IntegerArray extends TOP implements CommonPrimitiveArray, IntArrayFS {
+public final class IntegerArray extends TOP implements CommonPrimitiveArray, IntArrayFS, Iterable<Integer> {
/**
* 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
@@ -196,4 +197,23 @@ public final class IntegerArray extends
return List_of_ints.newInstance(theArray);
}
+ @Override
+ public Iterator<Integer> iterator() {
+ return new Iterator<Integer>() {
+ int i = 0;
+
+ @Override
+ public boolean hasNext() {
+ return i < size();
+ }
+
+ @Override
+ public Integer next() {
+ if (!hasNext())
+ throw new NoSuchElementException();
+ return get(i++);
+ }
+ };
+ }
+
}
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 16 15:58:13 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArray.java:1690273-1774622
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerList.java Fri Dec 16 15:58:13 2016
@@ -19,11 +19,14 @@
package org.apache.uima.jcas.cas;
+import java.util.Collections;
+import java.util.Iterator;
+
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.jcas.JCas;
-public abstract class IntegerList extends TOP implements CommonList {
+public abstract class IntegerList extends TOP implements CommonList, Iterable<Integer> {
// Never called.
protected IntegerList() { // Disable default constructor
@@ -52,5 +55,22 @@ public abstract class IntegerList extend
NonEmptyIntegerList node = new NonEmptyIntegerList(this._casView.getTypeSystemImpl().intNeListType, this._casView);
return node;
}
+
+ /* (non-Javadoc)
+ * @see java.lang.Iterable#iterator()
+ */
+ @Override
+ public Iterator<Integer> iterator() {
+ return Collections.emptyIterator(); // overridden by NonEmptyXxList
+ }
+
+ /**
+ * pushes item onto front of this list
+ * @param item the item to push onto the list
+ * @return the new list, with this item as the head value of the first element
+ */
+ public NonEmptyIntegerList push(int item) {
+ return new NonEmptyIntegerList(_casView.getExistingJCas(), item, this);
+ }
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java Fri Dec 16 15:58:13 2016
@@ -20,8 +20,9 @@
package org.apache.uima.jcas.cas;
import java.util.Arrays;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
import java.util.Spliterator;
-import java.util.function.LongConsumer;
import org.apache.uima.cas.LongArrayFS;
import org.apache.uima.cas.impl.CASImpl;
@@ -30,7 +31,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/** JCas class model for LongArray */
-public final class LongArray extends TOP implements CommonPrimitiveArray, LongArrayFS {
+public final class LongArray extends TOP implements CommonPrimitiveArray, LongArrayFS, Iterable<Long> {
/**
* 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
@@ -187,4 +188,23 @@ public final class LongArray extends TOP
return Arrays.spliterator(theArray);
}
+ @Override
+ public Iterator<Long> iterator() {
+ return new Iterator<Long>() {
+ int i = 0;
+
+ @Override
+ public boolean hasNext() {
+ return i < size();
+ }
+
+ @Override
+ public Long next() {
+ if (!hasNext())
+ throw new NoSuchElementException();
+ return get(i++);
+ }
+ };
+ }
+
}
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 16 15:58:13 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/LongArray.java:1690273-1774623
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyFloatList.java Fri Dec 16 15:58:13 2016
@@ -19,6 +19,9 @@
package org.apache.uima.jcas.cas;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
@@ -131,4 +134,30 @@ public class NonEmptyFloatList extends F
public EmptyFloatList getEmptyList() {
return this._casView.getEmptyFloatList();
}
+
+ @Override
+ public Iterator<Float> iterator() {
+ return new Iterator<Float>() {
+
+ FloatList node = NonEmptyFloatList.this;
+
+ @Override
+ public boolean hasNext() {
+ return node instanceof NonEmptyFloatList;
+ }
+
+ @Override
+ public Float next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
+ NonEmptyFloatList nn = (NonEmptyFloatList)node;
+ Float element = nn.getHead();
+ node = nn.getTail();
+ return element;
+ }
+
+ };
+ }
+
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/NonEmptyIntegerList.java Fri Dec 16 15:58:13 2016
@@ -19,7 +19,9 @@
package org.apache.uima.jcas.cas;
+import java.util.Iterator;
import java.util.List;
+import java.util.NoSuchElementException;
import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.cas.impl.CASImpl;
@@ -138,4 +140,30 @@ public class NonEmptyIntegerList extends
public EmptyIntegerList getEmptyList() {
return this._casView.getEmptyIntegerList();
}
+
+ @Override
+ public Iterator<Integer> iterator() {
+ return new Iterator<Integer>() {
+
+ IntegerList node = NonEmptyIntegerList.this;
+
+ @Override
+ public boolean hasNext() {
+ return node instanceof NonEmptyIntegerList;
+ }
+
+ @Override
+ public Integer next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
+ NonEmptyIntegerList nn = (NonEmptyIntegerList)node;
+ Integer element = nn.getHead();
+ node = nn.getTail();
+ return element;
+ }
+
+ };
+ }
+
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java Fri Dec 16 15:58:13 2016
@@ -19,6 +19,9 @@
package org.apache.uima.jcas.cas;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
import org.apache.uima.cas.ShortArrayFS;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
@@ -26,7 +29,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
/** JCas class model for ShortArray */
-public final class ShortArray extends TOP implements CommonPrimitiveArray, ShortArrayFS {
+public final class ShortArray extends TOP implements CommonPrimitiveArray, ShortArrayFS, Iterable<Short> {
/**
* 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
@@ -175,4 +178,23 @@ public final class ShortArray extends TO
public void setArrayValueFromString(int i, String v) {
set(i, Short.parseShort(v));
}
+
+ @Override
+ public Iterator<Short> iterator() {
+ return new Iterator<Short>() {
+ int i = 0;
+
+ @Override
+ public boolean hasNext() {
+ return i < size();
+ }
+
+ @Override
+ public Short next() {
+ if (!hasNext())
+ throw new NoSuchElementException();
+ return get(i++);
+ }
+ };
+ }
}
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 16 15:58:13 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ShortArray.java:1690273-1774624
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/StringList.java Fri Dec 16 15:58:13 2016
@@ -64,4 +64,8 @@ public abstract class StringList extends
return node;
}
+ public NonEmptyStringList push(String item) {
+ return new NonEmptyStringList(this._casView.getExistingJCas(), item, this);
+ }
+
}
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,23 +1,32 @@
-/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.cas.TOP;
/**
- * 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class AbstractType extends TOP {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "aa.AbstractType";
+
/** @generated
* @ordered
*/
@@ -39,6 +48,9 @@ public class AbstractType extends TOP {
* Feature Offsets *
* *******************/
+ public final static String _FeatName_abstractInt = "abstractInt";
+
+
/* Feature Adjusted Offsets */
public final static int _FI_abstractInt = TypeSystemImpl.getAdjustedFeatureOffset("abstractInt");
@@ -65,6 +77,7 @@ public class AbstractType extends TOP {
readObject();
}
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,24 +1,31 @@
-/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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.JCas;
import org.apache.uima.jcas.JCasRegistry;
/**
- * 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class ConcreteType extends AbstractType {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "aa.ConcreteType";
+
/** @generated
* @ordered
*/
@@ -40,6 +47,9 @@ public class ConcreteType extends Abstra
* Feature Offsets *
* *******************/
+ public final static String _FeatName_concreteString = "concreteString";
+
+
/* Feature Adjusted Offsets */
public final static int _FI_concreteString = TypeSystemImpl.getAdjustedFeatureOffset("concreteString");
@@ -66,6 +76,7 @@ public class ConcreteType extends Abstra
readObject();
}
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,23 +1,32 @@
-/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.cas.TOP;
/**
- * 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class MissingFeatureInCas extends TOP {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "aa.MissingFeatureInCas";
+
/** @generated
* @ordered
*/
@@ -39,6 +48,11 @@ public class MissingFeatureInCas extends
* Feature Offsets *
* *******************/
+ public final static String _FeatName_haveThisOne = "haveThisOne";
+ public final static String _FeatName_missingThisOne = "missingThisOne";
+ public final static String _FeatName_changedFType = "changedFType";
+
+
/* Feature Adjusted Offsets */
public final static int _FI_haveThisOne = TypeSystemImpl.getAdjustedFeatureOffset("haveThisOne");
public final static int _FI_missingThisOne = TypeSystemImpl.getAdjustedFeatureOffset("missingThisOne");
@@ -67,6 +81,7 @@ public class MissingFeatureInCas extends
readObject();
}
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,22 +1,32 @@
-/* Apache UIMA v3 - First created by JCasGen Sat Mar 05 14:59:52 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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.TOP;
/**
- * 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class MissingInCas extends TOP {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "aa.MissingInCas";
+
/** @generated
* @ordered
*/
@@ -38,6 +48,8 @@ public class MissingInCas extends TOP {
* Feature Offsets *
* *******************/
+
+
/* Feature Adjusted Offsets */
@@ -63,6 +75,7 @@ public class MissingInCas extends TOP {
readObject();
}
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,27 +1,38 @@
-/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
+import org.apache.uima.jcas.cas.LongArray;
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.DoubleArray;
+import org.apache.uima.jcas.cas.IntegerArray;
/**
- * 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Root extends TOP {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "aa.Root";
+
/** @generated
* @ordered
*/
@@ -43,6 +54,20 @@ public class Root extends TOP {
* Feature Offsets *
* *******************/
+ public final static String _FeatName_arrayInt = "arrayInt";
+ public final static String _FeatName_arrayRef = "arrayRef";
+ public final static String _FeatName_arrayFloat = "arrayFloat";
+ public final static String _FeatName_arrayString = "arrayString";
+ public final static String _FeatName_plainInt = "plainInt";
+ public final static String _FeatName_plainFloat = "plainFloat";
+ public final static String _FeatName_plainString = "plainString";
+ public final static String _FeatName_plainRef = "plainRef";
+ public final static String _FeatName_plainLong = "plainLong";
+ public final static String _FeatName_plainDouble = "plainDouble";
+ public final static String _FeatName_arrayLong = "arrayLong";
+ public final static String _FeatName_arrayDouble = "arrayDouble";
+
+
/* Feature Adjusted Offsets */
public final static int _FI_arrayInt = TypeSystemImpl.getAdjustedFeatureOffset("arrayInt");
public final static int _FI_arrayRef = TypeSystemImpl.getAdjustedFeatureOffset("arrayRef");
@@ -52,6 +77,10 @@ public class Root extends TOP {
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");
+ public final static int _FI_plainLong = TypeSystemImpl.getAdjustedFeatureOffset("plainLong");
+ public final static int _FI_plainDouble = TypeSystemImpl.getAdjustedFeatureOffset("plainDouble");
+ public final static int _FI_arrayLong = TypeSystemImpl.getAdjustedFeatureOffset("arrayLong");
+ public final static int _FI_arrayDouble = TypeSystemImpl.getAdjustedFeatureOffset("arrayDouble");
/** Never called. Disable default constructor
@@ -76,6 +105,7 @@ public class Root extends TOP {
readObject();
}
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
@@ -305,6 +335,116 @@ public class Root extends TOP {
_setFeatureValueNcWj(_FI_plainRef, v);
}
+
+
+ //*--------------*
+ //* Feature: plainLong
+
+ /** getter for plainLong - gets
+ * @generated
+ * @return value of the feature
+ */
+ public long getPlainLong() { return _getLongValueNc(_FI_plainLong);}
+
+ /** setter for plainLong - sets
+ * @generated
+ * @param v value to set into the feature
+ */
+ public void setPlainLong(long v) {
+ _setLongValueNfc(_FI_plainLong, v);
+ }
+
+
+
+ //*--------------*
+ //* Feature: plainDouble
+
+ /** getter for plainDouble - gets
+ * @generated
+ * @return value of the feature
+ */
+ public double getPlainDouble() { return _getDoubleValueNc(_FI_plainDouble);}
+
+ /** setter for plainDouble - sets
+ * @generated
+ * @param v value to set into the feature
+ */
+ public void setPlainDouble(double v) {
+ _setDoubleValueNfc(_FI_plainDouble, v);
+ }
+
+
+
+ //*--------------*
+ //* Feature: arrayLong
+
+ /** getter for arrayLong - gets
+ * @generated
+ * @return value of the feature
+ */
+ public LongArray getArrayLong() { return (LongArray)(_getFeatureValueNc(_FI_arrayLong));}
+
+ /** setter for arrayLong - sets
+ * @generated
+ * @param v value to set into the feature
+ */
+ public void setArrayLong(LongArray v) {
+ _setFeatureValueNcWj(_FI_arrayLong, v);
+ }
+
+
+ /** indexed getter for arrayLong - gets an indexed value -
+ * @generated
+ * @param i index in the array to get
+ * @return value of the element at index i
+ */
+ public long getArrayLong(int i) {
+ return ((LongArray)(_getFeatureValueNc(_FI_arrayLong))).get(i);}
+
+ /** indexed setter for arrayLong - sets an indexed value -
+ * @generated
+ * @param i index in the array to set
+ * @param v value to set into the array
+ */
+ public void setArrayLong(int i, long v) {
+ ((LongArray)(_getFeatureValueNc(_FI_arrayLong))).set(i, v);
+ }
+
+
+ //*--------------*
+ //* Feature: arrayDouble
+
+ /** getter for arrayDouble - gets
+ * @generated
+ * @return value of the feature
+ */
+ public DoubleArray getArrayDouble() { return (DoubleArray)(_getFeatureValueNc(_FI_arrayDouble));}
+
+ /** setter for arrayDouble - sets
+ * @generated
+ * @param v value to set into the feature
+ */
+ public void setArrayDouble(DoubleArray v) {
+ _setFeatureValueNcWj(_FI_arrayDouble, v);
+ }
+
+
+ /** indexed getter for arrayDouble - gets an indexed value -
+ * @generated
+ * @param i index in the array to get
+ * @return value of the element at index i
+ */
+ public double getArrayDouble(int i) {
+ return ((DoubleArray)(_getFeatureValueNc(_FI_arrayDouble))).get(i);}
+
+ /** indexed setter for arrayDouble - sets an indexed value -
+ * @generated
+ * @param i index in the array to set
+ * @param v value to set into the array
+ */
+ public void setArrayDouble(int i, double v) {
+ ((DoubleArray)(_getFeatureValueNc(_FI_arrayDouble))).set(i, 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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,23 +1,32 @@
-/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 EST 2016 */
package org.apache.lang;
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.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.cas.TOP;
/**
- * 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class LanguagePair extends TOP {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "org.apache.lang.LanguagePair";
+
/** @generated
* @ordered
*/
@@ -39,6 +48,11 @@ public class LanguagePair extends TOP {
* Feature Offsets *
* *******************/
+ public final static String _FeatName_lang1 = "lang1";
+ public final static String _FeatName_lang2 = "lang2";
+ public final static String _FeatName_description = "description";
+
+
/* Feature Adjusted Offsets */
public final static int _FI_lang1 = TypeSystemImpl.getAdjustedFeatureOffset("lang1");
public final static int _FI_lang2 = TypeSystemImpl.getAdjustedFeatureOffset("lang2");
@@ -67,6 +81,7 @@ public class LanguagePair extends TOP {
readObject();
}
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,23 +1,32 @@
-/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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.cas.impl.TypeSystemImpl;
-import org.apache.uima.jcas.JCas;
+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: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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class CrossAnnotation extends Annotation {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "org.apache.uima.cas.test.CrossAnnotation";
+
/** @generated
* @ordered
*/
@@ -39,6 +48,9 @@ public class CrossAnnotation extends Ann
* Feature Offsets *
* *******************/
+ public final static String _FeatName_otherAnnotation = "otherAnnotation";
+
+
/* Feature Adjusted Offsets */
public final static int _FI_otherAnnotation = TypeSystemImpl.getAdjustedFeatureOffset("otherAnnotation");
@@ -65,6 +77,19 @@ public class CrossAnnotation extends Ann
readObject();
}
+
+ /** @generated
+ * @param jcas JCas to which this Feature Structure belongs
+ * @param begin offset to the begin spot in the SofA
+ * @param end offset to the end spot in the SofA
+ */
+ public CrossAnnotation(JCas jcas, int begin, int end) {
+ super(jcas);
+ setBegin(begin);
+ setEnd(end);
+ readObject();
+ }
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,22 +1,32 @@
-/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Sentence extends Annotation {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "org.apache.uima.cas.test.Sentence";
+
/** @generated
* @ordered
*/
@@ -38,6 +48,8 @@ public class Sentence extends Annotation
* Feature Offsets *
* *******************/
+
+
/* Feature Adjusted Offsets */
@@ -63,6 +75,19 @@ public class Sentence extends Annotation
readObject();
}
+
+ /** @generated
+ * @param jcas JCas to which this Feature Structure belongs
+ * @param begin offset to the begin spot in the SofA
+ * @param end offset to the end spot in the SofA
+ */
+ public Sentence(JCas jcas, int begin, int end) {
+ super(jcas);
+ setBegin(begin);
+ setEnd(end);
+ readObject();
+ }
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,22 +1,32 @@
-/* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:45:02 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Token extends Annotation {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "org.apache.uima.cas.test.Token";
+
/** @generated
* @ordered
*/
@@ -38,6 +48,8 @@ public class Token extends Annotation {
* Feature Offsets *
* *******************/
+
+
/* Feature Adjusted Offsets */
@@ -63,6 +75,19 @@ public class Token extends Annotation {
readObject();
}
+
+ /** @generated
+ * @param jcas JCas to which this Feature Structure belongs
+ * @param begin offset to the begin spot in the SofA
+ * @param end offset to the end spot in the SofA
+ */
+ public Token(JCas jcas, int begin, int end) {
+ super(jcas);
+ setBegin(begin);
+ setEnd(end);
+ readObject();
+ }
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java Fri Dec 16 15:58:13 2016
@@ -130,9 +130,13 @@ public class CASTestSetup implements Ann
Type typeArrayInt = tsm.getType(CAS.TYPE_NAME_INTEGER_ARRAY);
Type typeArrayRef = tsm.getType(CAS.TYPE_NAME_FS_ARRAY);
Type typeArrayFloat = tsm.getType(CAS.TYPE_NAME_FLOAT_ARRAY);
+ Type typeArrayLong = tsm.getType(CAS.TYPE_NAME_LONG_ARRAY);
+ Type typeArrayDouble = tsm.getType(CAS.TYPE_NAME_DOUBLE_ARRAY);
Type typeArrayString = tsm.getType(CAS.TYPE_NAME_STRING_ARRAY);
Type typeInteger = tsm.getType(CAS.TYPE_NAME_INTEGER);
Type typeFloat = tsm.getType(CAS.TYPE_NAME_FLOAT);
+ Type typeDouble = tsm.getType(CAS.TYPE_NAME_DOUBLE);
+ Type typeLong = tsm.getType(CAS.TYPE_NAME_LONG);
Type typeString = tsm.getType(CAS.TYPE_NAME_STRING);
Type typeRef = tsm.getType(CAS.TYPE_NAME_TOP);
// assert(annotType != null);
@@ -170,9 +174,13 @@ public class CASTestSetup implements Ann
tsm.addFeature("arrayInt", typeRoot, typeArrayInt);
tsm.addFeature("arrayRef", typeRoot, typeArrayRef);
tsm.addFeature("arrayFloat", typeRoot, typeArrayFloat);
+ tsm.addFeature("arrayLong", typeRoot, typeArrayLong);
+ tsm.addFeature("arrayDouble", typeRoot, typeArrayDouble);
tsm.addFeature("arrayString", typeRoot, typeArrayString);
tsm.addFeature("plainInt", typeRoot, typeInteger);
tsm.addFeature("plainFloat", typeRoot, typeFloat);
+ tsm.addFeature("plainDouble", typeRoot, typeDouble);
+ tsm.addFeature("plainLong", typeRoot, typeLong);
tsm.addFeature("plainString", typeRoot, typeString);
// tsm.addFeature("plainRef", typeRoot, typeRef);
tsm.addFeature("plainRef", typeRoot, typeRoot);
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 16 15:58:13 2016
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/CASTestSetup.java:1690273-1774629
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java?rev=1774630&r1=1774629&r2=1774630&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java Fri Dec 16 15:58:13 2016
@@ -19,6 +19,7 @@
package org.apache.uima.jcas.test;
+import java.util.Arrays;
import java.util.Iterator;
import org.apache.uima.cas.CAS;
@@ -35,18 +36,28 @@ import org.apache.uima.cas.impl.LowLevel
import org.apache.uima.cas.impl.LowLevelIndexRepository;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JFSIndexRepository;
+import org.apache.uima.jcas.cas.BooleanArray;
+import org.apache.uima.jcas.cas.ByteArray;
+import org.apache.uima.jcas.cas.DoubleArray;
import org.apache.uima.jcas.cas.EmptyFSList;
import org.apache.uima.jcas.cas.EmptyFloatList;
import org.apache.uima.jcas.cas.EmptyIntegerList;
import org.apache.uima.jcas.cas.EmptyStringList;
import org.apache.uima.jcas.cas.FSArray;
+import org.apache.uima.jcas.cas.FSList;
import org.apache.uima.jcas.cas.FloatArray;
+import org.apache.uima.jcas.cas.FloatList;
import org.apache.uima.jcas.cas.IntegerArray;
+import org.apache.uima.jcas.cas.IntegerList;
+import org.apache.uima.jcas.cas.LongArray;
import org.apache.uima.jcas.cas.NonEmptyFSList;
import org.apache.uima.jcas.cas.NonEmptyFloatList;
import org.apache.uima.jcas.cas.NonEmptyIntegerList;
import org.apache.uima.jcas.cas.NonEmptyStringList;
+import org.apache.uima.jcas.cas.ShortArray;
import org.apache.uima.jcas.cas.StringArray;
+import org.apache.uima.jcas.cas.StringList;
+import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.resource.metadata.impl.TypeSystemDescription_impl;
import org.apache.uima.test.junit_extension.JUnitExtension;
@@ -303,6 +314,14 @@ public class JCasTest extends TestCase {
assertEquals(1247.3F, r1.getPlainFloat());
assertEquals(321.4F, r1.getArrayFloat(2));
+ // double values
+ r1 = new Root(jcas);
+ r1.setPlainDouble(2247.3D);
+ r1.setArrayDouble(new DoubleArray(jcas, 3));
+ r1.setArrayDouble(2, 421.4D);
+ assertEquals(2247.3D, r1.getPlainDouble());
+ assertEquals(421.4D, r1.getArrayDouble(2));
+
// null values
r2.setArrayString(0, null);
r2.setArrayRef(0, null);
@@ -727,6 +746,145 @@ public class JCasTest extends TestCase {
}
}
+ public void testStringListAPI() {
+ StringList sl = new EmptyStringList(jcas);
+ sl = sl.push("2");
+ sl = sl.push("1");
+
+ String[] sa = new String[2];
+ int i = 0;
+ for (String s : sl) {
+ sa[i++] = s;
+ }
+
+ String[] expected = {"1", "2"};
+ assert(Arrays.equals(expected, sa));
+ }
+
+ public void testStringArrayAPI() {
+ StringArray sa = new StringArray(jcas, 3);
+ String[] values = {"1", "2", "3"};
+ sa.copyFromArray(values, 0, 0, 3);
+
+ int i = 0;
+ for (String s : sa) {
+ assert(s.equals(values[i++]));
+ }
+ }
+
+ public void testFSListAPI() {
+ FSList sl = new EmptyFSList(jcas);
+ TOP fs1 = new TOP(jcas);
+ TOP fs2 = new TOP(jcas);
+ sl = sl.push(fs2);
+ sl = sl.push(fs1);
+
+ TOP[] fss = new TOP[2];
+ int i = 0;
+ for (TOP s : sl) {
+ fss[i++] = s;
+ }
+
+ TOP[] expected = {fs1, fs2};
+ assert(Arrays.equals(expected, fss));
+ }
+
+ public void testFSArrayAPI() {
+ FSArray sa = new FSArray(jcas, 2);
+ TOP fs1 = new TOP(jcas);
+ TOP fs2 = new TOP(jcas);
+ TOP[] values = {fs1, fs2};
+ sa.copyFromArray(values, 0, 0, 2);
+
+ int i = 0;
+ for (FeatureStructure s : sa) {
+ assert(s.equals(values[i++]));
+ }
+ }
+
+ public void testOtherListAPI() {
+ // float and integer
+ IntegerList sl = new EmptyIntegerList(jcas);
+ sl = sl.push(2);
+ sl = sl.push(1);
+
+ int[] fss = new int[2];
+ int i = 0;
+ for (int s : sl) {
+ fss[i++] = s;
+ }
+
+ int[] expected = {1, 2};
+ assert(Arrays.equals(expected, fss));
+
+ FloatList fl = new EmptyFloatList(jcas);
+ fl = fl.push(2.0F);
+ fl = fl.push(1.0F);
+ float[] fls = new float[2];
+ i = 0;
+ for (float f : fl) {
+ fls[i++] = f;
+ }
+
+ float[] expectedFloats = {1.0f, 2.0f};
+ assert(Arrays.equals(expectedFloats, fls));
+
+ BooleanArray boa = new BooleanArray(jcas, 2);
+ boa.set(0, true);
+ boa.set(1, false);
+ boolean[] expectedBa = {true, false};
+ i = 0;
+ for (boolean bov : boa) {
+ assertEquals(expectedBa[i++], bov);
+ }
+
+ ByteArray bya = new ByteArray(jcas, 2);
+ bya.set(0, (byte)15);
+ bya.set(1, (byte)22);
+ byte[] expectedBya = {15, 22};
+ i = 0;
+ for (byte v : bya) {
+ assertEquals(expectedBya[i++], v);
+ }
+
+ ShortArray sha = new ShortArray(jcas, 2);
+ sha.set(0, (short)15);
+ sha.set(1, (short)22);
+ short[] expectedSha = {15, 22};
+ i = 0;
+ for (short v : sha) {
+ assertEquals(expectedSha[i++], v);
+ }
+
+ IntegerArray ina = new IntegerArray(jcas, 2);
+ ina.set(0, (int)15);
+ ina.set(1, (int)22);
+ int[] expectedIna = {15, 22};
+ i = 0;
+ for (int v : ina) {
+ assertEquals(expectedIna[i++], v);
+ }
+
+ LongArray loa = new LongArray(jcas, 2);
+ loa.set(0, (long)15);
+ loa.set(1, (long)22);
+ long[] expectedLoa = {15, 22};
+ i = 0;
+ for (long v : loa) {
+ assertEquals(expectedLoa[i++], v);
+ }
+
+ DoubleArray doa = new DoubleArray(jcas, 2);
+ doa.set(0, (double)15);
+ doa.set(1, (double)22);
+ Double[] expectedDoa = {15d, 22d};
+ i = 0;
+ for (double v : doa) {
+ assertEquals(expectedDoa[i++], v);
+ }
+
+ }
+
public void testUndefinedType() throws Exception {
//create jcas with no type system
JCas jcas = CasCreationUtils.createCas(new TypeSystemDescription_impl(), null, null).getJCas();
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 16 15:58:13 2016
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java:1690273-1774609
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -252,7 +252,27 @@
<description>TokenType testMissingImport;</description>
<rangeTypeName>aa.Root</rangeTypeName>
</featureDescription>
-</features>
+<featureDescription>
+ <name>plainLong</name>
+ <description/>
+ <rangeTypeName>uima.cas.Long</rangeTypeName>
+ </featureDescription>
+ <featureDescription>
+ <name>plainDouble</name>
+ <description/>
+ <rangeTypeName>uima.cas.Double</rangeTypeName>
+ </featureDescription>
+ <featureDescription>
+ <name>arrayLong</name>
+ <description/>
+ <rangeTypeName>uima.cas.LongArray</rangeTypeName>
+ </featureDescription>
+ <featureDescription>
+ <name>arrayDouble</name>
+ <description/>
+ <rangeTypeName>uima.cas.DoubleArray</rangeTypeName>
+ </featureDescription>
+ </features>
</typeDescription>
<typeDescription>
<name>aa.MissingInCas</name>
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,23 +1,31 @@
-/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class EndOfSentence extends TokenType {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "x.y.z.EndOfSentence";
+
/** @generated
* @ordered
*/
@@ -39,6 +47,8 @@ public class EndOfSentence extends Token
* Feature Offsets *
* *******************/
+
+
/* Feature Adjusted Offsets */
@@ -64,6 +74,7 @@ public class EndOfSentence extends Token
readObject();
}
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,23 +1,32 @@
-/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.tcas.Annotation;
/**
- * 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Sentence extends Annotation {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "x.y.z.Sentence";
+
/** @generated
* @ordered
*/
@@ -39,6 +48,9 @@ public class Sentence extends Annotation
* Feature Offsets *
* *******************/
+ public final static String _FeatName_sentenceLength = "sentenceLength";
+
+
/* Feature Adjusted Offsets */
public final static int _FI_sentenceLength = TypeSystemImpl.getAdjustedFeatureOffset("sentenceLength");
@@ -65,6 +77,19 @@ public class Sentence extends Annotation
readObject();
}
+
+ /** @generated
+ * @param jcas JCas to which this Feature Structure belongs
+ * @param begin offset to the begin spot in the SofA
+ * @param end offset to the end spot in the SofA
+ */
+ public Sentence(JCas jcas, int begin, int end) {
+ super(jcas);
+ setBegin(begin);
+ setEnd(end);
+ readObject();
+ }
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,23 +1,31 @@
-/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Separator extends TokenType {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "x.y.z.Separator";
+
/** @generated
* @ordered
*/
@@ -39,6 +47,8 @@ public class Separator extends TokenType
* Feature Offsets *
* *******************/
+
+
/* Feature Adjusted Offsets */
@@ -64,6 +74,7 @@ public class Separator extends TokenType
readObject();
}
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,24 +1,33 @@
-/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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.JCas;
import org.apache.uima.jcas.JCasRegistry;
+
+
import org.apache.uima.jcas.cas.StringArray;
import org.apache.uima.jcas.tcas.Annotation;
/**
- * 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Token extends Annotation {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "x.y.z.Token";
+
/** @generated
* @ordered
*/
@@ -40,6 +49,12 @@ public class Token extends Annotation {
* Feature Offsets *
* *******************/
+ public final static String _FeatName_ttype = "ttype";
+ public final static String _FeatName_tokenFloatFeat = "tokenFloatFeat";
+ public final static String _FeatName_lemma = "lemma";
+ public final static String _FeatName_lemmaList = "lemmaList";
+
+
/* Feature Adjusted Offsets */
public final static int _FI_ttype = TypeSystemImpl.getAdjustedFeatureOffset("ttype");
public final static int _FI_tokenFloatFeat = TypeSystemImpl.getAdjustedFeatureOffset("tokenFloatFeat");
@@ -69,6 +84,19 @@ public class Token extends Annotation {
readObject();
}
+
+ /** @generated
+ * @param jcas JCas to which this Feature Structure belongs
+ * @param begin offset to the begin spot in the SofA
+ * @param end offset to the end spot in the SofA
+ */
+ public Token(JCas jcas, int begin, int end) {
+ super(jcas);
+ setBegin(begin);
+ setEnd(end);
+ readObject();
+ }
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,22 +1,32 @@
-/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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;
+
+
import org.apache.uima.jcas.cas.TOP;
/**
- * 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class TokenType extends TOP {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "x.y.z.TokenType";
+
/** @generated
* @ordered
*/
@@ -38,6 +48,8 @@ public class TokenType extends TOP {
* Feature Offsets *
* *******************/
+
+
/* Feature Adjusted Offsets */
@@ -63,6 +75,7 @@ public class TokenType extends TOP {
readObject();
}
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here
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=1774630&r1=1774629&r2=1774630&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 Fri Dec 16 15:58:13 2016
@@ -1,23 +1,31 @@
-/* Apache UIMA v3 - First created by JCasGen Mon Mar 07 09:21:36 EST 2016 */
+/* Apache UIMA v3 - First created by JCasGen Fri Dec 16 10:23:12 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 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
+ * Updated by JCasGen Fri Dec 16 10:23:12 EST 2016
+ * XML source: C:/au/svnCheckouts/branches/uimaj/v3-alpha/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Word extends TokenType {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "x.y.z.Word";
+
/** @generated
* @ordered
*/
@@ -39,6 +47,8 @@ public class Word extends TokenType {
* Feature Offsets *
* *******************/
+
+
/* Feature Adjusted Offsets */
@@ -64,6 +74,7 @@ public class Word extends TokenType {
readObject();
}
+
/**
* <!-- begin-user-doc -->
* Write your own initialization here