diff options
Diffstat (limited to 'gnu/xml/validation/datatype/GYearMonthType.java')
| -rw-r--r-- | gnu/xml/validation/datatype/GYearMonthType.java | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gnu/xml/validation/datatype/GYearMonthType.java b/gnu/xml/validation/datatype/GYearMonthType.java index 9aabfb61c..e10e511be 100644 --- a/gnu/xml/validation/datatype/GYearMonthType.java +++ b/gnu/xml/validation/datatype/GYearMonthType.java @@ -52,17 +52,19 @@ final class GYearMonthType { static class GYearMonth - implements Comparable + implements Comparable<GYearMonth> { int year; int month; + @Override public int hashCode() { return year * 31 + month; } + @Override public boolean equals(Object other) { if (other instanceof GYearMonth) @@ -73,20 +75,16 @@ final class GYearMonthType return false; } - public int compareTo(Object other) + @Override + public int compareTo(GYearMonth gmy) { - if (other instanceof GYearMonth) + if (gmy.year == year) { - GYearMonth gmy = (GYearMonth) other; - if (gmy.year == year) - { - if (gmy.month == month) - return 0; - return (month < gmy.month) ? -1 : 1; - } - return (year < gmy.year) ? -1 : 1; + if (gmy.month == month) + return 0; + return (month < gmy.month) ? -1 : 1; } - return 0; + return (year < gmy.year) ? -1 : 1; } } |