--- old/src/share/classes/com/sun/java/swing/plaf/gtk/XColors.java	2014-06-30 09:09:10.000000000 -0700
+++ new/src/share/classes/com/sun/java/swing/plaf/gtk/XColors.java	2014-06-30 09:09:10.000000000 -0700
@@ -34,7 +34,7 @@
  */
 class XColors {
 
-    private static class XColor implements Comparable {
+    private static class XColor implements Comparable<XColor> {
         String name;
 
         int red;
@@ -52,10 +52,8 @@
             return new ColorUIResource(red, green, blue);
         }
 
-        public int compareTo(Object o) {
-            XColor other = (XColor)o;
-
-            return name.compareTo(other.name);
+        public int compareTo(XColor o) {
+            return name.compareTo(o.name);
         }
     }