svn commit: r1476392 - /uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java

[re...@apache.org]

Author: rec
Date: Fri Apr 26 20:27:37 2013
New Revision: 1476392

URL: http://svn.apache.org/r1476392
Log:
[UIMA-2784] Inner classes in FSCollectionFactory should not inherit from that class 

Modified:
    uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java

Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java?rev=1476392&r1=1476391&r2=1476392&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/FSCollectionFactory.java Fri Apr 26 20:27:37 2013
@@ -73,11 +73,14 @@ import org.apache.uima.jcas.cas.TOP;
  * Bridge between Java {@link Collection Collections} from different representations of collections
  * of UIMA {@link FeatureStructure FeatureStructures}.
  * 
- * 
  * @param <T>
  *          data type.
  */
-public abstract class FSCollectionFactory<T extends FeatureStructure> extends AbstractCollection<T> {
+public abstract class FSCollectionFactory<T extends FeatureStructure> {
+
+  private FSCollectionFactory() {
+    // No instances.
+  }
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public static Collection<FeatureStructure> create(CAS cas, Type type) {
@@ -570,7 +573,7 @@ public abstract class FSCollectionFactor
     return list;
   }
 
-  private static class FSIteratorAdapter<T extends FeatureStructure> extends FSCollectionFactory<T> {
+  private static class FSIteratorAdapter<T extends FeatureStructure> extends AbstractCollection<T> {
     private int sizeCache = -1;
 
     private final FSIterator<T> index;
@@ -608,8 +611,7 @@ public abstract class FSCollectionFactor
     }
   }
 
-  private static class AnnotationIndexAdapter<T extends AnnotationFS> extends
-          FSCollectionFactory<T> {
+  private static class AnnotationIndexAdapter<T extends AnnotationFS> extends AbstractCollection<T> {
     private final AnnotationIndex<T> index;
 
     public AnnotationIndexAdapter(AnnotationIndex<T> aIndex) {