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 2015/07/08 21:34:02 UTC

svn commit: r1689945 - in /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: cas/ cas/impl/ cas/text/ internal/util/rb_trees/ jcas/ jcas/impl/ resource/impl/

Author: schor
Date: Wed Jul  8 19:34:02 2015
New Revision: 1689945

URL: http://svn.apache.org/r1689945
Log:
no jira, only javadoc changes to eliminate java 8 javadoc errors

Modified:
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBagIndex.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorWrapperDoubleCheck.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSLeafIndexImpl.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTSetIndex.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelCAS.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationIndex.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
    uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java Wed Jul  8 19:34:02 2015
@@ -472,6 +472,7 @@ public interface CAS extends AbstractCas
    * 
    * @param type
    *          The type of the FS.
+   * @param <T> the Java cover class for the FS being created
    * @return The new FS.
    */
   <T extends FeatureStructure> T createFS(Type type) throws CASRuntimeException;
@@ -704,7 +705,7 @@ public interface CAS extends AbstractCas
   /**
    * Get the standard annotation index.
    * 
-   * Generics: The object can be either Annotation (if JCas is in use) or AnnotationImpl 
+   * @param <T> either Annotation (if JCas is in use) or AnnotationImpl 
    * 
    * @return The standard annotation index.
    */
@@ -715,6 +716,7 @@ public interface CAS extends AbstractCas
    * 
    * @param type
    *          The annotation type the index is restricted to.
+   * @param <T> the topmost Java class corresponding to the type
    * @return The standard annotation index, restricted to <code>type</code>.
    * @exception CASRuntimeException When <code>type</code> is not an annotation type.
    */
@@ -730,6 +732,7 @@ public interface CAS extends AbstractCas
    *          The start of the annotation.
    * @param end
    *          The end of the annotation.
+   * @param <T> the Java class corresponding to the type
    * @return A new annotation object.
    */
   <T extends AnnotationFS> AnnotationFS createAnnotation(Type type, int begin, int end);
@@ -738,6 +741,7 @@ public interface CAS extends AbstractCas
    * Get the document annotation. The document has a string-valued feature called "language" where
    * the document language is specified.
    * 
+   * @param <T> the Java class for the document annotation.  Could be the JCas cover class or FeatureStructure
    * @return The document annotation, or <code>null</code> if there is none.  The return value is the
    *         JCas cover class or the plain Java cover class for FeatureStructures if JCas is not in use.
    */

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndex.java Wed Jul  8 19:34:02 2015
@@ -58,6 +58,12 @@ package org.apache.uima.cas;
  * Only use a bag index if you want very fast adding and will have to iterate
  * over the whole index anyway.
  * 
