diff options
| author | Mark Wielaard <mark@klomp.org> | 2004-08-14 11:21:20 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2004-08-14 11:21:20 +0000 |
| commit | 54cb0ca8169f99a80c2460ee287f5c20cb4b9ad7 (patch) | |
| tree | adcc02a5271a9db80cc1ff17c1a91dfb61b157b6 /java/awt/Rectangle.java | |
| parent | b0d18c91f95f1e440ef3b54293dc3f5d9471420d (diff) | |
| download | classpath-54cb0ca8169f99a80c2460ee287f5c20cb4b9ad7.tar.gz | |
2004-08-14 Mark Wielaard <mark@klomp.org>
* java/lang/Rectangle.java (intersects): Check r.width and r.height
first.
Diffstat (limited to 'java/awt/Rectangle.java')
| -rw-r--r-- | java/awt/Rectangle.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/awt/Rectangle.java b/java/awt/Rectangle.java index c3340bb8e..5dc54116f 100644 --- a/java/awt/Rectangle.java +++ b/java/awt/Rectangle.java @@ -542,7 +542,7 @@ public class Rectangle extends Rectangle2D implements Shape, Serializable */ 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; } |