svn commit: r1477269 - /ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/algorithms/DirectPassThroughImpl.java

[tm...@apache.org]

Author: tmill
Date: Mon Apr 29 19:00:24 2013
New Revision: 1477269

URL: http://svn.apache.org/r1477269
Log:
ctakes-159: modified DirectPassThroughImpl to use generics, removed all warnings.

Modified:
    ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/algorithms/DirectPassThroughImpl.java

Modified: ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/algorithms/DirectPassThroughImpl.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/algorithms/DirectPassThroughImpl.java?rev=1477269&r1=1477268&r2=1477269&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/algorithms/DirectPassThroughImpl.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/algorithms/DirectPassThroughImpl.java Mon Apr 29 19:00:24 2013
@@ -61,23 +61,23 @@ public class DirectPassThroughImpl imple
     public Collection<LookupHit> lookup(final List<LookupToken> lookupTokenList,
                                         final Map<String,List<LookupAnnotation>> contextMap) throws Exception
     {
-        List lhList = new ArrayList();
+        List<LookupHit> lhList = new ArrayList<LookupHit>();
         for (int tokenIdx = 0; tokenIdx < lookupTokenList.size(); tokenIdx++)
         {
-            LookupToken lt = (LookupToken) lookupTokenList.get(tokenIdx);
+            LookupToken lt = lookupTokenList.get(tokenIdx);
 
-            List singleLtList = new ArrayList();
+            List<LookupToken> singleLtList = new ArrayList<LookupToken>();
             singleLtList.add(lt);
 
             String[] strArr = iv_phrBuilder.getPhrases(singleLtList);
-            Collection mdhCol = getHits(strArr);
+            Collection<MetaDataHit> mdhCol = getHits(strArr);
 
             if ((mdhCol != null) && (mdhCol.size() > 0))
             {
-                Iterator mdhMatchItr = mdhCol.iterator();
+                Iterator<MetaDataHit> mdhMatchItr = mdhCol.iterator();
                 while (mdhMatchItr.hasNext())
                 {
-                    MetaDataHit mdh = (MetaDataHit) mdhMatchItr.next();
+                    MetaDataHit mdh = mdhMatchItr.next();
                     LookupHit lh = new LookupHit(mdh, lt.getStartOffset(), lt
                             .getEndOffset());
                     lhList.add(lh);
@@ -87,12 +87,12 @@ public class DirectPassThroughImpl imple
         return lhList;
     }
 
-    private Collection getHits(String[] phrases) throws Exception
+    private Collection<MetaDataHit> getHits(String[] phrases) throws Exception
     {
-        Collection mdhCol = new ArrayList();
+        Collection<MetaDataHit> mdhCol = new ArrayList<MetaDataHit>();
         for (int i = 0; i < phrases.length; i++)
         {
-            Collection curMdhCol = iv_dictEngine.metaLookup(phrases[i]);
+            Collection<MetaDataHit> curMdhCol = iv_dictEngine.metaLookup(phrases[i]);
             if (curMdhCol.size() > 0)
             {
                 mdhCol.addAll(curMdhCol);