8289389: Fix warnings: type should also implement hashCode() since it overrides Object.equals()

Reviewed-by: kcr

Author: Andy Goryachev

modules/javafx.controls/src/test/java/test/javafx/scene/control/ListViewTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1715,6 +1715,11 @@ public RT22599_DataType(int id, String text) {
             if (obj == null) return false;
             return id == ((RT22599_DataType)obj).id;
         }
+
+        @Override
+        public int hashCode() {
+            return id;
+        }
     }
 
     private int rt_39966_count = 0;

modules/javafx.controls/src/test/java/test/javafx/scene/control/TableViewTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -5086,6 +5086,11 @@ public RT22599_DataType(int id, String text) {
             if (obj == null) return false;
             return id == ((RT22599_DataType)obj).id;
         }
+
+        @Override
+        public int hashCode() {
+            return id;
+        }
     }
 
     private int rt_39966_count = 0;

modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeTableViewTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -5754,6 +5754,11 @@ public RT22599_DataType(int id, String text) {
             if (obj == null) return false;
             return id == ((RT22599_DataType)obj).id;
         }
+
+        @Override
+        public int hashCode() {
+            return id;
+        }
     }
 
     private int rt_39966_count = 0;

modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeViewTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3076,6 +3076,11 @@ public RT22599_DataType(int id, String text) {
             if (obj == null) return false;
             return id == ((RT22599_DataType)obj).id;
         }
+
+        @Override
+        public int hashCode() {
+            return id;
+        }
     }
 
     private int rt_39966_count = 0;

modules/javafx.fxml/src/main/java/javafx/fxml/FXMLLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2321,6 +2321,13 @@ public boolean equals(Object obj) {
         return false;
     }
 
+    @Override
+    public int hashCode() {
+        int h = FXMLLoader.class.hashCode();
+        h = 31 * h + (location == null ? 0 : location.toExternalForm().hashCode());
+        return h;
+    }
+
     private boolean isCyclic(
                             FXMLLoader currentLoader,
                             FXMLLoader node) {

modules/javafx.graphics/src/main/java/com/sun/glass/ui/monocle/IntSet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -152,6 +152,15 @@ public boolean equals(Object o) {
         }
     }
 
+    @Override
+    public int hashCode() {
+        int h = 1;
+        for (int i = 0; i < size; i++) {
+            h = 31 * h + elements[i];
+        }
+        return h;
+    }
+
     public String toString() {
         StringBuffer sb = new StringBuffer("IntSet[");
         for (int i = 0; i < size; i++) {

modules/javafx.graphics/src/main/java/com/sun/javafx/css/CalculatedValue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,6 +88,15 @@ public boolean isRelative() {
         return true;
     }
 
+    @Override
+    public int hashCode() {
+        int h = CalculatedValue.class.hashCode();
+        h = 31 * h + Boolean.hashCode(relative);
+        h = 31 * h + (origin == null ? 0 : origin.hashCode());
+        h = 31 * h + (value == null ? 0 : value.hashCode());
+        return h;
+    }
+
     private final Object value;
     private final StyleOrigin origin;
     private final boolean relative;

modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaAudioClipPlayer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -425,8 +425,8 @@ public void onError(Object source, int errorCode, String message) {
     }
 
     /*
-     * Override equals for using in a List of clips pended for pllayback.
-     * Equals is used to avoid repetitions. hashCode is not necessary here.
+     * Override equals for using in a List of clips pended for playback.
+     * Equals is used to avoid repetitions.
      */
     @Override
     public boolean equals(Object that) {
@@ -451,6 +451,19 @@ public boolean equals(Object that) {
         }
     }
 
+    @Override
+    public int hashCode() {
+        int h = NativeMediaAudioClipPlayer.class.hashCode();
+        h = 31 * h + sourceClip.getLocator().getURI().hashCode();
+        h = 31 * h + priority;
+        h = 31 * h + loopCount;
+        h = 31 * h + Double.hashCode(volume);
+        h = 31 * h + Double.hashCode(balance);
+        h = 31 * h + Double.hashCode(rate);
+        h = 31 * h + Double.hashCode(pan);
+        return h;
+    }
+
     private static class SchedulerEntry {
         private final int command; // 0 = play, 1 = stop, 2 = dispose
         private final NativeMediaAudioClipPlayer player; // MAY BE NULL!
@@ -517,5 +530,10 @@ public void signal() {
             }
             return false;
         }
+
+        @Override
+        public int hashCode() {
+            return player == null ? 0 : player.hashCode();
+        }
     }
 }

modules/javafx.web/src/main/java/com/sun/webkit/graphics/WCRectangle.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -260,6 +260,15 @@ public boolean equals(Object obj) {
         return super.equals(obj);
     }
 
+    @Override
+    public int hashCode() {
+        int h = WCRectangle.class.hashCode();
+        h = 31 * h + Float.floatToIntBits(x);
+        h = 31 * h + Float.floatToIntBits(y);
+        h = 31 * h + Float.floatToIntBits(w);
+        return 31 * h + Float.floatToIntBits(h);
+    }
+
     @Override
     public String toString() {
         return "WCRectangle{x:" + x + " y:" + y + " w:" + w + " h:" + h + "}";