+ * <p>
+ * Indexes have a top-most type, either the top of the type hierarchy, or some subtype of that.
+ * The top-most type in an index is represented by the generic T.
+ * 
+ * @param T the topmost type in this Index
+ * 
  */
 public interface FSIndex<T extends FeatureStructure> extends Iterable<T> {
 

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java Wed Jul  8 19:34:02 2015
@@ -40,6 +40,7 @@ public interface FSIndexRepository {
    * 
    * @param label
    *          The name of the index.
+   * @param <T> the Java class associated with the top-most type of the index
    * @return The index with the name <code>label</code>, or <code>null</code> if no such index
    *         is defined.
    */
@@ -55,6 +56,7 @@ public interface FSIndexRepository {
    *          The name of the index.
    * @param type
    *          A subtype of the type of the index.
+   * @param <T> The Java class associated with the type
    * @return The specified, or <code>null</code> if an index with that name doesn't exist.
    * @exception CASRuntimeException When <code>type</code> is not a subtype of the index's type.
    */
@@ -130,7 +132,7 @@ public interface FSIndexRepository {
    * Generics: T is the Java class for aType.
    * @param aType
    *          The type
-   * 
+   * @param <T> The Java class associated with aType
    * @return An iterator that returns all indexed FeatureStructures of type <code>aType</code>
    *         and its subtypes, in no particular order.
    */

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Wed Jul  8 19:34:02 2015
@@ -384,7 +384,7 @@ public class CASImpl extends AbstractCas
    * to bypass any index corruption checking, e.g., CasCopier
    * 
    * Internal use only
-   * @param fsAddr
+   * @param fsAddr the address of the feature structure
    */
   public void setCacheNotInIndex(int fsAddr) {
     svd.cache_not_in_index = fsAddr;
@@ -1985,6 +1985,7 @@ public class CASImpl extends AbstractCas
    * 
    * @param addr
    *                The address of the feature structure to be created.
+   * @param <T> The Java class associated with this feature structure
    * @return A FeatureStructure object. Note that no checking whatsoever is done
    *         on the input address. There is really no way of finding out which
    *         addresses in the valid address space actually represent feature
@@ -4528,8 +4529,10 @@ public class CASImpl extends AbstractCas
   }
   
   /**
-   * The <T extends AnnotationFS> (rather than AnnotationFS) allows the method
+   * The generic spec T extends AnnotationFS (rather than AnnotationFS) allows the method
    * JCasImpl getAnnotationIndex to return Annotation instead of AnnotationFS
+   * @param <T> the Java class associated with the annotation index
+   * @return the annotation index
    */
   public <T extends AnnotationFS> AnnotationIndex<T> getAnnotationIndex() {
     return new AnnotationIndexImpl<T>(
@@ -4537,6 +4540,9 @@ public class CASImpl extends AbstractCas
              CAS.STD_ANNOTATION_INDEX));
   }
 
+  /**
+   * @see org.apache.uima.cas.CAS#getAnnotationIndex(Type)
+   */
   public <T extends AnnotationFS> AnnotationIndex<T> getAnnotationIndex(Type type) {
     return new AnnotationIndexImpl<T>(
              getIndexRepository().<T>getIndex(

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBagIndex.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBagIndex.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBagIndex.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSBagIndex.java Wed Jul  8 19:34:02 2015
@@ -110,7 +110,7 @@ public class FSBagIndex<T extends Featur
    * This only works if not use Positive Int Set
    * because that's the only time there are multiple instances of the same
    * (meaning having the same heap address) item
-   * @param ele
+   * @param ele the featuresturcture to match
    * @return -1 if the item is not found, or a position value that can be used with iterators to start at that item.
    */
   int findLeftmost(int ele) {
@@ -195,6 +195,9 @@ public class FSBagIndex<T extends Featur
 
   /**
    * @see org.apache.uima.cas.FSIndex#contains(FeatureStructure)
+   * @param fs A Feature Structure used a template to match for equality with the
+   *           FSs in the index.
+   * @return <code>true</code> if the index contains such an element.
    */
   public boolean contains(FeatureStructure fs) {
     return ll_contains(((FeatureStructureImpl) fs).getAddress());

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntArrayIndex.java Wed Jul  8 19:34:02 2015
@@ -339,6 +339,8 @@ public class FSIntArrayIndex<T extends F
 
   /**
    * @see org.apache.uima.cas.FSIndex#contains(FeatureStructure)
+   * @param fs the feature structure
+   * @return true if the fs is contained
    */
   public boolean contains(FeatureStructure fs) {
     return (find(((FeatureStructureImpl) fs).getAddress()) >= 0);

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorWrapperDoubleCheck.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorWrapperDoubleCheck.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorWrapperDoubleCheck.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIteratorWrapperDoubleCheck.java Wed Jul  8 19:34:02 2015
@@ -30,7 +30,7 @@ import org.apache.uima.cas.text.Annotati
  * Only used for debugging
  * Takes two iterators, and compares them; returns the 1st, throws error if unequal
  *
- * @param <T>
+ * @param <T> -
  */
 public class FSIteratorWrapperDoubleCheck<T extends FeatureStructure> extends FSIteratorImplBase<T> {
   

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSLeafIndexImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSLeafIndexImpl.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSLeafIndexImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSLeafIndexImpl.java Wed Jul  8 19:34:02 2015
@@ -252,7 +252,7 @@ public abstract class FSLeafIndexImpl<T
    * Note: may return other than -1 , 0, and 1  (e.g., might return -6)
    * @param fs1 -
    * @param fs2 -
-   * @return 0 if equal, < 0 if fs1 < fs2, > 0 if fs1 > fs2
+   * @return 0 if equal, &lt; 0 if fs1 &lt; fs2, &gt; 0 if fs1 &gt; fs2
    */
   public int ll_compare(int fs1, int fs2) {
     return this.compare(fs1, fs2);
@@ -262,7 +262,7 @@ public abstract class FSLeafIndexImpl<T
    * Note: may return other than -1 , 0, and 1  (e.g., might return -6)
    * @param fs1 -
    * @param fs2 -
-   * @return 0 if equal, < 0 if fs1 < fs2, > 0 if fs1 > fs2
+   * @return 0 if equal, &lt; 0 if fs1 &lt; fs2, &gt; 0 if fs1 &gt; fs2
    */
   public int compare(int fs1, int fs2) {
     final int[] heap = this.lowLevelCAS.getHeap().heap;
@@ -459,6 +459,7 @@ public abstract class FSLeafIndexImpl<T
 
   /**
    * @see org.apache.uima.cas.FSIndex#getType()
+   * @return The type of feature structures in this index.
    */
   public Type getType() {
     return this.type;
@@ -476,7 +477,7 @@ public abstract class FSLeafIndexImpl<T
 
   /**
    * For serialization: get all the items in this index and bulk add to an IntVector
-   * @param v
+   * @param v the set of items to add
    */
   protected abstract void bulkAddTo(IntVector v);
   
@@ -502,6 +503,8 @@ public abstract class FSLeafIndexImpl<T
    * This has no callers, and is probably not used.
    * The iterator it produces is only over one leaf index and
    * doesn't include Concurrent Modification Exception testing
+   * @param fs -
+   * @return -
    */
   public FSIterator<T> iterator(FeatureStructure fs) {
     return new FSIteratorWrapper<T>(refIterator(((FeatureStructureImpl) fs).getAddress()),

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTSetIndex.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTSetIndex.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTSetIndex.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTSetIndex.java Wed Jul  8 19:34:02 2015
@@ -47,7 +47,9 @@ public class FSRBTSetIndex<T extends Fea
   /**
    * Constructor for FSRBTIndex.
    * 
-   * @param cas
+   * @param cas -
+   * @param type -
+   * @param indexType -
    */
   public FSRBTSetIndex(CASImpl cas, Type type, int indexType) {
     super(cas, type, indexType);
@@ -112,6 +114,8 @@ public class FSRBTSetIndex<T extends Fea
 
   /**
    * @see org.apache.uima.cas.FSIndex#contains(FeatureStructure)
+   * @param fs feature structure
+   * @return true if the set contains the feature structure
    */
   public boolean contains(FeatureStructure fs) {
     return ll_contains(((FeatureStructureImpl) fs).getAddress());

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelCAS.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelCAS.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelCAS.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelCAS.java Wed Jul  8 19:34:02 2015
@@ -248,6 +248,7 @@ public interface LowLevelCAS {
    * 
    * @param fsRef
    *          The FS reference.
+   * @param <T> the Java class for the Feature Structure
    * @return A FS object corresponding to the input reference.
    */
   <T extends FeatureStructure> T ll_getFSForRef(int fsRef);

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationIndex.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationIndex.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationIndex.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationIndex.java Wed Jul  8 19:34:02 2015
@@ -26,8 +26,8 @@ import org.apache.uima.cas.FSIterator;
  * An annotation index provides additional iterator functionality that applies only to instances of
  * <code>uima.tcas.Annotation</code> (or its subtypes). You can obtain an AnnotationIndex by calling:
  * <p>
- * <code>AnnotationIndex idx = cas.getAnnotationIndex();</code> or <br/>
- * <code AnnotationIndex<SomeJCasType> idx = jcas.getAnnotationIndex(SomeJCasType.class);  
+ * <code>AnnotationIndex idx = cas.getAnnotationIndex();</code> or <br>
+ * <code>AnnotationIndex&lt;SomeJCasType&gt; idx = jcas.getAnnotationIndex(SomeJCasType.class);</code> 
  * </p>
  * <p>
  * Note that the AnnotationIndex defines the following sort order between two annotations:

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java Wed Jul  8 19:34:02 2015
@@ -111,8 +111,8 @@ public class IntArrayRBTcommon {
   }
   
   /**
-   * @param node
-   * @param value
+   * @param node -
+   * @param value -
    * @return the value
    */
   protected int setParent(int node, int value) {
@@ -421,7 +421,7 @@ public class IntArrayRBTcommon {
    *   If k is less than all the nodes, then the first node is returned
    *   If k is greater than all the nodes, then NIL is returned (invalid signal)
    * @param k the key
-   * @return the index of the node, or NIL if k > all keys
+   * @return the index of the node, or NIL if k &gt; all keys
    */
   public int findInsertionPoint(final int k) {
     return findInsertionPointCmn(k, true);

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java Wed Jul  8 19:34:02 2015
@@ -591,6 +591,7 @@ public interface JCas extends AbstractCa
    * 
    * @param type
    *          The annotation type the index is restricted to.
+   * @param <T> the Java class corresponding to type
    * @return The standard annotation index, restricted to <code>type</code>.
    */
   <T extends Annotation> AnnotationIndex<T> getAnnotationIndex(Type type) throws CASRuntimeException;
@@ -602,6 +603,7 @@ public interface JCas extends AbstractCa
    *          The annotation type the index is restricted to, 
    *          passed as an integer using the form
    *          MyAnnotationType.type
+   * @param <T> the Java class corresponding to type
    * @return The standard annotation index, restricted to <code>type</code>.
    * @throws CASRuntimeException -
    */
@@ -611,6 +613,7 @@ public interface JCas extends AbstractCa
    * Get the standard annotation index restricted to a specific annotation type.
    * 
    * @param clazz The JCas cover class for the annotation type the index is restricted to, 
+   * @param <T> the Java class clazz
    * @return The standard annotation index, restricted to <code>type</code>.
    * @throws CASRuntimeException -
    */
@@ -621,10 +624,9 @@ public interface JCas extends AbstractCa
    * subtypes).  The elements are returned in arbitrary order, and duplicates (if they exist)
    * are not removed.
    *
-   * Generics: T is the JCas Java class
-   * 
    * @param clazz - the JCas Java class specifing which type and subtypes are included
-   * 
+   * @param <T> the Java clazz
+   *  
    * @return An iterator that returns all indexed FeatureStructures of the JCas clazz 
    *         and its subtypes, in no particular order.
    */
@@ -693,6 +695,7 @@ public interface JCas extends AbstractCa
    * 
    * @param label The name of the index.
    * @param clazz The JCas class (mostly likely written as MyJCasClass.class), which must correspond to a subtype of the type of the index.
+   * @param <T> the Java clazz
    * @return The specified, or <code>null</code> if an index with that name doesn't exist.
    * @exception CASRuntimeException When <code>clazz</code> doesn't correspond to a subtype of the index's type.
    */

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java Wed Jul  8 19:34:02 2015
@@ -47,6 +47,7 @@ public interface JFSIndexRepository {
    * 
    * @param label
    *          The name of the index.
+   * @param <T> the Java class corresponding to the top most type defined by this index
    * @return The index with the name <code>label</code>, or <code>null</code> if no such index
    *         is defined.
    */
@@ -60,6 +61,7 @@ public interface JFSIndexRepository {
    *          The name of the index
    * @param type
    *          A subtype of the type of the index, written as Foo.type
+   * @param <T> the Java class corresponding to the type
    * @return The specified index, or <code>null</code> if an index with that name doesn't exist,
    *         or it exists but <code>type</code> is not a subtype of the index's type.
    */
@@ -77,6 +79,7 @@ public interface JFSIndexRepository {
    * 
    * @param type
    *          The annotation type the index is restricted to, written as Foo.type
+   * @param <T> the Java class corresponding to type
    * @return The standard annotation index, restricted to <code>type</code>.
    */
   <T extends Annotation> AnnotationIndex<T> getAnnotationIndex(int type);

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java Wed Jul  8 19:34:02 2015
@@ -1632,7 +1632,7 @@ public class JCasImpl extends AbstractCa
   /**
    * Return the UIMA Type object corresponding to this JCas's JCas cover class
    *   (Note: different JCas's, with different type systems, may share the same cover class impl)
-   * @param clazz
+   * @param clazz a JCas cover class
    * @return the corresponding UIMA Type object
    */
   public Type getCasType(Class<? extends TOP> clazz) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java?rev=1689945&r1=1689944&r2=1689945&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java Wed Jul  8 19:34:02 2015
@@ -301,6 +301,7 @@ public class CasManager_impl implements
    *          The CAS
    * @param requiredInterface
    *          interface to get. Currently must be one of CAS or JCas.
+   * @param <T> the particular interface
    * @return -         
    */
   @SuppressWarnings("unchecked")