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 2009/10/01 02:11:24 UTC

svn commit: r820501 - in /incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src: main/java/org/apache/uima/tools/cfe/ main/java/org/apache/uima/tools/cfe/config/util/ main/java/org/apache/uima/tools/cfe/support/ test/java/org/apache/uima/tools/...

Author: schor
Date: Thu Oct  1 00:11:23 2009
New Revision: 820501

URL: http://svn.apache.org/viewvc?rev=820501&view=rev
Log:
UIMA-1065 Minor code updates - switch to non-deprecated methods, etc.  Applied patch CFE-patch-20090930.txt

Modified:
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfigFromXML_XMLBeans.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CommonFeatureMatcher.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/ObjectPathFeatureValues.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/RRMFeatureAnnotator.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/util/ConfigResourceUtil.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/FeatureConstrainedIterator.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/UIMAAnnotationUtils.java
    incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/test/java/org/apache/uima/tools/cfe/test/CFEtest.java

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfigFromXML_XMLBeans.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfigFromXML_XMLBeans.java?rev=820501&r1=820500&r2=820501&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfigFromXML_XMLBeans.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CFEConfigFromXML_XMLBeans.java Thu Oct  1 00:11:23 2009
@@ -27,6 +27,7 @@
 import java.util.List;
 
 import org.apache.uima.tools.cfe.config.xmlBeans.BitsetFeatureValuesXML;
+import org.apache.uima.tools.cfe.config.xmlBeans.CFEConfigDocument;
 import org.apache.uima.tools.cfe.config.xmlBeans.CFEDescriptorXML;
 import org.apache.uima.tools.cfe.config.xmlBeans.EnumFeatureValuesXML;
 import org.apache.uima.tools.cfe.config.xmlBeans.FeatureObjectMatcherXML;
