Imported GNU Classpath 0.19 + gcj-import-20051115.
* sources.am: Regenerated.
* Makefile.in: Likewise.
* scripts/makemake.tcl: Use glob -nocomplain.
From-SVN: r107049
This commit is contained in:
@@ -868,6 +868,17 @@ public class GregorianCalendar extends Calendar
|
||||
|
||||
areFieldsSet = isSet[ERA] = isSet[YEAR] = isSet[MONTH] = isSet[WEEK_OF_YEAR] = isSet[WEEK_OF_MONTH] = isSet[DAY_OF_MONTH] = isSet[DAY_OF_YEAR] = isSet[DAY_OF_WEEK] = isSet[DAY_OF_WEEK_IN_MONTH] = isSet[AM_PM] = isSet[HOUR] = isSet[HOUR_OF_DAY] = isSet[MINUTE] = isSet[SECOND] = isSet[MILLISECOND] = isSet[ZONE_OFFSET] = isSet[DST_OFFSET] = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a hash code for this object, following the general contract
|
||||
* specified by {@link Object#hashCode()}.
|
||||
* @return the hash code
|
||||
*/
|
||||
public int hashCode()
|
||||
{
|
||||
int val = (int) ((gregorianCutover >>> 32) ^ (gregorianCutover & 0xffffffff));
|
||||
return super.hashCode() ^ val;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compares the given calendar with this. An object, o, is
|
||||
@@ -890,7 +901,8 @@ public class GregorianCalendar extends Calendar
|
||||
return false;
|
||||
|
||||
GregorianCalendar cal = (GregorianCalendar) o;
|
||||
return (cal.getTimeInMillis() == getTimeInMillis());
|
||||
return (cal.gregorianCutover == gregorianCutover
|
||||
&& super.equals(o));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user