archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8267110: Update java.util to use instanceof pattern variable

Browse source 
Reviewed-by: lancea, naoto
This commit is contained in:
Patrick Concannon 2021-05-25 08:24:49 +00:00
parent 0a03fc84b3
commit a52c4ede2f
29 changed files with 142 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/java.base/share/classes/java/util/SimpleTimeZone.java
View file

@ -878,19 +878,14 @@ public class SimpleTimeZone extends TimeZone {
* @return True if the given {@code obj} is the same as this
* {@code SimpleTimeZone} object; false otherwise.
*/
public boolean equals(Object obj)
{
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (!(obj instanceof SimpleTimeZone)) {
return false;
}
SimpleTimeZone that = (SimpleTimeZone) obj;
return getID().equals(that.getID()) &&
hasSameRules(that);
return obj instanceof SimpleTimeZone that
&& getID().equals(that.getID())
&& hasSameRules(that);
}
/**
@ -904,28 +899,26 @@ public class SimpleTimeZone extends TimeZone {
if (this == other) {
return true;
}
if (!(other instanceof SimpleTimeZone)) {
return false;
}
SimpleTimeZone that = (SimpleTimeZone) other;
return rawOffset == that.rawOffset &&
useDaylight == that.useDaylight &&
(!useDaylight
// Only check rules if using DST
|| (dstSavings == that.dstSavings &&
startMode == that.startMode &&
startMonth == that.startMonth &&
startDay == that.startDay &&
startDayOfWeek == that.startDayOfWeek &&
startTime == that.startTime &&
startTimeMode == that.startTimeMode &&
endMode == that.endMode &&
endMonth == that.endMonth &&
endDay == that.endDay &&
endDayOfWeek == that.endDayOfWeek &&
endTime == that.endTime &&
endTimeMode == that.endTimeMode &&
startYear == that.startYear));
return other instanceof SimpleTimeZone that
&& rawOffset == that.rawOffset
&& useDaylight == that.useDaylight
&& (!useDaylight ||
// Only check rules if using DST
(dstSavings == that.dstSavings
&& startMode == that.startMode
&& startMonth == that.startMonth
&& startDay == that.startDay
&& startDayOfWeek == that.startDayOfWeek
&& startTime == that.startTime
&& startTimeMode == that.startTimeMode
&& endMode == that.endMode
&& endMonth == that.endMonth
&& endDay == that.endDay
&& endDayOfWeek == that.endDayOfWeek
&& endTime == that.endTime
&& endTimeMode == that.endTimeMode
&& startYear == that.startYear)
);
}
/**