@@ -45,7 +46,8 @@
     
     public CFEConfigFromXML_XMLBeans (String path) throws XmlException, IOException
     {
-        m_CFEDescriptor = CFEDescriptorXML.Factory.parse(new File(path));
+        CFEConfigDocument doc = CFEConfigDocument.Factory.parse(new File(path));
+        m_CFEDescriptor = doc.getCFEConfig();
     }
     
     EnumFeatureValues getEnumFeatureValues(EnumFeatureValuesXML efvs_xml)

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CommonFeatureMatcher.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CommonFeatureMatcher.java?rev=820501&r1=820500&r2=820501&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CommonFeatureMatcher.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/CommonFeatureMatcher.java Thu Oct  1 00:11:23 2009
@@ -367,7 +367,7 @@
            InvocationTargetException
     {
         Class<? extends Annotation> ann_cls = UIMAAnnotationUtils.getAnnotationClass(fom.getMatcherClass()); 
-        FSIterator ann_it = FeatureConstrainedIterator.getEnclosedIterator(
+        FSIterator<? extends Annotation> ann_it = FeatureConstrainedIterator.getEnclosedIterator(
                 jcas, ann_cls, begin_lower, begin_upper, end_lower, end_upper);
         if (!advance_right) {
             ann_it.moveToLast();

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/ObjectPathFeatureValues.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/ObjectPathFeatureValues.java?rev=820501&r1=820500&r2=820501&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/ObjectPathFeatureValues.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/ObjectPathFeatureValues.java Thu Oct  1 00:11:23 2009
@@ -58,7 +58,7 @@
         TargetObjectMatcher tom = new TargetObjectMatcher(m_object_type_name, m_object_path, false);
 
         Class<? extends Annotation> cls_ann = UIMAAnnotationUtils.getAnnotationClass(tom.getRootClass());
-        for (FSIterator root_ann_it = FeatureConstrainedIterator.getEnclosedIterator(jcas, cls_ann, enclosing); root_ann_it.hasNext();) {
+        for (FSIterator<? extends Annotation> root_ann_it = FeatureConstrainedIterator.getEnclosedIterator(jcas, cls_ann, enclosing); root_ann_it.hasNext();) {
             List<MatchedValue> mfvs = tom.getFeatureValues(new AnnotationMatchedValue((Annotation)root_ann_it.next(), new ArrayList<Object>()));
             // exclude prioritized models (previously specified in config file)
             if (null != previosly_matched_objects) {

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/RRMFeatureAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/RRMFeatureAnnotator.java?rev=820501&r1=820500&r2=820501&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/RRMFeatureAnnotator.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/RRMFeatureAnnotator.java Thu Oct  1 00:11:23 2009
@@ -20,24 +20,22 @@
 package org.apache.uima.tools.cfe;
 
 
-import org.apache.uima.analysis_engine.ResultSpecification;
-import org.apache.uima.analysis_engine.annotator.AnnotatorConfigurationException;
-import org.apache.uima.analysis_engine.annotator.AnnotatorContext;
-import org.apache.uima.analysis_engine.annotator.AnnotatorInitializationException;
-import org.apache.uima.analysis_engine.annotator.AnnotatorProcessException;
-import org.apache.uima.analysis_engine.annotator.JTextAnnotator_ImplBase;
+import org.apache.uima.UimaContext;
+import org.apache.uima.analysis_component.JCasAnnotator_ImplBase;
+import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.jcas.JCas;
+import org.apache.uima.resource.ResourceInitializationException;
 
 
 
 
 public class RRMFeatureAnnotator
-    extends JTextAnnotator_ImplBase
+    extends JCasAnnotator_ImplBase
 {
     private CommonFeatureMatcher m_cfaImpl;
     
-    public void initialize (AnnotatorContext ac)
-        throws AnnotatorConfigurationException, AnnotatorInitializationException
+    public void initialize (UimaContext ac)
+    throws ResourceInitializationException
     {
         super.initialize(ac);
         
@@ -54,18 +52,17 @@
         }
         catch (Exception e) {
             // TODO UIMA style exception
-            throw new AnnotatorConfigurationException(e);
+            throw new ResourceInitializationException(e);
         }
     }
 
-    public void process (JCas jcas, ResultSpecification arg1)
-    throws AnnotatorProcessException
-    {
+    @Override
+    public void process(JCas jcas) throws AnalysisEngineProcessException {
         try {
             m_cfaImpl.processJCas(jcas);
         }
         catch (Exception e) {
-            throw new AnnotatorProcessException(e);
+            throw new AnalysisEngineProcessException(e);
         }
     }
 }

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/util/ConfigResourceUtil.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/util/ConfigResourceUtil.java?rev=820501&r1=820500&r2=820501&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/util/ConfigResourceUtil.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/config/util/ConfigResourceUtil.java Thu Oct  1 00:11:23 2009
@@ -76,7 +76,9 @@
   private void initialize()
   {
     Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xml", new ConfigResourceFactoryImpl());
+    @SuppressWarnings("unused")
     ConfigPackage pkg = ConfigPackage.eINSTANCE;   
+    @SuppressWarnings("unused")
     ConfigFactory factory = ConfigFactory.eINSTANCE;
   }
 

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/FeatureConstrainedIterator.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/FeatureConstrainedIterator.java?rev=820501&r1=820500&r2=820501&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/FeatureConstrainedIterator.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/FeatureConstrainedIterator.java Thu Oct  1 00:11:23 2009
@@ -78,10 +78,10 @@
             }
         }
         
-        FSIterator createFilteredIterator (JCas jcas, FSMatchConstraint constraint)
+        FSIterator<? extends Annotation> createFilteredIterator (JCas jcas, FSMatchConstraint constraint)
         {
             JFSIndexRepository idxs = jcas.getJFSIndexRepository ();
-            AnnotationIndex sdi_ind = (AnnotationIndex)idxs.getAnnotationIndex(m_typeId);
+            AnnotationIndex<? extends Annotation> sdi_ind = idxs.getAnnotationIndex(m_typeId);
             return jcas.createFilteredIterator(sdi_ind.iterator(), constraint);
         }
     }
@@ -98,10 +98,10 @@
             super(jcas, UIMAAnnotationUtils.getTypeIndexId(enclosed), null);
         }
         
-        FSIterator createSubiterator (JCas jcas, AnnotationFS enclosing)
+        FSIterator<? extends Annotation> createSubiterator (JCas jcas, AnnotationFS enclosing)
         {
             JFSIndexRepository idxs = jcas.getJFSIndexRepository ();
-            AnnotationIndex sdi_ind = (AnnotationIndex)idxs.getAnnotationIndex(m_typeId);
+            AnnotationIndex<? extends Annotation> sdi_ind = idxs.getAnnotationIndex(m_typeId);
             return sdi_ind.subiterator(enclosing);
         }
     }
@@ -211,10 +211,10 @@
     }
     
     
