The FontRenderContext.equals() method must handle affineTransform beeing null a little more clever. Most of Harmony's Swing tests were breaking down immediately due to NPE beeing thrown in that method.
2006-06-21 Roman Kennke <[EMAIL PROTECTED]>
* java/awt/font/FontRenderContext.java:
(equals): Added special conditions for affineTransform beeing
null.
/Roman
--
“Improvement makes straight roads, but the crooked roads, without
Improvement, are roads of Genius.” - William Blake
Index: java/awt/font/FontRenderContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/font/FontRenderContext.java,v
retrieving revision 1.3
diff -u -1 -0 -r1.3 FontRenderContext.java
--- java/awt/font/FontRenderContext.java 2 Jul 2005 20:32:29 -0000 1.3
+++ java/awt/font/FontRenderContext.java 21 Jun 2006 13:49:37 -0000
@@ -76,21 +76,29 @@
public boolean equals (Object obj)
{
if (! (obj instanceof FontRenderContext))
return false;
return equals ((FontRenderContext) obj);
}
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 ());
}
/**
* Retrieves the affine transform for scaling typographical points
* to raster pixels.
*
* @return a clone of the transform object.
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
