From 63f32fbe9771b8200f707ed5d1d0e6555ad90f8b Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 10 Jul 2023 17:07:26 +0000
Subject: [PATCH] 8311528: Remove IDE specific SuppressWarnings

Reviewed-by: lancea, bpb, jlu
---
 .../share/classes/java/util/Calendar.java     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/java.base/share/classes/java/util/Calendar.java b/src/java.base/share/classes/java/util/Calendar.java
index 6e3fa4a561d..e7149c4dfe1 100644
--- a/src/java.base/share/classes/java/util/Calendar.java
+++ b/src/java.base/share/classes/java/util/Calendar.java
@@ -2701,25 +2701,25 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @return {@code true} if this object is equal to {@code obj};
      * {@code false} otherwise.
      */
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        try {
-            Calendar that = (Calendar)obj;
-            return compareTo(getMillisOf(that)) == 0 &&
-                lenient == that.lenient &&
-                firstDayOfWeek == that.firstDayOfWeek &&
-                minimalDaysInFirstWeek == that.minimalDaysInFirstWeek &&
-                (zone instanceof ZoneInfo ?
-                    zone.equals(that.zone) :
-                    zone.equals(that.getTimeZone()));
-        } catch (Exception e) {
-            // Note: GregorianCalendar.computeTime throws
-            // IllegalArgumentException if the ERA value is invalid
-            // even it's in lenient mode.
+        if (obj instanceof Calendar that) {
+            try {
+                return compareTo(getMillisOf(that)) == 0 &&
+                    lenient == that.lenient &&
+                    firstDayOfWeek == that.firstDayOfWeek &&
+                    minimalDaysInFirstWeek == that.minimalDaysInFirstWeek &&
+                    (zone instanceof ZoneInfo ?
+                        zone.equals(that.zone) :
+                        zone.equals(that.getTimeZone()));
+            } catch (Exception e) {
+                // Note: GregorianCalendar.computeTime throws
+                // IllegalArgumentException if the ERA value is invalid
+                // even it's in lenient mode.
+            }
         }
         return false;
     }