svn commit: r1465689 - /commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java

[sebb]

Author: sebb
Date: Mon Apr  8 17:26:42 2013
New Revision: 1465689

URL: http://svn.apache.org/r1465689
Log:
Fix up some generics warnings as best we can

Modified:
    
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java

Modified: 
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java?rev=1465689&r1=1465688&r2=1465689&view=diff
==============================================================================
--- 
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java
 (original)
+++ 
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java
 Mon Apr  8 17:26:42 2013
@@ -28,6 +28,7 @@ import java.util.Comparator;
  *
  * @version $Id$
  */
+@SuppressWarnings("rawtypes") // TODO ought to implement Comparator<String> 
but that's not possible whilst maintaining binary compatibility 
 public class StringEncoderComparator implements Comparator {
 
     /**
@@ -75,8 +76,10 @@ public class StringEncoderComparator imp
         int compareCode = 0;
 
         try {
-            final Comparable s1 = (Comparable) this.stringEncoder.encode(o1);
-            final Comparable s2 = (Comparable) this.stringEncoder.encode(o2);
+            @SuppressWarnings("unchecked") // May fail with CCE if encode 
returns something that is not Comparable
+            // However this was always the case.
+            final Comparable<Comparable<?>> s1 = (Comparable<Comparable<?>>) 
this.stringEncoder.encode(o1);
+            final Comparable<?> s2 = (Comparable<?>) 
this.stringEncoder.encode(o2);
             compareCode = s1.compareTo(s2);
         } catch (final EncoderException ee) {
             compareCode = 0;