You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2015/04/09 21:12:22 UTC

svn commit: r1672462 - in /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas: JFSIndexRepository.java impl/JFSIndexRepositoryImpl.java

Author: rec
Date: Thu Apr  9 19:12:22 2015
New Revision: 1672462

URL: http://svn.apache.org/r1672462
Log:
UIMA-4299 - improve generics for UIMA indexes and iterators
- Fix source incompatibility in cases that previously triggered a compiler warning and with the recent changes turned into an error. This fix makes it compile cleanly.

Modified:
    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/JFSIndexRepositoryImpl.java

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=1672462&r1=1672461&r2=1672462&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 Thu Apr  9 19:12:22 2015
@@ -93,7 +93,7 @@ public interface JFSIndexRepository {
    * Generics: Some may be for things not having JCas cover classes, so the type of FSIndex is ? extends FeatureStructure
    * @return All indexes.
    */
-  Iterator<FSIndex<? extends FeatureStructure>> getIndexes();
+  <T extends FeatureStructure> Iterator<FSIndex<T>> getIndexes();
 
   /**
    * Get the underlying FSIndexRepository associated with this JFSIndexRepository.

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java?rev=1672462&r1=1672461&r2=1672462&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JFSIndexRepositoryImpl.java Thu Apr  9 19:12:22 2015
@@ -98,7 +98,7 @@ public class JFSIndexRepositoryImpl impl
    * @see org.apache.uima.jcas.JFSIndexRepository#getIndexes()
    */
   @Override
-  public Iterator<FSIndex<? extends FeatureStructure>> getIndexes() {
+  public <T extends FeatureStructure> Iterator<FSIndex<T>> getIndexes() {
     return fsIndexRepository.getIndexes();
 
   }