fixing hashcode, equals, and toString of bounds string

NathanCheshire · Jul 9, 2024 · a5448d1 · a5448d1
1 parent 56a0988
commit a5448d1
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/main/java/com/github/natche/cyderutils/bounds/BoundsString.java b/src/main/java/com/github/natche/cyderutils/bounds/BoundsString.java
@@ -235,6 +235,10 @@ public int hashCode() {
         int ret = text.hashCode();
         ret = 31 * ret + Double.hashCode(width);
         ret = 31 * ret + Double.hashCode(height);
+        ret = 31 * ret + font.hashCode();
+        ret = 31 * ret + Double.hashCode(maxWidth);
+        ret = 31 * ret + Double.hashCode(maxHeight);
+        ret = 31 * ret + Integer.hashCode(linePadding);
         return ret;
     }
 
@@ -244,7 +248,11 @@ public String toString() {
         return "BoundsString{"
                 + "text=\"" + text + "\", "
                 + "width=" + width + ", "
-                + "height=" + height
+                + "height=" + height + ", "
+                + "font=" + font + ", "
+                + "maxWidth=" + maxWidth + ", "
+                + "maxHeight=" + maxHeight + ", "
+                + "linePadding=" + linePadding
                 + "}";
     }
 
@@ -259,7 +267,11 @@ public boolean equals(Object o) {
         BoundsString other = (BoundsString) o;
         return text.equals(other.getText())
                 && width == other.getWidth()
-                && height == other.getHeight();
+                && height == other.getHeight()
+                && font.equals(other.font)
+                && maxWidth == other.maxWidth
+                && maxHeight == other.maxHeight
+                && linePadding == other.linePadding;
     }
 
     /** A builder for constructing a BoundsString object. */