-    static public FSIterator getEnclosedIterator(JCas                           jcas,
-                                                 Class<? extends Annotation>    enclosed,
-                                                 int                            begin,
-                                                 int                            end)
+    static public FSIterator<? extends Annotation> getEnclosedIterator(JCas                           jcas,
+                                                                       Class<? extends Annotation>    enclosed,
+                                                                       int                            begin,
+                                                                       int                            end)
         throws IllegalArgumentException,
                SecurityException,
                ClassNotFoundException,
@@ -224,10 +224,10 @@
         return getEnclosedIterator(jcas, enclosed, begin, begin, end, end);
     }
 
-    static public FSIterator getEnclosedIterator(JCas   jcas,
-                                                 int[]  typeIds,
-                                                 int    begin,
-                                                 int    end)
+    static public FSIterator<? extends Annotation> getEnclosedIterator(JCas   jcas,
+                                                                       int[]  typeIds,
+                                                                       int    begin,
+                                                                       int    end)
         throws IllegalArgumentException,
                SecurityException,
                ClassNotFoundException,
@@ -237,12 +237,12 @@
         return getEnclosedIterator(jcas, typeIds, begin, begin, end, end);
     }
 
-    static public FSIterator getEnclosedIterator(JCas                           jcas,
-                                                 Class<? extends Annotation>    enclosed,
-                                                 int                            begin_lower,
-                                                 int                            begin_upper,
-                                                 int                            end_lower,
-                                                 int                            end_upper)
+    static public FSIterator<? extends Annotation> getEnclosedIterator(JCas                           jcas,
+                                                                       Class<? extends Annotation>    enclosed,
+                                                                       int                            begin_lower,
+                                                                       int                            begin_upper,
+                                                                       int                            end_lower,
+                                                                       int                            end_upper)
     throws IllegalArgumentException,
            SecurityException,
            ClassNotFoundException,
@@ -255,12 +255,12 @@
     }
     
     
-    static public FSIterator getEnclosedIterator(JCas   jcas,
-                                                 int[]  enclosedTypes,
-                                                 int    begin_lower,
-                                                 int    begin_upper,
-                                                 int    end_lower,
-                                                 int    end_upper)
+    static public FSIterator<? extends Annotation> getEnclosedIterator(JCas   jcas,
+                                                                       int[]  enclosedTypes,
+                                                                       int    begin_lower,
+                                                                       int    begin_upper,
+                                                                       int    end_lower,
+                                                                       int    end_upper)
     throws IllegalArgumentException,
            SecurityException,
            ClassNotFoundException,
@@ -282,9 +282,9 @@
     }
     
     
-    static public FSIterator getEnclosedIterator(JCas                           jcas,
-                                                 Class<? extends Annotation>    enclosed,
-                                                 Annotation                     enclosing)
+    static public FSIterator<? extends Annotation> getEnclosedIterator(JCas                           jcas,
+                                                                       Class<? extends Annotation>    enclosed,
+                                                                       Annotation                     enclosing)
     throws IllegalArgumentException, 
            SecurityException,
            ClassNotFoundException,
@@ -299,9 +299,9 @@
         return scd.createSubiterator(jcas, enclosing);
     }
     
-    static public FSIterator getEnclosedIterator(JCas jcas,
-                                                 String enclosed_name,
-                                                 Annotation enclosing)
+    static public FSIterator<? extends Annotation> getEnclosedIterator(JCas jcas,
+                                                                       String enclosed_name,
+                                                                       Annotation enclosing)
         throws IllegalArgumentException,
                SecurityException,
                ClassNotFoundException,
@@ -311,9 +311,9 @@
         return getEnclosedIterator(jcas, UIMAAnnotationUtils.forName(enclosed_name), enclosing);
     }
     
-    static public FSIterator getEnclosedIterator(JCas jcas,
-                                                 int[] typeIds,
-                                                 Annotation enclosing)
+    static public FSIterator<? extends Annotation> getEnclosedIterator(JCas jcas,
+                                                                       int[] typeIds,
+                                                                       Annotation enclosing)
         throws IllegalArgumentException,
                SecurityException,
                ClassNotFoundException,
@@ -323,10 +323,10 @@
         return getEnclosedIterator(jcas, typeIds, enclosing.getBegin(), enclosing.getEnd());
     }
     
