Author: schor Date: Wed Nov 1 17:39:56 2017 New Revision: 1813979 URL: http://svn.apache.org/viewvc?rev=1813979&view=rev Log: no Jira correct javadocs
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/SelectViaCopyToArray.java Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java?rev=1813979&r1=1813978&r2=1813979&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java Wed Nov 1 17:39:56 2017 @@ -1227,6 +1227,7 @@ public interface CAS extends AbstractCas }; /** + * @param <T> the type of the elements of the FSList * @return a lazily created shared (for this CAS) empty list */ default <T extends TOP> EmptyFSList<T> emptyFSList() { @@ -1248,7 +1249,7 @@ public interface CAS extends AbstractCas }; /** - * @param <T> the class of the elements of the array + * @param <T> the type of the elements of the array * @param clazz the class of the elements of the array * @return a lazily created shared (for this CAS) 0-length array */ @@ -1264,6 +1265,7 @@ public interface CAS extends AbstractCas }; /** + * @oaram <T> the type of the lements of the FSArray * @return a lazily created shared (for this CAS) 0-length array */ default <T extends FeatureStructure> FSArray<T> emptyFSArray() { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java?rev=1813979&r1=1813978&r2=1813979&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java Wed Nov 1 17:39:56 2017 @@ -214,8 +214,7 @@ public interface FSIndex<T extends Featu FSIndex<T> withSnapshotIterators(); /** - * @param <N> the Type of the elements being accessed - * @return a newly created selection object for accessing feature structures + * @return a newly created selection object for accessing feature structures */ SelectFSs<T> select(); @@ -248,7 +247,6 @@ public interface FSIndex<T extends Featu <N extends T> SelectFSs<N> select(String fullyQualifiedTypeName); /** - * @param <T> the Type of the elements being accessed * @return a Stream over all the elements in the index (including subtypes) */ default Stream<T> stream() { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java?rev=1813979&r1=1813978&r2=1813979&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java Wed Nov 1 17:39:56 2017 @@ -992,6 +992,7 @@ public interface JCas extends AbstractCa }; /** + * @param <T> the type of the FeatureStructures in the FSList * @return a lazily created shared (for this CAS) empty list */ default <T extends TOP> EmptyFSList<T> emptyFSList() { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java?rev=1813979&r1=1813978&r2=1813979&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java Wed Nov 1 17:39:56 2017 @@ -674,6 +674,7 @@ public class FSArrayList <T extends TOP> * @param srcPos - * @param destPos - * @param length - + * @param <E> the type of the source array being copied from * @see org.apache.uima.cas.ArrayFS#copyFromArray(FeatureStructure[], int, int, int) */ public <E extends FeatureStructure> void copyFromArray(E[] src, int srcPos, int destPos, int length) { @@ -697,9 +698,10 @@ public class FSArrayList <T extends TOP> * @param dest - * @param destPos - * @param length - + * @param <E> the type of the elements of the Array being copied into * @see org.apache.uima.cas.ArrayFS#copyToArray(int, FeatureStructure[], int, int) */ - public void copyToArray(int srcPos, FeatureStructure[] dest, int destPos, int length) { + public <E extends FeatureStructure> void copyToArray(int srcPos, E[] dest, int destPos, int length) { int srcEnd = srcPos + length; int destEnd = destPos + length; if (srcPos < 0 || @@ -709,7 +711,7 @@ public class FSArrayList <T extends TOP> String.format("FSArrayList.copyToArray, srcPos: %,d destPos: %,d length: %,d", srcPos, destPos, length)); } for (;srcPos < srcEnd && destPos < destEnd;) { - dest[destPos++] = get(srcPos++); + dest[destPos++] = (E) get(srcPos++); } } Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java?rev=1813979&r1=1813978&r2=1813979&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSList.java Wed Nov 1 17:39:56 2017 @@ -135,6 +135,7 @@ public abstract class FSList<T extends T * @param jcas the JCas to use * @param a the array of Feature Structures to populate the list with * @param <U> the type of FeatureStructures being stored in the FSList being created + * @param <E> the type of the array argument * @return an FSList, with the elements from the array */ public static <U extends TOP, E extends FeatureStructure> FSList<U> create(JCas jcas, E[] a) { Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/SelectViaCopyToArray.java URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/SelectViaCopyToArray.java?rev=1813979&r1=1813978&r2=1813979&view=diff ============================================================================== --- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/SelectViaCopyToArray.java (original) +++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/SelectViaCopyToArray.java Wed Nov 1 17:39:56 2017 @@ -42,7 +42,6 @@ public interface SelectViaCopyToArray<T CASImpl _getView(); /** - * @param <T> generic type being selected * @return a new instance of SelectFSs */ default SelectFSs_impl<T> select() {