--- a/usr/src/java/adr/org/opensolaris/os/adr/APIVersion.java	Tue Aug 09 12:37:14 2011 -0400
+++ b/usr/src/java/adr/org/opensolaris/os/adr/APIVersion.java	Thu Aug 11 15:41:42 2011 -0700
@@ -25,7 +25,7 @@
 
 package org.opensolaris.os.adr;
 
-public class APIVersion implements Comparable {
+public class APIVersion implements Comparable<APIVersion> {
 
     private int major_;
     private int minor_;
@@ -57,10 +57,9 @@
      */
 
     @Override
-    public int compareTo(Object o) throws ClassCastException {
-	if (this == o)
+    public int compareTo(APIVersion v) throws ClassCastException {
+	if (this == v)
 	    return 0;
-	APIVersion v = (APIVersion) o;
 	int diff = stability_.compareTo(v.getStability());
 	if (diff == 0) {
 	    diff = major_ - v.getMajor();