897 |
// but it will avoid showing up as a discrepancy when comparing SUIDs. |
// but it will avoid showing up as a discrepancy when comparing SUIDs. |
898 |
private static final long serialVersionUID = -6120832682080437368L; |
private static final long serialVersionUID = -6120832682080437368L; |
899 |
|
|
|
} |
|
|
|
|
900 |
|
|
901 |
// interfaces are compared only by name |
// interfaces are compared only by name |
902 |
class InterfaceComparator implements Comparator |
private static final class InterfaceComparator implements Comparator |
|
{ |
|
|
public int compare(Object o1, Object o2) |
|
903 |
{ |
{ |
904 |
return ((Class) o1).getName().compareTo(((Class) o2).getName()); |
public int compare(Object o1, Object o2) |
905 |
|
{ |
906 |
|
return ((Class) o1).getName().compareTo(((Class) o2).getName()); |
907 |
|
} |
908 |
} |
} |
|
} |
|
909 |
|
|
910 |
|
|
911 |
// Members (Methods and Constructors) are compared first by name, |
// Members (Methods and Constructors) are compared first by name, |
912 |
// conflicts are resolved by comparing type signatures |
// conflicts are resolved by comparing type signatures |
913 |
class MemberComparator implements Comparator |
private static final class MemberComparator implements Comparator |
|
{ |
|
|
public int compare(Object o1, Object o2) |
|
914 |
{ |
{ |
915 |
Member m1 = (Member) o1; |
public int compare(Object o1, Object o2) |
916 |
Member m2 = (Member) o2; |
{ |
917 |
|
Member m1 = (Member) o1; |
918 |
int comp = m1.getName().compareTo(m2.getName()); |
Member m2 = (Member) o2; |
919 |
|
|
920 |
if (comp == 0) |
int comp = m1.getName().compareTo(m2.getName()); |
921 |
return TypeSignature.getEncodingOfMember(m1). |
|
922 |
compareTo(TypeSignature.getEncodingOfMember(m2)); |
if (comp == 0) |
923 |
else |
return TypeSignature.getEncodingOfMember(m1). |
924 |
return comp; |
compareTo(TypeSignature.getEncodingOfMember(m2)); |
925 |
|
else |
926 |
|
return comp; |
927 |
|
} |
928 |
} |
} |
929 |
} |
} |