Return-Path: X-Original-To: apmail-ctakes-commits-archive@www.apache.org Delivered-To: apmail-ctakes-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EA3C3F3C8 for ; Mon, 29 Apr 2013 21:48:19 +0000 (UTC) Received: (qmail 18909 invoked by uid 500); 29 Apr 2013 21:48:19 -0000 Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org Received: (qmail 18868 invoked by uid 500); 29 Apr 2013 21:48:19 -0000 Mailing-List: contact commits-help@ctakes.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ctakes.apache.org Delivered-To: mailing list commits@ctakes.apache.org Received: (qmail 18860 invoked by uid 99); 29 Apr 2013 21:48:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Apr 2013 21:48:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Apr 2013 21:48:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5031D2388A67; Mon, 29 Apr 2013 21:47:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1477364 - in /ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup: AbstractBaseDictionary.java BaseDictionaryImpl.java BaseMetaDataHitImpl.java GenericMetaDataHitImpl.java MetaDataHitComparator.java Date: Mon, 29 Apr 2013 21:47:57 -0000 To: commits@ctakes.apache.org From: tmill@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130429214758.5031D2388A67@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tmill Date: Mon Apr 29 21:47:57 2013 New Revision: 1477364 URL: http://svn.apache.org/r1477364 Log: ctakes-159: modified package dictionary.lookup to use generics. (fixed a few other minor things causing warnings). Modified: ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/AbstractBaseDictionary.java ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/BaseDictionaryImpl.java ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/BaseMetaDataHitImpl.java ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/GenericMetaDataHitImpl.java ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/MetaDataHitComparator.java Modified: ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/AbstractBaseDictionary.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/AbstractBaseDictionary.java?rev=1477364&r1=1477363&r2=1477364&view=diff ============================================================================== --- ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/AbstractBaseDictionary.java (original) +++ ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/AbstractBaseDictionary.java Mon Apr 29 21:47:57 2013 @@ -34,7 +34,7 @@ public abstract class AbstractBaseDictio * TODO - get rid of the using class iterators and use Collection foreach * @return iterator of all metaField names */ - protected Iterator getMetaFieldNames() { + protected Iterator getMetaFieldNames() { return _metaFieldNames.iterator(); } Modified: ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/BaseDictionaryImpl.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/BaseDictionaryImpl.java?rev=1477364&r1=1477363&r2=1477364&view=diff ============================================================================== --- ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/BaseDictionaryImpl.java (original) +++ ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/BaseDictionaryImpl.java Mon Apr 29 21:47:57 2013 @@ -33,9 +33,9 @@ import java.util.Set; @Deprecated public abstract class BaseDictionaryImpl implements Dictionary { - private Set iv_metaFieldNames = new HashSet(); + private Set iv_metaFieldNames = new HashSet(); - protected Iterator getMetaFieldNames() + protected Iterator getMetaFieldNames() { return iv_metaFieldNames.iterator(); } Modified: ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/BaseMetaDataHitImpl.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/BaseMetaDataHitImpl.java?rev=1477364&r1=1477363&r2=1477364&view=diff ============================================================================== --- ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/BaseMetaDataHitImpl.java (original) +++ ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/BaseMetaDataHitImpl.java Mon Apr 29 21:47:57 2013 @@ -61,7 +61,7 @@ public abstract class BaseMetaDataHitImp || !getMetaFieldNames().containsAll( mdh.getMetaFieldNames() ) ) { return false; } - final Collection thisMetaFieldNames = (Collection)getMetaFieldNames(); + final Collection thisMetaFieldNames = getMetaFieldNames(); for ( String name : thisMetaFieldNames ) { if ( !getMetaFieldValue( name ).equals( mdh.getMetaFieldValue( name ) ) ) { return false; Modified: ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/GenericMetaDataHitImpl.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/GenericMetaDataHitImpl.java?rev=1477364&r1=1477363&r2=1477364&view=diff ============================================================================== --- ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/GenericMetaDataHitImpl.java (original) +++ ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/GenericMetaDataHitImpl.java Mon Apr 29 21:47:57 2013 @@ -28,7 +28,7 @@ import java.util.Set; * @author Mayo Clinic */ @Immutable -public final class GenericMetaDataHitImpl extends AbstractBaseMetaDataHit implements MetaDataHit { +public final class GenericMetaDataHitImpl extends AbstractBaseMetaDataHit { private final Map _nameValueMap; public GenericMetaDataHitImpl( final Map metaNameValueMap ) { Modified: ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/MetaDataHitComparator.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/MetaDataHitComparator.java?rev=1477364&r1=1477363&r2=1477364&view=diff ============================================================================== --- ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/MetaDataHitComparator.java (original) +++ ctakes/trunk/ctakes-dictionary-lookup/src/main/java/org/apache/ctakes/dictionary/lookup/MetaDataHitComparator.java Mon Apr 29 21:47:57 2013 @@ -26,7 +26,7 @@ import java.util.Comparator; * * @author Mayo Clinic */ -public class MetaDataHitComparator implements Comparator, MetaDataHitConst +public class MetaDataHitComparator implements Comparator, MetaDataHitConst { private int iv_type; private String iv_metaFieldName; @@ -48,11 +48,8 @@ public class MetaDataHitComparator imple /** * Implementation */ - public int compare(Object o1, Object o2) + public int compare(MetaDataHit mdh1, MetaDataHit mdh2) { - MetaDataHit mdh1 = (MetaDataHit) o1; - MetaDataHit mdh2 = (MetaDataHit) o2; - String mdv1 = mdh1.getMetaFieldValue(iv_metaFieldName); String mdv2 = mdh2.getMetaFieldValue(iv_metaFieldName); @@ -78,9 +75,6 @@ public class MetaDataHitComparator imple { return comparison; } - else - { - return comparison * -1; - } + return comparison * -1; } } \ No newline at end of file