summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2006-06-21 13:50:58 +0000
committerRoman Kennke <roman@kennke.org>2006-06-21 13:50:58 +0000
commitbbc0777f4914ac48e7f55db5a9f18c31d6b6107d (patch)
tree47266c0c1f7efad3f73b610e6d4be6ddf5c1060e /java
parent7b4366c4c3693a9736841125c779c7293d57f9f5 (diff)
downloadclasspath-bbc0777f4914ac48e7f55db5a9f18c31d6b6107d.tar.gz
2006-06-21 Roman Kennke <kennke@aicas.com>
* java/awt/font/FontRenderContext.java: (equals): Added special conditions for affineTransform beeing null.
Diffstat (limited to 'java')
-rw-r--r--java/awt/font/FontRenderContext.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/java/awt/font/FontRenderContext.java b/java/awt/font/FontRenderContext.java
index 78564a647..c50e5e509 100644
--- a/java/awt/font/FontRenderContext.java
+++ b/java/awt/font/FontRenderContext.java
@@ -83,7 +83,15 @@ public class FontRenderContext
public boolean equals (FontRenderContext rhs)
{
- return (affineTransform.equals (rhs.getTransform ())
+ if (rhs == null)
+ return false;
+
+ if (affineTransform == null && rhs.affineTransform != null
+ || affineTransform != null && rhs.affineTransform == null)
+ return false;
+
+ return ((affineTransform == rhs.affineTransform
+ || affineTransform.equals (rhs.getTransform ()))
&& isAntiAliased == rhs.isAntiAliased ()
&& usesFractionalMetrics == rhs.usesFractionalMetrics ());
}