Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 96231 invoked from network); 8 Jul 2009 06:45:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Jul 2009 06:45:18 -0000 Received: (qmail 83616 invoked by uid 500); 8 Jul 2009 06:45:27 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 83534 invoked by uid 500); 8 Jul 2009 06:45:27 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 83505 invoked by uid 99); 8 Jul 2009 06:45:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2009 06:45:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 08 Jul 2009 06:45:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 110A223888D0; Wed, 8 Jul 2009 06:45:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r792051 - in /commons/proper/lang/trunk/src: java/org/apache/commons/lang/EnumUtils.java test/org/apache/commons/lang/EnumUtilsTest.java Date: Wed, 08 Jul 2009 06:45:02 -0000 To: commits@commons.apache.org From: bayard@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090708064503.110A223888D0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bayard Date: Wed Jul 8 06:45:02 2009 New Revision: 792051 URL: http://svn.apache.org/viewvc?rev=792051&view=rev Log: Applying Ivan Bilenjkij's patch from LANG-513, improving the generics of the getEnumMap method Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/EnumUtils.java commons/proper/lang/trunk/src/test/org/apache/commons/lang/EnumUtilsTest.java Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/EnumUtils.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/EnumUtils.java?rev=792051&r1=792050&r2=792051&view=diff ============================================================================== --- commons/proper/lang/trunk/src/java/org/apache/commons/lang/EnumUtils.java (original) +++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/EnumUtils.java Wed Jul 8 06:45:02 2009 @@ -39,10 +39,13 @@ * @param enumClass the class of the enum to get * @return the enum Map */ - public static Map> getEnumMap(Class enumClass) { - Map> map = new LinkedHashMap>(); - Iterator> itr = EnumSet.allOf(enumClass).iterator(); - while(itr.hasNext()) { Enum enm = itr.next(); map.put( enm.name(), enm ); } + public static > Map> getEnumMap(Class enumClass) { + Map> map = new LinkedHashMap>(); + + for (E e: EnumSet.allOf(enumClass)) { + map.put(e.name(), e); + } + return map; } Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/EnumUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/EnumUtilsTest.java?rev=792051&r1=792050&r2=792051&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/org/apache/commons/lang/EnumUtilsTest.java (original) +++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/EnumUtilsTest.java Wed Jul 8 06:45:02 2009 @@ -36,18 +36,6 @@ } public void testGetEnumMap() { - try { - EnumUtils.getEnumMap(null); - fail("NullPointerException expected"); - } catch(NullPointerException npe) { - // expected - } - try { - EnumUtils.getEnumMap(getClass()); - fail("ClassCastException expected"); - } catch(ClassCastException cce) { - // expected - } String toString = EnumUtils.getEnumMap(Traffic.class).toString(); assertEquals( "getEnumMap not created correctly", "{RED=RED, AMBER=AMBER, GREEN=GREEN}", toString); }