From 2ea4493d55014686da5c5ab48c8c5b915c277a01 Mon Sep 17 00:00:00 2001 From: Shaojin Wen Date: Thu, 1 May 2025 23:58:29 +0800 Subject: [PATCH] Use Double::hashCode & Long::hashCode --- .../macosx/classes/apple/laf/JRSUIControl.java | 2 +- src/java.desktop/macosx/classes/apple/laf/JRSUIState.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java index c16f956f11459..cfe3b916161fa 100644 --- a/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java +++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIControl.java @@ -324,7 +324,7 @@ private void sync() { @Override public int hashCode() { - int bits = (int)(currentEncodedProperties ^ (currentEncodedProperties >>> 32)); + int bits = Long.hashCode(currentEncodedProperties); bits ^= nativeMap.hashCode(); bits ^= changes.hashCode(); return bits; diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java index 867f93da73c66..116e85c350948 100644 --- a/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java +++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIState.java @@ -90,7 +90,7 @@ public boolean is(Property property) { @Override public int hashCode() { - return (int)(encodedState ^ (encodedState >>> 32)) ^ getClass().hashCode(); + return Long.hashCode(encodedState) ^ getClass().hashCode(); } public static class AnimationFrameState extends JRSUIState { @@ -183,8 +183,7 @@ public boolean equals(final Object obj) { @Override public int hashCode() { - final long bits = Double.doubleToRawLongBits(value); - return super.hashCode() ^ (int)bits ^ (int)(bits >>> 32); + return super.hashCode() ^ Double.hashCode(value); } } @@ -258,7 +257,7 @@ public boolean equals(final Object obj) { @Override public int hashCode() { final long bits = Double.doubleToRawLongBits(thumbProportion) ^ Double.doubleToRawLongBits(thumbStart); - return super.hashCode() ^ (int)bits ^ (int)(bits >>> 32); + return super.hashCode() ^ Long.hashCode(bits); } } }