PDFBOX-5660: use Objects.equals(), by Axel Howind

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1913597 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 5, 2023 · 8b5de4f · 8b5de4f
1 parent 9fb5c98
commit 8b5de4f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java b/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.Map;
+import java.util.Objects;
 import java.util.WeakHashMap;
 
 import org.apache.logging.log4j.Logger;
@@ -103,15 +104,15 @@ public boolean equals(Object obj)
                 return false;
             }
             final TilingPaintParameter other = (TilingPaintParameter) obj;
-            if (this.matrix != other.matrix && (this.matrix == null || !this.matrix.equals(other.matrix)))
+            if (!Objects.equals(this.matrix, other.matrix))
             {
                 return false;
             }
-            if (this.patternDict != other.patternDict && (this.patternDict == null || !this.patternDict.equals(other.patternDict)))
+            if (!Objects.equals(this.patternDict, other.patternDict))
             {
                 return false;
             }
-            if (this.colorSpace != other.colorSpace && (this.colorSpace == null || !this.colorSpace.equals(other.colorSpace)))
+            if (!Objects.equals(this.colorSpace, other.colorSpace))
             {
                 return false;
             }
@@ -140,7 +141,7 @@ public boolean equals(Object obj)
                 LOG.debug("Couldn't convert color to RGB - treating as not equal", ex);
                 return false;
             }
-            return !(this.xform != other.xform && (this.xform == null || !this.xform.equals(other.xform)));
+            return Objects.equals(this.xform, other.xform);
         }
 
         @Override

diff --git a/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java b/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java
@@ -20,6 +20,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.pdfbox.pdmodel.font.PDFont;
@@ -891,15 +892,15 @@ public boolean equals(Object o)
         {
             return false;
         }
-        if (textMatrix != null ? !textMatrix.equals(that.textMatrix) : that.textMatrix != null)
+        if (!Objects.equals(textMatrix, that.textMatrix))
         {
             return false;
         }
         if (!Arrays.equals(charCodes, that.charCodes))
         {
             return false;
         }
-        return font != null ? font.equals(that.font) : that.font == null;
+        return Objects.equals(font, that.font);
 
         // If changing this method, do not compare mutable fields (PDFBOX-4701)        
     }