-    static public FSIterator getLeftIterator (JCas                          jcas,
-                                              Class<? extends Annotation>   feat_ann_class,
-                                              Annotation                    enclosing,
-                                              Annotation                    target)
+    static public FSIterator<? extends Annotation> getLeftIterator (JCas                          jcas,
+                                                                    Class<? extends Annotation>   feat_ann_class,
+                                                                    Annotation                    enclosing,
+                                                                    Annotation                    target)
     throws IllegalArgumentException,
            SecurityException,
            ClassNotFoundException,
@@ -336,15 +336,15 @@
         int begin = enclosing.getBegin();
         int end = target.getBegin();
         
-        FSIterator it = FeatureConstrainedIterator.getEnclosedIterator(jcas, feat_ann_class, begin, end);
+        FSIterator<? extends Annotation> it = FeatureConstrainedIterator.getEnclosedIterator(jcas, feat_ann_class, begin, end);
         it.moveToLast();
         return it;
     }
     
-    static public FSIterator getLeftIterator (JCas          jcas,
-                                              int[]         typeIds,
-                                              Annotation    enclosing,
-                                              Annotation    target)
+    static public FSIterator<? extends Annotation> getLeftIterator (JCas          jcas,
+                                                                    int[]         typeIds,
+                                                                    Annotation    enclosing,
+                                                                    Annotation    target)
     throws IllegalArgumentException,
            SecurityException,
            ClassNotFoundException,
@@ -354,15 +354,15 @@
         int begin = enclosing.getBegin();
         int end = target.getBegin();
         
-        FSIterator it = FeatureConstrainedIterator.getEnclosedIterator(jcas, typeIds, begin, end);
+        FSIterator<? extends Annotation> it = FeatureConstrainedIterator.getEnclosedIterator(jcas, typeIds, begin, end);
         it.moveToLast();
         return it;
     }
     
-    static public FSIterator getRightIterator (JCas                         jcas,
-                                               Class<? extends Annotation>  feat_ann_class,
-                                               Annotation                   enclosing,
-                                               Annotation                   target)
+    static public FSIterator<? extends Annotation> getRightIterator (JCas                         jcas,
+                                                                     Class<? extends Annotation>  feat_ann_class,
+                                                                     Annotation                   enclosing,
+                                                                     Annotation                   target)
     throws IllegalArgumentException,
            SecurityException,
            ClassNotFoundException,
@@ -375,14 +375,14 @@
         return FeatureConstrainedIterator.getEnclosedIterator(jcas, feat_ann_class, begin, end);
     }
     
-    static public FSIterator getEnclosedIterator(JCas                           jcas,
-                                                 Class<? extends Annotation>    enclosed,
-                                                 int                            begin_lower,
-                                                 int                            begin_upper,
-                                                 int                            end_lower,
-                                                 int                            end_upper,
-                                                 String                         feat_name,
-                                                 Object[]                       values)
+    static public FSIterator<? extends Annotation> getEnclosedIterator(JCas                           jcas,
+                                                                       Class<? extends Annotation>    enclosed,
+                                                                       int                            begin_lower,
+                                                                       int                            begin_upper,
+                                                                       int                            end_lower,
+                                                                       int                            end_upper,
+                                                                       String                         feat_name,
+                                                                       Object[]                       values)
         throws IllegalArgumentException,
                SecurityException,
                ClassNotFoundException,
@@ -400,12 +400,12 @@
     }
 
     
-    static public FSIterator getEnclosedIterator(JCas                           jcas,
-                                                 Class<? extends Annotation>    enclosed,
-                                                 int                            begin,
-                                                 int                            end,
-                                                 String                         feat_name,
-                                                 Object[]                       values)
+    static public FSIterator<? extends Annotation> getEnclosedIterator(JCas                           jcas,
+                                                                       Class<? extends Annotation>    enclosed,
+                                                                       int                            begin,
+                                                                       int                            end,
+                                                                       String                         feat_name,
+                                                                       Object[]                       values)
         throws IllegalArgumentException,
                SecurityException,
                ClassNotFoundException,
@@ -415,11 +415,11 @@
         return getEnclosedIterator(jcas, enclosed, begin, begin, end, end, feat_name,values);
     }
 
