RenderDeviceJme: CachedTextKey.equals() lacks a type check (#1768)

jMonkeyEngine · Feb 10, 2022 · 2a661dc · 2a661dc
1 parent 475abdf
commit 2a661dc
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/jme3-niftygui/src/main/java/com/jme3/niftygui/RenderDeviceJme.java b/jme3-niftygui/src/main/java/com/jme3/niftygui/RenderDeviceJme.java
@@ -94,11 +94,20 @@ public CachedTextKey(BitmapFont font, String text/*, ColorRGBA color*/) {
         }
 
         @Override
-        public boolean equals(Object other) {
-            CachedTextKey otherKey = (CachedTextKey) other;
-            return font.equals(otherKey.font) &&
-                   text.equals(otherKey.text)/* &&
-                   color.equals(otherKey.color)*/;
+        public boolean equals(Object otherObject) {
+            boolean result;
+            if (otherObject == this) {
+                result = true;
+            } else if (otherObject != null
+                    && otherObject.getClass() == getClass()) {
+                CachedTextKey otherKey = (CachedTextKey) otherObject;
+                result = font.equals(otherKey.font)
+                        && text.equals(otherKey.text);
+            } else {
+                result = false;
+            }
+
+            return result;
         }
 
         @Override