src/share/classes/javax/swing/table/TableRowSorter.java

@@ -129,11 +129,11 @@
  */
 public class TableRowSorter<M extends TableModel> extends DefaultRowSorter<M, Integer> {
     /**
      * Comparator that uses compareTo on the contents.
      */
-    private static final Comparator COMPARABLE_COMPARATOR =
+    private static final Comparator<?> COMPARABLE_COMPARATOR =
             new ComparableComparator();
 
     /**
      * Underlying model.
      */

@@ -212,15 +212,15 @@
      * <code>Collator.getInstance</code> is returned.
      *
      * @throws IndexOutOfBoundsException {@inheritDoc}
      */
     public Comparator<?> getComparator(int column) {
-        Comparator comparator = super.getComparator(column);
+        Comparator<?> comparator = super.getComparator(column);
         if (comparator != null) {
             return comparator;
         }
-        Class columnClass = getModel().getColumnClass(column);
+        Class<?> columnClass = getModel().getColumnClass(column);
         if (columnClass == String.class) {
             return Collator.getInstance();
         }
         if (Comparable.class.isAssignableFrom(columnClass)) {
             return COMPARABLE_COMPARATOR;

@@ -232,15 +232,15 @@
      * {@inheritDoc}
      *
      * @throws IndexOutOfBoundsException {@inheritDoc}
      */
     protected boolean useToString(int column) {
-        Comparator comparator = super.getComparator(column);
+        Comparator<?> comparator = super.getComparator(column);
         if (comparator != null) {
             return false;
         }
-        Class columnClass = getModel().getColumnClass(column);
+        Class<?> columnClass = getModel().getColumnClass(column);
         if (columnClass == String.class) {
             return false;
         }
         if (Comparable.class.isAssignableFrom(columnClass)) {
             return false;

@@ -297,11 +297,11 @@
             return index;
         }
     }
 
 
-    private static class ComparableComparator implements Comparator {
+    private static class ComparableComparator implements Comparator<Object> {
         @SuppressWarnings("unchecked")
         public int compare(Object o1, Object o2) {
             return ((Comparable)o1).compareTo(o2);
         }
     }