-    static public FSIterator getEnclosedIterator(JCas                           jcas,
-                                                 Class<? extends Annotation>    enclosed,
-                                                 Annotation                     enclosing,
-                                                 String                         feat_name,
-                                                 Object[]                       values)
+    static public FSIterator<? extends Annotation> getEnclosedIterator(JCas                           jcas,
+                                                                       Class<? extends Annotation>    enclosed,
+                                                                       Annotation                     enclosing,
+                                                                       String                         feat_name,
+                                                                       Object[]                       values)
         throws IllegalArgumentException,
                SecurityException,
                ClassNotFoundException,
@@ -464,9 +464,9 @@
         return null;
     }
     
-    static public FSIterator getSameOffsetIterator (JCas                        jcas,
-                                                    Class<? extends Annotation> enclosed_class,
-                                                    Annotation                  enclosing)
+    static public FSIterator<? extends Annotation> getSameOffsetIterator (JCas                        jcas,
+                                                                          Class<? extends Annotation> enclosed_class,
+                                                                          Annotation                  enclosing)
     throws IllegalArgumentException,
            SecurityException,
            ClassNotFoundException,
@@ -478,11 +478,11 @@
                                    enclosing.getEnd() - 1, enclosing.getEnd()); 
     }
     
-    static public FSIterator getSameOffsetIterator (JCas                        jcas,
-                                                    Class<? extends Annotation> enclosed_class,
-                                                    Annotation                  enclosing,
-                                                    String                      feat_name,
-                                                    Object[]                    values)
+    static public FSIterator<? extends Annotation> getSameOffsetIterator (JCas                        jcas,
+                                                                          Class<? extends Annotation> enclosed_class,
+                                                                          Annotation                  enclosing,
+                                                                          String                      feat_name,
+                                                                          Object[]                    values)
     throws IllegalArgumentException, SecurityException, ClassNotFoundException, IllegalAccessException, NoSuchFieldException
     {
         return getEnclosedIterator(jcas, enclosed_class,

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/UIMAAnnotationUtils.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/UIMAAnnotationUtils.java?rev=820501&r1=820500&r2=820501&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/UIMAAnnotationUtils.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/main/java/org/apache/uima/tools/cfe/support/UIMAAnnotationUtils.java Thu Oct  1 00:11:23 2009
@@ -178,13 +178,13 @@
     }
 
     
-    static public FSIterator fsIterator (JCas jcas, Class<? extends Annotation> cls_ann)
+    static public FSIterator<? extends Annotation> fsIterator (JCas jcas, Class<? extends Annotation> cls_ann)
     throws IllegalArgumentException,
            SecurityException,
            IllegalAccessException,
            NoSuchFieldException
     {
-        AnnotationIndex ind = jcas.getJFSIndexRepository().getAnnotationIndex(UIMAAnnotationUtils.getTypeIndexId(cls_ann));
+        AnnotationIndex<? extends Annotation> ind = jcas.getJFSIndexRepository().getAnnotationIndex(UIMAAnnotationUtils.getTypeIndexId(cls_ann));
         
         return ind.iterator();
     }

Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/test/java/org/apache/uima/tools/cfe/test/CFEtest.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/test/java/org/apache/uima/tools/cfe/test/CFEtest.java?rev=820501&r1=820500&r2=820501&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/test/java/org/apache/uima/tools/cfe/test/CFEtest.java (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/src/test/java/org/apache/uima/tools/cfe/test/CFEtest.java Thu Oct  1 00:11:23 2009
@@ -20,36 +20,19 @@
 package org.apache.uima.tools.cfe.test;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineDescription;
-import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
-import org.apache.uima.analysis_engine.metadata.FixedFlow;
-import org.apache.uima.analysis_engine.metadata.SofaMapping;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.examples.SourceDocumentInformation;
-import org.apache.uima.pear.tools.PackageBrowser;
-import org.apache.uima.pear.tools.PackageInstaller;
 import org.apache.uima.pear.util.FileUtil;
-import org.apache.uima.resource.ResourceSpecifier;
-import org.apache.uima.resource.metadata.Capability;
-import org.apache.uima.resource.metadata.ConfigurationParameter;
-import org.apache.uima.resource.metadata.Import;
-import org.apache.uima.resource.metadata.MetaDataObject;
 import org.apache.uima.test.junit_extension.FileCompare;
 import org.apache.uima.test.junit_extension.JUnitExtension;
 import org.apache.uima.util.FileUtils;
 import org.apache.uima.util.XMLInputSource;
-import org.apache.uima.util.XMLParser;
 
 /**
  * The CFE tests installs a pear file