[kaffe] CVS kaffe (dalibor): Resynced with GNU classpath: Fix for rectangle intersects

[Kaffe CVS]

PatchSet 5064 
Date: 2004/08/14 18:17:14
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU classpath: Fix for rectangle intersects

2004-08-14  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/awt/Rectangle.java:
        Resynced with GNU Classpath.

        2004-08-14  Mark Wielaard  <mark at klomp.org>

        * java/lang/Rectangle.java (intersects): Check r.width and r.height
        first.

Members: 
	ChangeLog:1.2622->1.2623 
	libraries/javalib/java/awt/Rectangle.java:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2622 kaffe/ChangeLog:1.2623
--- kaffe/ChangeLog:1.2622	Sat Aug 14 17:59:24 2004
+++ kaffe/ChangeLog	Sat Aug 14 18:17:14 2004
@@ -1,5 +1,15 @@
 2004-08-14  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/awt/Rectangle.java:
+	Resynced with GNU Classpath.
+
+	2004-08-14  Mark Wielaard  <mark at klomp.org>
+
+        * java/lang/Rectangle.java (intersects): Check r.width and r.height
+        first.
+
+2004-08-14  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/nio/CharBuffer.java,
 	libraries/javalib/java/nio/DoubleBuffer.java,
 	libraries/javalib/java/nio/FloatBuffer.java,
Index: kaffe/libraries/javalib/java/awt/Rectangle.java
diff -u kaffe/libraries/javalib/java/awt/Rectangle.java:1.9 kaffe/libraries/javalib/java/awt/Rectangle.java:1.10
--- kaffe/libraries/javalib/java/awt/Rectangle.java:1.9	Thu Jul 22 19:37:02 2004
+++ kaffe/libraries/javalib/java/awt/Rectangle.java	Sat Aug 14 18:17:18 2004
@@ -542,7 +542,7 @@
    */
   public boolean intersects(Rectangle r)
   {
-    return width > 0 && height > 0 && r.width > 0 && r.height > 0
+    return r.width > 0 && r.height > 0 && width > 0 && height > 0
       && r.x < x + width && r.x + r.width > x
       && r.y < y + height && r.y + r.height > y;
   }