Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 50671 invoked from network); 24 Oct 2009 12:09:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Oct 2009 12:09:19 -0000 Received: (qmail 73320 invoked by uid 500); 24 Oct 2009 12:09:18 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 73202 invoked by uid 500); 24 Oct 2009 12:09:18 -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 73193 invoked by uid 99); 24 Oct 2009 12:09:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Oct 2009 12:09:18 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00 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; Sat, 24 Oct 2009 12:09:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD1BA23888FE; Sat, 24 Oct 2009 12:08:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r829352 - in /commons/proper/lang/trunk/src: java/org/apache/commons/lang/builder/ test/org/apache/commons/lang/builder/ Date: Sat, 24 Oct 2009 12:08:55 -0000 To: commits@commons.apache.org From: scolebourne@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091024120855.CD1BA23888FE@eris.apache.org> Author: scolebourne Date: Sat Oct 24 12:08:55 2009 New Revision: 829352 URL: http://svn.apache.org/viewvc?rev=829352&view=rev Log: Apply generics Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/CompareToBuilder.java commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/HashCodeBuilder.java commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/ToStringStyle.java commons/proper/lang/trunk/src/test/org/apache/commons/lang/builder/CompareToBuilderTest.java Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/CompareToBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/CompareToBuilder.java?rev=829352&r1=829351&r2=829352&view=diff ============================================================================== --- commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/CompareToBuilder.java (original) +++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/CompareToBuilder.java Sat Oct 24 12:08:55 2009 @@ -438,7 +438,8 @@ * with lhs * @since 2.0 */ - public CompareToBuilder append(Object lhs, Object rhs, Comparator comparator) { + @SuppressWarnings("unchecked") + public CompareToBuilder append(Object lhs, Object rhs, Comparator comparator) { if (comparison != 0) { return this; } @@ -483,7 +484,7 @@ if (comparator == null) { comparison = ((Comparable) lhs).compareTo(rhs); } else { - comparison = comparator.compare(lhs, rhs); + comparison = ((Comparator) comparator).compare(lhs, rhs); } } return this; Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/HashCodeBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/HashCodeBuilder.java?rev=829352&r1=829351&r2=829352&view=diff ============================================================================== --- commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/HashCodeBuilder.java (original) +++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/HashCodeBuilder.java Sat Oct 24 12:08:55 2009 @@ -179,7 +179,7 @@ try { register(object); Field[] fields = clazz.getDeclaredFields(); - List excludedFieldList = excludeFields != null ? Arrays.asList(excludeFields) : Collections.EMPTY_LIST; + List excludedFieldList = excludeFields != null ? Arrays.asList(excludeFields) : Collections.emptyList(); AccessibleObject.setAccessible(fields, true); for (Field field : fields) { if (!excludedFieldList.contains(field.getName()) Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/ToStringStyle.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/ToStringStyle.java?rev=829352&r1=829351&r2=829352&view=diff ============================================================================== --- commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/ToStringStyle.java (original) +++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/builder/ToStringStyle.java Sat Oct 24 12:08:55 2009 @@ -461,18 +461,18 @@ register(value); try { - if (value instanceof Collection) { + if (value instanceof Collection) { if (detail) { - appendDetail(buffer, fieldName, (Collection) value); + appendDetail(buffer, fieldName, (Collection) value); } else { - appendSummarySize(buffer, fieldName, ((Collection) value).size()); + appendSummarySize(buffer, fieldName, ((Collection) value).size()); } - } else if (value instanceof Map) { + } else if (value instanceof Map) { if (detail) { - appendDetail(buffer, fieldName, (Map) value); + appendDetail(buffer, fieldName, (Map) value); } else { - appendSummarySize(buffer, fieldName, ((Map) value).size()); + appendSummarySize(buffer, fieldName, ((Map) value).size()); } } else if (value instanceof long[]) { @@ -587,7 +587,7 @@ * @param coll the Collection to add to the * toString, not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, Collection coll) { + protected void appendDetail(StringBuffer buffer, String fieldName, Collection coll) { buffer.append(coll); } @@ -599,7 +599,7 @@ * @param map the Map to add to the toString, * not null */ - protected void appendDetail(StringBuffer buffer, String fieldName, Map map) { + protected void appendDetail(StringBuffer buffer, String fieldName, Map map) { buffer.append(map); } @@ -1570,7 +1570,7 @@ * @param cls the Class to get the short name of * @return the short name */ - protected String getShortClassName(Class cls) { + protected String getShortClassName(Class cls) { return ClassUtils.getShortClassName(cls); } Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/builder/CompareToBuilderTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/builder/CompareToBuilderTest.java?rev=829352&r1=829351&r2=829352&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/org/apache/commons/lang/builder/CompareToBuilderTest.java (original) +++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/builder/CompareToBuilderTest.java Sat Oct 24 12:08:55 2009 @@ -57,7 +57,7 @@ //----------------------------------------------------------------------- - static class TestObject implements Comparable { + static class TestObject implements Comparable { private int a; public TestObject(int a) { this.a = a; @@ -81,8 +81,7 @@ public int getA() { return a; } - public int compareTo(Object o) { - TestObject rhs = (TestObject) o; + public int compareTo(TestObject rhs) { return (a < rhs.a) ? -1 : (a > rhs.a) ? +1 : 0; } }